From d6d6122aa3188ccfbba05b5fb1c8e6ed4e930b3b Mon Sep 17 00:00:00 2001 From: Don Turner Date: Tue, 10 Mar 2026 22:40:42 +0000 Subject: [PATCH 1/2] Update Compose BOM to 2026.02.01 --- JetLagged/gradle/libs.versions.toml | 6 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- JetNews/gradle/libs.versions.toml | 6 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- Jetcaster/core/data-testing/build.gradle.kts | 1 - Jetcaster/core/data/build.gradle.kts | 1 - .../database/model/PodcastWithExtraInfo.kt | 2 + Jetcaster/core/designsystem/build.gradle.kts | 1 - .../designsystem/component/PodcastImage.kt | 1 + .../core/domain-testing/build.gradle.kts | 1 - Jetcaster/core/domain/build.gradle.kts | 1 - Jetcaster/glancewidget/build.gradle.kts | 1 - .../glancewidget/JetcasterAppWidget.kt | 6 +- Jetcaster/gradle/libs.versions.toml | 78 +++++++++---------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- Jetcaster/mobile/build.gradle.kts | 1 - .../com/example/jetcaster/ui/home/Home.kt | 2 + .../jetcaster/ui/player/PlayerScreen.kt | 2 +- .../jetcaster/ui/shared/EpisodeListItem.kt | 7 +- .../com/example/jetcaster/ui/theme/Theme.kt | 1 + Jetcaster/tv/build.gradle.kts | 1 - .../jetcaster/tv/ui/component/Catalog.kt | 2 +- .../jetcaster/tv/ui/episode/EpisodeScreen.kt | 2 + .../jetcaster/tv/ui/library/LibraryScreen.kt | 1 + .../jetcaster/tv/ui/player/PlayerScreen.kt | 1 + .../tv/ui/podcast/PodcastDetailsScreen.kt | 4 +- .../jetcaster/tv/ui/search/SearchScreen.kt | 3 +- Jetcaster/wear/build.gradle | 12 +-- .../jetcaster/ui/components/MediaContent.kt | 1 + .../ui/components/SettingsButtons.kt | 16 ++-- .../jetcaster/ui/episode/EpisodeScreen.kt | 1 + .../jetcaster/ui/player/PlayerScreen.kt | 1 + .../ui/podcast/PodcastDetailsScreen.kt | 1 + .../jetcaster/ui/podcasts/PodcastsScreen.kt | 2 + .../example/jetcaster/ui/queue/QueueScreen.kt | 4 +- Jetchat/gradle/libs.versions.toml | 6 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- Jetsnack/gradle/libs.versions.toml | 6 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- Reply/gradle/libs.versions.toml | 6 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- gradle.properties | 1 + 42 files changed, 111 insertions(+), 90 deletions(-) create mode 100644 gradle.properties diff --git a/JetLagged/gradle/libs.versions.toml b/JetLagged/gradle/libs.versions.toml index 7dffdd485a..ed46a21ed5 100644 --- a/JetLagged/gradle/libs.versions.toml +++ b/JetLagged/gradle/libs.versions.toml @@ -1,10 +1,10 @@ [versions] accompanist = "0.37.3" android-material3 = "1.14.0-alpha09" -androidGradlePlugin = "9.0.1" +androidGradlePlugin = "9.1.0" androidx-activity-compose = "1.12.4" androidx-appcompat = "1.7.1" -androidx-compose-bom = "2026.02.00" +androidx-compose-bom = "2026.02.01" androidx-constraintlayout = "1.1.1" androidx-core-splashscreen = "1.2.0" androidx-corektx = "1.17.0" @@ -49,7 +49,7 @@ roborazzi = "1.59.0" rome = "2.1.0" room = "2.8.4" secrets = "2.0.1" -spotless = "8.2.1" +spotless = "8.3.0" # @keep targetSdk = "33" version-catalog-update = "1.1.0" diff --git a/JetLagged/gradle/wrapper/gradle-wrapper.properties b/JetLagged/gradle/wrapper/gradle-wrapper.properties index e2e4d002fe..070f19ac4a 100644 --- a/JetLagged/gradle/wrapper/gradle-wrapper.properties +++ b/JetLagged/gradle/wrapper/gradle-wrapper.properties @@ -15,6 +15,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806 -distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/JetNews/gradle/libs.versions.toml b/JetNews/gradle/libs.versions.toml index 61bf6410cd..0a2ad5cf9c 100644 --- a/JetNews/gradle/libs.versions.toml +++ b/JetNews/gradle/libs.versions.toml @@ -5,10 +5,10 @@ [versions] accompanist = "0.37.3" android-material3 = "1.14.0-alpha09" -androidGradlePlugin = "9.0.1" +androidGradlePlugin = "9.1.0" androidx-activity-compose = "1.12.4" androidx-appcompat = "1.7.1" -androidx-compose-bom = "2026.02.00" +androidx-compose-bom = "2026.02.01" androidx-constraintlayout = "1.1.1" androidx-core-splashscreen = "1.2.0" androidx-corektx = "1.17.0" @@ -53,7 +53,7 @@ roborazzi = "1.59.0" rome = "2.1.0" room = "2.8.4" secrets = "2.0.1" -spotless = "8.2.1" +spotless = "8.3.0" # @keep targetSdk = "33" version-catalog-update = "1.1.0" diff --git a/JetNews/gradle/wrapper/gradle-wrapper.properties b/JetNews/gradle/wrapper/gradle-wrapper.properties index e2e4d002fe..070f19ac4a 100644 --- a/JetNews/gradle/wrapper/gradle-wrapper.properties +++ b/JetNews/gradle/wrapper/gradle-wrapper.properties @@ -15,6 +15,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806 -distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Jetcaster/core/data-testing/build.gradle.kts b/Jetcaster/core/data-testing/build.gradle.kts index 9ebec4c471..116f95aa6c 100644 --- a/Jetcaster/core/data-testing/build.gradle.kts +++ b/Jetcaster/core/data-testing/build.gradle.kts @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) } android { diff --git a/Jetcaster/core/data/build.gradle.kts b/Jetcaster/core/data/build.gradle.kts index dfac842928..71ee1ea121 100644 --- a/Jetcaster/core/data/build.gradle.kts +++ b/Jetcaster/core/data/build.gradle.kts @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.ksp) alias(libs.plugins.hilt) } diff --git a/Jetcaster/core/data/src/main/java/com/example/jetcaster/core/data/database/model/PodcastWithExtraInfo.kt b/Jetcaster/core/data/src/main/java/com/example/jetcaster/core/data/database/model/PodcastWithExtraInfo.kt index 8794a46e47..ea4c02ab54 100644 --- a/Jetcaster/core/data/src/main/java/com/example/jetcaster/core/data/database/model/PodcastWithExtraInfo.kt +++ b/Jetcaster/core/data/src/main/java/com/example/jetcaster/core/data/database/model/PodcastWithExtraInfo.kt @@ -40,11 +40,13 @@ class PodcastWithExtraInfo { override fun equals(other: Any?): Boolean = when { other === this -> true + other is PodcastWithExtraInfo -> { podcast == other.podcast && lastEpisodeDate == other.lastEpisodeDate && isFollowed == other.isFollowed } + else -> false } diff --git a/Jetcaster/core/designsystem/build.gradle.kts b/Jetcaster/core/designsystem/build.gradle.kts index eb0927bb98..e539916288 100644 --- a/Jetcaster/core/designsystem/build.gradle.kts +++ b/Jetcaster/core/designsystem/build.gradle.kts @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.compose) } diff --git a/Jetcaster/core/designsystem/src/main/java/com/example/jetcaster/designsystem/component/PodcastImage.kt b/Jetcaster/core/designsystem/src/main/java/com/example/jetcaster/designsystem/component/PodcastImage.kt index a17d35fa85..1378bc20de 100644 --- a/Jetcaster/core/designsystem/src/main/java/com/example/jetcaster/designsystem/component/PodcastImage.kt +++ b/Jetcaster/core/designsystem/src/main/java/com/example/jetcaster/designsystem/component/PodcastImage.kt @@ -81,6 +81,7 @@ fun PodcastImage( .fillMaxSize(), ) } + else -> { Box( modifier = modifier diff --git a/Jetcaster/core/domain-testing/build.gradle.kts b/Jetcaster/core/domain-testing/build.gradle.kts index a712f923fe..631a376944 100644 --- a/Jetcaster/core/domain-testing/build.gradle.kts +++ b/Jetcaster/core/domain-testing/build.gradle.kts @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) } android { diff --git a/Jetcaster/core/domain/build.gradle.kts b/Jetcaster/core/domain/build.gradle.kts index 8efab558b1..da640fa411 100644 --- a/Jetcaster/core/domain/build.gradle.kts +++ b/Jetcaster/core/domain/build.gradle.kts @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.ksp) alias(libs.plugins.hilt) } diff --git a/Jetcaster/glancewidget/build.gradle.kts b/Jetcaster/glancewidget/build.gradle.kts index 1a4716310c..62f3f9ce10 100644 --- a/Jetcaster/glancewidget/build.gradle.kts +++ b/Jetcaster/glancewidget/build.gradle.kts @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.android.library) - alias(libs.plugins.kotlin.android) alias(libs.plugins.compose) } diff --git a/Jetcaster/glancewidget/src/main/java/com/example/jetcaster/glancewidget/JetcasterAppWidget.kt b/Jetcaster/glancewidget/src/main/java/com/example/jetcaster/glancewidget/JetcasterAppWidget.kt index 3840e7c006..fc148ec0aa 100644 --- a/Jetcaster/glancewidget/src/main/java/com/example/jetcaster/glancewidget/JetcasterAppWidget.kt +++ b/Jetcaster/glancewidget/src/main/java/com/example/jetcaster/glancewidget/JetcasterAppWidget.kt @@ -100,8 +100,10 @@ private fun calculateSizeBucket(): SizeBucket { return when { width < Sizes.minWidth -> SizeBucket.Invalid + width <= Sizes.smallBucketCutoffWidth -> if (height >= Sizes.short) SizeBucket.Narrow else SizeBucket.NarrowShort + else -> if (height >= Sizes.short) SizeBucket.Normal else SizeBucket.NormalShort } @@ -114,7 +116,7 @@ class JetcasterAppWidget : GlanceAppWidget() { override suspend fun provideGlance(context: Context, id: GlanceId) { val testState = JetcasterAppWidgetViewState( episodeTitle = - "100 - Android 15 DP 1, Stable Studio Iguana, Cloud Photo Picker, and more!", + "100 - Android 15 DP 1, Stable Studio Iguana, Cloud Photo Picker, and more!", podcastTitle = "Now in Android", isPlaying = false, albumArtUri = "https://static.libsyn.com/p/assets/9/f/f/3/" + @@ -129,6 +131,7 @@ class JetcasterAppWidget : GlanceAppWidget() { GlanceTheme { when (sizeBucket) { SizeBucket.Invalid -> WidgetUiInvalidSize() + SizeBucket.Narrow -> Widget( iconSize = Sizes.medium, imageUri = artUri, @@ -224,6 +227,7 @@ fun PodcastText(title: String, subtitle: String, modifier: GlanceModifier = Glan maxLines = 2, ) } + else -> Column(modifier) { Text( text = title, diff --git a/Jetcaster/gradle/libs.versions.toml b/Jetcaster/gradle/libs.versions.toml index 4a02af9617..eef93732b5 100644 --- a/Jetcaster/gradle/libs.versions.toml +++ b/Jetcaster/gradle/libs.versions.toml @@ -4,61 +4,61 @@ ##### [versions] accompanist = "0.37.3" -android-material3 = "1.13.0-alpha13" -androidGradlePlugin = "8.10.1" -androidx-activity-compose = "1.10.1" +android-material3 = "1.14.0-alpha09" +androidGradlePlugin = "9.1.0" +androidx-activity-compose = "1.12.4" androidx-appcompat = "1.7.1" -androidx-compose-bom = "2025.09.00" +androidx-compose-bom = "2026.02.01" androidx-constraintlayout = "1.1.1" -androidx-core-splashscreen = "1.0.1" -androidx-corektx = "1.16.0" +androidx-core-splashscreen = "1.2.0" +androidx-corektx = "1.17.0" androidx-glance = "1.1.1" androidx-lifecycle = "2.8.2" -androidx-lifecycle-compose = "2.9.1" -androidx-lifecycle-runtime-compose = "2.9.1" -androidx-navigation = "2.9.0" +androidx-lifecycle-compose = "2.10.0" +androidx-lifecycle-runtime-compose = "2.10.0" +androidx-navigation = "2.9.7" androidx-palette = "1.0.0" -androidx-test = "1.6.1" -androidx-test-espresso = "3.6.1" -androidx-test-ext-junit = "1.2.1" -androidx-test-ext-truth = "1.6.0" +androidx-test = "1.7.0" +androidx-test-espresso = "3.7.0" +androidx-test-ext-junit = "1.3.0" +androidx-test-ext-truth = "1.7.0" androidx-tv-foundation = "1.0.0-alpha12" -androidx-tv-material = "1.0.0" -androidx-wear-compose-material3 = "1.5.1" -androidx-wear-compose = "1.5.0" -androidx-window = "1.4.0" -androidxHiltNavigationCompose = "1.2.0" +androidx-tv-material = "1.0.1" +androidx-wear-compose = "1.5.6" +androidx-wear-compose-material3 = "1.5.6" +androidx-window = "1.5.1" +androidxHiltNavigationCompose = "1.3.0" androix-test-uiautomator = "2.3.0" coil = "2.7.0" # @keep compileSdk = "36" coroutines = "1.10.2" -google-maps = "19.2.0" -gradle-versions = "0.52.0" -hilt = "2.56.2" -hiltExt = "1.2.0" +google-maps = "20.0.0" +gradle-versions = "0.53.0" +hilt = "2.59.2" +hiltExt = "1.3.0" horologist = "0.7.15" jdkDesugar = "2.1.5" junit = "4.13.2" -kotlin = "2.1.21" -kotlinx-serialization-json = "1.8.1" +kotlin = "2.3.10" +kotlinx-serialization-json = "1.10.0" kotlinx_immutable = "0.4.0" -ksp = "2.1.21-2.0.2" -maps-compose = "6.6.0" -media3 = "1.7.1" +ksp = "2.3.6" +maps-compose = "8.2.0" +media3 = "1.9.2" # @keep minSdk = "23" -okhttp = "4.12.0" +okhttp = "5.3.2" play-services-wearable = "19.0.0" -robolectric = "4.14.1" -roborazzi = "1.45.1" +robolectric = "4.16.1" +roborazzi = "1.59.0" rome = "2.1.0" -room = "2.7.1" +room = "2.8.4" secrets = "2.0.1" -spotless = "7.0.4" +spotless = "8.3.0" # @keep targetSdk = "33" -version-catalog-update = "1.0.0" +version-catalog-update = "1.1.0" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } @@ -105,6 +105,9 @@ androidx-lifecycle-viewModelCompose = { module = "androidx.lifecycle:lifecycle-v androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-compose" } androidx-lifecycle-viewmodel-savedstate = { module = "androidx.lifecycle:lifecycle-viewmodel-savedstate", version.ref = "androidx-lifecycle-compose" } androidx-material-icons-core = { module = "androidx.compose.material:material-icons-core" } +androidx-media3-common-ktx = { module = "androidx.media3:media3-common-ktx", version.ref = "media3" } +androidx-media3-exoplayer = { module = "androidx.media3:media3-exoplayer", version.ref = "media3" } +androidx-media3-session = { module = "androidx.media3:media3-session", version.ref = "media3" } androidx-media3-ui-compose = { module = "androidx.media3:media3-ui-compose", version.ref = "media3" } androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-navigation" } androidx-navigation-fragment = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "androidx-navigation" } @@ -118,7 +121,7 @@ androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", androidx-test-ext-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-test-ext-junit" } androidx-test-ext-truth = { module = "androidx.test.ext:truth", version.ref = "androidx-test-ext-truth" } androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-test" } -androidx-test-runner = "androidx.test:runner:1.6.2" +androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test" } androidx-test-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "androix-test-uiautomator" } androidx-tv-foundation = { module = "androidx.tv:tv-foundation", version.ref = "androidx-tv-foundation" } androidx-tv-material = { module = "androidx.tv:tv-material", version.ref = "androidx-tv-material" } @@ -138,8 +141,8 @@ hilt-android-testing = { module = "com.google.dagger:hilt-android-testing", vers hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt" } hilt-ext-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "hiltExt" } horologist-audio-ui = { module = "com.google.android.horologist:horologist-audio-ui", version.ref = "horologist" } -horologist-audio-uimaterial3 = { module = "com.google.android.horologist:horologist-audio-ui-material3", version.ref = "horologist" } horologist-audio-ui-model = { module = "com.google.android.horologist:horologist-audio-ui-model", version.ref = "horologist" } +horologist-audio-uimaterial3 = { module = "com.google.android.horologist:horologist-audio-ui-material3", version.ref = "horologist" } horologist-composables = { module = "com.google.android.horologist:horologist-composables", version.ref = "horologist" } horologist-compose-layout = { module = "com.google.android.horologist:horologist-compose-layout", version.ref = "horologist" } horologist-compose-material = { module = "com.google.android.horologist:horologist-compose-material", version.ref = "horologist" } @@ -147,8 +150,8 @@ horologist-compose-tools = { module = "com.google.android.horologist:horologist- horologist-images-coil = { module = "com.google.android.horologist:horologist-images-coil", version.ref = "horologist" } horologist-media-data = { module = "com.google.android.horologist:horologist-media-data", version.ref = "horologist" } horologist-media-ui = { module = "com.google.android.horologist:horologist-media-ui", version.ref = "horologist" } -horologist-media-uimaterial3 = { module = "com.google.android.horologist:horologist-media-ui-material3", version.ref = "horologist" } horologist-media-ui-model = { module = "com.google.android.horologist:horologist-media-ui-model", version.ref = "horologist" } +horologist-media-uimaterial3 = { module = "com.google.android.horologist:horologist-media-ui-material3", version.ref = "horologist" } horologist-roboscreenshots = { module = "com.google.android.horologist:horologist-roboscreenshots", version.ref = "horologist" } junit = { module = "junit:junit", version.ref = "junit" } kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" } @@ -165,9 +168,6 @@ roborazzi-compose = { module = "io.github.takahirom.roborazzi:roborazzi-compose" roborazzi-rule = { module = "io.github.takahirom.roborazzi:roborazzi-junit-rule", version.ref = "roborazzi" } rometools-modules = { module = "com.rometools:rome-modules", version.ref = "rome" } rometools-rome = { module = "com.rometools:rome", version.ref = "rome" } -androidx-media3-session = {module = "androidx.media3:media3-session",version.ref = "media3"} -androidx-media3-exoplayer = {module = "androidx.media3:media3-exoplayer", version.ref = "media3"} -androidx-media3-common-ktx = { group = "androidx.media3", name = "media3-common-ktx", version.ref = "media3" } [plugins] android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" } diff --git a/Jetcaster/gradle/wrapper/gradle-wrapper.properties b/Jetcaster/gradle/wrapper/gradle-wrapper.properties index b889d1192e..1921ff9a44 100644 --- a/Jetcaster/gradle/wrapper/gradle-wrapper.properties +++ b/Jetcaster/gradle/wrapper/gradle-wrapper.properties @@ -14,6 +14,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Jetcaster/mobile/build.gradle.kts b/Jetcaster/mobile/build.gradle.kts index 14eaa33a68..7ddf4db5fa 100644 --- a/Jetcaster/mobile/build.gradle.kts +++ b/Jetcaster/mobile/build.gradle.kts @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.android.application) - alias(libs.plugins.kotlin.android) alias(libs.plugins.ksp) alias(libs.plugins.hilt) alias(libs.plugins.compose) diff --git a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/Home.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/Home.kt index 7b363bfce0..93270d6c08 100644 --- a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/Home.kt +++ b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/Home.kt @@ -738,12 +738,14 @@ private fun lastUpdated(updated: OffsetDateTime): String { return when { days > 28 -> stringResource(R.string.updated_longer) + days >= 7 -> { val weeks = days / 7 quantityStringResource(R.plurals.updated_weeks_ago, weeks, weeks) } days > 0 -> quantityStringResource(R.plurals.updated_days_ago, days, days) + else -> stringResource(R.string.updated_today) } } diff --git a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt index 77536537fd..0db8bac4c4 100644 --- a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt +++ b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt @@ -388,7 +388,7 @@ private fun PlayerContentRegular( ), animatedVisibilityScope = animatedVisibilityScope, clipInOverlayDuringTransition = - OverlayClip(MaterialTheme.shapes.medium), + OverlayClip(MaterialTheme.shapes.medium), ), ) } diff --git a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/shared/EpisodeListItem.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/shared/EpisodeListItem.kt index 0f9c93b7d4..0e04d221ba 100644 --- a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/shared/EpisodeListItem.kt +++ b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/shared/EpisodeListItem.kt @@ -178,6 +178,7 @@ private fun EpisodeListItemFooter( duration.toMinutes().toInt(), ) } + // Otherwise we just use the date else -> MediumDateFormatter.format(episode.published) }, @@ -230,9 +231,9 @@ private fun EpisodeListItemHeader( Row(modifier = modifier) { Column( modifier = - Modifier - .weight(1f) - .padding(end = 16.dp), + Modifier + .weight(1f) + .padding(end = 16.dp), ) { Text( text = episode.title, diff --git a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/theme/Theme.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/theme/Theme.kt index 0bfe64fe6b..31e3dd4cd3 100644 --- a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/theme/Theme.kt +++ b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/theme/Theme.kt @@ -474,6 +474,7 @@ fun JetcasterTheme(dynamicColor: Boolean = false, content: @Composable () -> Uni val context = LocalContext.current dynamicDarkColorScheme(context) } + else -> darkScheme } diff --git a/Jetcaster/tv/build.gradle.kts b/Jetcaster/tv/build.gradle.kts index 40ebe54266..933f82e672 100644 --- a/Jetcaster/tv/build.gradle.kts +++ b/Jetcaster/tv/build.gradle.kts @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.android.application) - alias(libs.plugins.kotlin.android) alias(libs.plugins.ksp) alias(libs.plugins.hilt) alias(libs.plugins.compose) diff --git a/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/component/Catalog.kt b/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/component/Catalog.kt index eef6f9e92e..7351be7f77 100644 --- a/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/component/Catalog.kt +++ b/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/component/Catalog.kt @@ -58,7 +58,7 @@ internal fun Catalog( modifier = modifier, contentPadding = JetcasterAppDefaults.overScanMargin.catalog.intoPaddingValues(), verticalArrangement = - Arrangement.spacedBy(JetcasterAppDefaults.gap.section), + Arrangement.spacedBy(JetcasterAppDefaults.gap.section), state = state, ) { if (header != null) { diff --git a/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/episode/EpisodeScreen.kt b/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/episode/EpisodeScreen.kt index 3042cd4609..30629fd6d1 100644 --- a/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/episode/EpisodeScreen.kt +++ b/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/episode/EpisodeScreen.kt @@ -56,7 +56,9 @@ fun EpisodeScreen( val screenModifier = modifier.fillMaxSize() when (val s = uiState) { EpisodeScreenUiState.Loading -> Loading(modifier = screenModifier) + EpisodeScreenUiState.Error -> ErrorState(backToHome = backToHome, modifier = screenModifier) + is EpisodeScreenUiState.Ready -> EpisodeDetailsWithBackground( playerEpisode = s.playerEpisode, playEpisode = { diff --git a/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/library/LibraryScreen.kt b/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/library/LibraryScreen.kt index 2a823d8e62..99c41dece4 100644 --- a/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/library/LibraryScreen.kt +++ b/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/library/LibraryScreen.kt @@ -55,6 +55,7 @@ fun LibraryScreen( val uiState by libraryScreenViewModel.uiState.collectAsState() when (val s = uiState) { LibraryScreenUiState.Loading -> Loading(modifier = modifier) + LibraryScreenUiState.NoSubscribedPodcast -> { NavigateToDiscover(onNavigationRequested = navigateToDiscover, modifier = modifier) } diff --git a/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/player/PlayerScreen.kt b/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/player/PlayerScreen.kt index 7717daf35b..b1c7830e78 100644 --- a/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/player/PlayerScreen.kt +++ b/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/player/PlayerScreen.kt @@ -106,6 +106,7 @@ fun PlayerScreen( when (val s = uiState) { PlayerScreenUiState.Loading -> Loading(modifier) + PlayerScreenUiState.NoEpisodeInQueue -> { NoEpisodeInQueue(backToHome = backToHome, modifier = modifier) } diff --git a/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/podcast/PodcastDetailsScreen.kt b/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/podcast/PodcastDetailsScreen.kt index 5db3b9a5c6..1c52e6f217 100644 --- a/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/podcast/PodcastDetailsScreen.kt +++ b/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/podcast/PodcastDetailsScreen.kt @@ -81,7 +81,9 @@ fun PodcastDetailsScreen( val uiState by podcastDetailsScreenViewModel.uiStateFlow.collectAsState() when (val s = uiState) { PodcastScreenUiState.Loading -> Loading(modifier = modifier) + PodcastScreenUiState.Error -> ErrorState(backToHome = backToHomeScreen, modifier = modifier) + is PodcastScreenUiState.Ready -> PodcastDetailsWithBackground( podcastInfo = s.podcastInfo, episodeList = s.episodeList, @@ -146,7 +148,7 @@ private fun PodcastDetails( TwoColumn( modifier = modifier, horizontalArrangement = - Arrangement.spacedBy(JetcasterAppDefaults.gap.twoColumn), + Arrangement.spacedBy(JetcasterAppDefaults.gap.twoColumn), first = { PodcastInfo( podcastInfo = podcastInfo, diff --git a/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/search/SearchScreen.kt b/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/search/SearchScreen.kt index ebb00cc6c1..4a35b61499 100644 --- a/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/search/SearchScreen.kt +++ b/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/search/SearchScreen.kt @@ -73,6 +73,7 @@ fun SearchScreen( when (val s = uiState) { SearchScreenUiState.Loading -> Loading(modifier = modifier) + is SearchScreenUiState.Ready -> Ready( keyword = s.keyword, categorySelectionList = s.categorySelectionList, @@ -257,7 +258,7 @@ private fun SearchResult( LazyVerticalGrid( columns = GridCells.Fixed(4), horizontalArrangement = - Arrangement.spacedBy(JetcasterAppDefaults.gap.podcastRow), + Arrangement.spacedBy(JetcasterAppDefaults.gap.podcastRow), verticalArrangement = Arrangement.spacedBy(JetcasterAppDefaults.gap.podcastRow), modifier = modifier, ) { diff --git a/Jetcaster/wear/build.gradle b/Jetcaster/wear/build.gradle index 77580edf3f..0c9036c023 100644 --- a/Jetcaster/wear/build.gradle +++ b/Jetcaster/wear/build.gradle @@ -15,7 +15,6 @@ */ plugins { alias(libs.plugins.android.application) - alias(libs.plugins.kotlin.android) alias libs.plugins.roborazzi alias(libs.plugins.ksp) alias(libs.plugins.hilt) @@ -23,7 +22,7 @@ plugins { } android { - compileSdk 35 + compileSdk libs.versions.compileSdk.get().toInteger() namespace "com.example.jetcaster" @@ -55,10 +54,11 @@ android { } } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.majorVersion - freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn" - freeCompilerArgs = freeCompilerArgs + "-opt-in=com.google.android.horologist.annotations.ExperimentalHorologistApi" + kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + freeCompilerArgs = ["-opt-in=kotlin.RequiresOptIn", "-opt-in=com.google.android.horologist.annotations.ExperimentalHorologistApi"] + } } buildFeatures { compose true diff --git a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/components/MediaContent.kt b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/components/MediaContent.kt index d1ecc9120c..57eedee7b1 100644 --- a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/components/MediaContent.kt +++ b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/components/MediaContent.kt @@ -66,6 +66,7 @@ fun MediaContent( duration.toMinutes().toInt(), ) } + // Otherwise we just use the date else -> MediumDateFormatter.format(episode.published) } diff --git a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/components/SettingsButtons.kt b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/components/SettingsButtons.kt index d913c8c48b..cd272e0d96 100644 --- a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/components/SettingsButtons.kt +++ b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/components/SettingsButtons.kt @@ -85,13 +85,15 @@ fun PlaybackSpeedButton( onClick = onPlaybackSpeedChange, enabled = enabled, imageVector = - when (currentPlayerSpeed) { - 1f -> ImageVector.vectorResource(R.drawable.speed_1x) - 1.5f -> ImageVector.vectorResource(R.drawable.speed_15x) - else -> { - ImageVector.vectorResource(R.drawable.speed_2x) - } - }, + when (currentPlayerSpeed) { + 1f -> ImageVector.vectorResource(R.drawable.speed_1x) + + 1.5f -> ImageVector.vectorResource(R.drawable.speed_15x) + + else -> { + ImageVector.vectorResource(R.drawable.speed_2x) + } + }, contentDescription = stringResource(R.string.change_playback_speed_content_description), ) } diff --git a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/episode/EpisodeScreen.kt b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/episode/EpisodeScreen.kt index 2f9f130302..586e726f81 100644 --- a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/episode/EpisodeScreen.kt +++ b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/episode/EpisodeScreen.kt @@ -272,6 +272,7 @@ private fun TransformingLazyColumnScope.episodeInfoContent(episode: PlayerEpisod duration.toMinutes().toInt(), ) } + // Otherwise we just use the date else -> MediumDateFormatter.format(published) }, diff --git a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt index dfdfdbe423..5010bb8545 100644 --- a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt +++ b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt @@ -111,6 +111,7 @@ private fun PlayerScreen( when (val state = uiState) { PlayerScreenUiState.Loading -> LoadingMediaDisplay(modifier) + PlayerScreenUiState.Empty -> { PlayerScreen( mediaDisplay = { diff --git a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/podcast/PodcastDetailsScreen.kt b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/podcast/PodcastDetailsScreen.kt index 991e6485c7..8e2ece8736 100644 --- a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/podcast/PodcastDetailsScreen.kt +++ b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/podcast/PodcastDetailsScreen.kt @@ -116,6 +116,7 @@ fun PodcastDetailsScreen( title = { stringResource(R.string.podcasts_no_episode_podcasts) }, ) } + PodcastDetailsScreenState.Loading -> { PodcastDetailScreenLoaded( emptyList(), diff --git a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/podcasts/PodcastsScreen.kt b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/podcasts/PodcastsScreen.kt index bf52a452f4..98fcc1b6c7 100644 --- a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/podcasts/PodcastsScreen.kt +++ b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/podcasts/PodcastsScreen.kt @@ -116,8 +116,10 @@ fun PodcastsScreen( contentPadding = contentPadding, placeholderState = placeholderState, ) + PodcastsScreenState.Empty -> PodcastScreenEmpty(onDismiss) + PodcastsScreenState.Loading -> PodcastScreenLoaded( podcastList = emptyList(), diff --git a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/queue/QueueScreen.kt b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/queue/QueueScreen.kt index 7934f93619..b1295caebe 100644 --- a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/queue/QueueScreen.kt +++ b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/queue/QueueScreen.kt @@ -114,6 +114,7 @@ fun QueueScreen( contentPadding = contentPadding, placeholderState = placeholderState, ) + QueueScreenState.Loading -> QueueScreenLoaded( episodeList = emptyList(), onPlayButtonClick = { }, @@ -124,6 +125,7 @@ fun QueueScreen( contentPadding = contentPadding, placeholderState = placeholderState, ) + QueueScreenState.Empty -> QueueScreenEmpty(onDismiss) } } @@ -234,7 +236,7 @@ fun ButtonsContent( Icon( painter = painterResource(id = R.drawable.delete), contentDescription = - stringResource(id = R.string.button_delete_queue_content_description), + stringResource(id = R.string.button_delete_queue_content_description), ) } } diff --git a/Jetchat/gradle/libs.versions.toml b/Jetchat/gradle/libs.versions.toml index 61bf6410cd..0a2ad5cf9c 100644 --- a/Jetchat/gradle/libs.versions.toml +++ b/Jetchat/gradle/libs.versions.toml @@ -5,10 +5,10 @@ [versions] accompanist = "0.37.3" android-material3 = "1.14.0-alpha09" -androidGradlePlugin = "9.0.1" +androidGradlePlugin = "9.1.0" androidx-activity-compose = "1.12.4" androidx-appcompat = "1.7.1" -androidx-compose-bom = "2026.02.00" +androidx-compose-bom = "2026.02.01" androidx-constraintlayout = "1.1.1" androidx-core-splashscreen = "1.2.0" androidx-corektx = "1.17.0" @@ -53,7 +53,7 @@ roborazzi = "1.59.0" rome = "2.1.0" room = "2.8.4" secrets = "2.0.1" -spotless = "8.2.1" +spotless = "8.3.0" # @keep targetSdk = "33" version-catalog-update = "1.1.0" diff --git a/Jetchat/gradle/wrapper/gradle-wrapper.properties b/Jetchat/gradle/wrapper/gradle-wrapper.properties index e2e4d002fe..070f19ac4a 100644 --- a/Jetchat/gradle/wrapper/gradle-wrapper.properties +++ b/Jetchat/gradle/wrapper/gradle-wrapper.properties @@ -15,6 +15,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806 -distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Jetsnack/gradle/libs.versions.toml b/Jetsnack/gradle/libs.versions.toml index c51b64c942..631ffbed18 100644 --- a/Jetsnack/gradle/libs.versions.toml +++ b/Jetsnack/gradle/libs.versions.toml @@ -1,10 +1,10 @@ [versions] accompanist = "0.37.3" android-material3 = "1.14.0-alpha09" -androidGradlePlugin = "9.0.1" +androidGradlePlugin = "9.1.0" androidx-activity-compose = "1.12.4" androidx-appcompat = "1.7.1" -androidx-compose-bom = "2026.02.00" +androidx-compose-bom = "2026.02.01" androidx-core-splashscreen = "1.2.0" androidx-corektx = "1.17.0" androidx-glance = "1.2.0-rc01" @@ -49,7 +49,7 @@ roborazzi = "1.59.0" rome = "2.1.0" room = "2.8.4" secrets = "2.0.1" -spotless = "8.2.1" +spotless = "8.3.0" # @keep targetSdk = "36" version-catalog-update = "1.1.0" diff --git a/Jetsnack/gradle/wrapper/gradle-wrapper.properties b/Jetsnack/gradle/wrapper/gradle-wrapper.properties index e2e4d002fe..070f19ac4a 100644 --- a/Jetsnack/gradle/wrapper/gradle-wrapper.properties +++ b/Jetsnack/gradle/wrapper/gradle-wrapper.properties @@ -15,6 +15,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806 -distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Reply/gradle/libs.versions.toml b/Reply/gradle/libs.versions.toml index 61bf6410cd..0a2ad5cf9c 100644 --- a/Reply/gradle/libs.versions.toml +++ b/Reply/gradle/libs.versions.toml @@ -5,10 +5,10 @@ [versions] accompanist = "0.37.3" android-material3 = "1.14.0-alpha09" -androidGradlePlugin = "9.0.1" +androidGradlePlugin = "9.1.0" androidx-activity-compose = "1.12.4" androidx-appcompat = "1.7.1" -androidx-compose-bom = "2026.02.00" +androidx-compose-bom = "2026.02.01" androidx-constraintlayout = "1.1.1" androidx-core-splashscreen = "1.2.0" androidx-corektx = "1.17.0" @@ -53,7 +53,7 @@ roborazzi = "1.59.0" rome = "2.1.0" room = "2.8.4" secrets = "2.0.1" -spotless = "8.2.1" +spotless = "8.3.0" # @keep targetSdk = "33" version-catalog-update = "1.1.0" diff --git a/Reply/gradle/wrapper/gradle-wrapper.properties b/Reply/gradle/wrapper/gradle-wrapper.properties index e2e4d002fe..070f19ac4a 100644 --- a/Reply/gradle/wrapper/gradle-wrapper.properties +++ b/Reply/gradle/wrapper/gradle-wrapper.properties @@ -15,6 +15,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806 -distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000000..6e42d57f80 --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +org.gradle.jvmargs=-Xmx4g \ No newline at end of file From 322adb3e0f2e1c3d2828ecc0a86266111c8158fb Mon Sep 17 00:00:00 2001 From: Don Turner Date: Tue, 10 Mar 2026 22:41:32 +0000 Subject: [PATCH 2/2] Re-triggering CI --- JetLagged/gradle.properties | 40 +---------------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- JetNews/gradle.properties | 40 +---------------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- Jetcaster/gradle.properties | 40 +---------------- .../gradle/wrapper/gradle-wrapper.properties | 1 + Jetchat/gradle.properties | 40 +---------------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- Jetsnack/gradle.properties | 40 +---------------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- Reply/gradle.properties | 43 +------------------ .../gradle/wrapper/gradle-wrapper.properties | 2 +- 12 files changed, 12 insertions(+), 242 deletions(-) diff --git a/JetLagged/gradle.properties b/JetLagged/gradle.properties index ed32c43142..6e42d57f80 100644 --- a/JetLagged/gradle.properties +++ b/JetLagged/gradle.properties @@ -1,39 +1 @@ -# -# Copyright 2022 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Project-wide Gradle settings. - -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048m - -# Turn on parallel compilation, caching and on-demand configuration -org.gradle.configureondemand=true -org.gradle.caching=true -org.gradle.parallel=true - -# AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app's APK -# https://developer.android.com/topic/libraries/support-library/androidx-rn -android.useAndroidX=true - -# Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official +org.gradle.jvmargs=-Xmx4g \ No newline at end of file diff --git a/JetLagged/gradle/wrapper/gradle-wrapper.properties b/JetLagged/gradle/wrapper/gradle-wrapper.properties index 070f19ac4a..4cd7af9acd 100644 --- a/JetLagged/gradle/wrapper/gradle-wrapper.properties +++ b/JetLagged/gradle/wrapper/gradle-wrapper.properties @@ -14,7 +14,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806 +distributionSha256Sum=7108fef32b066dcb8e074d4114e8614cfb6f1efeb9497c0b0268b7b4039f22bc distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/JetNews/gradle.properties b/JetNews/gradle.properties index 9299bc6d0f..6e42d57f80 100644 --- a/JetNews/gradle.properties +++ b/JetNews/gradle.properties @@ -1,39 +1 @@ -# -# Copyright 2020 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Project-wide Gradle settings. - -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048m - -# Turn on parallel compilation, caching and on-demand configuration -org.gradle.configureondemand=true -org.gradle.caching=true -org.gradle.parallel=true - -# AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app's APK -# https://developer.android.com/topic/libraries/support-library/androidx-rn -android.useAndroidX=true - -# Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official +org.gradle.jvmargs=-Xmx4g \ No newline at end of file diff --git a/JetNews/gradle/wrapper/gradle-wrapper.properties b/JetNews/gradle/wrapper/gradle-wrapper.properties index 070f19ac4a..4cd7af9acd 100644 --- a/JetNews/gradle/wrapper/gradle-wrapper.properties +++ b/JetNews/gradle/wrapper/gradle-wrapper.properties @@ -14,7 +14,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806 +distributionSha256Sum=7108fef32b066dcb8e074d4114e8614cfb6f1efeb9497c0b0268b7b4039f22bc distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Jetcaster/gradle.properties b/Jetcaster/gradle.properties index 646f68d67b..6e42d57f80 100644 --- a/Jetcaster/gradle.properties +++ b/Jetcaster/gradle.properties @@ -1,39 +1 @@ -# -# Copyright 2020 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Project-wide Gradle settings. - -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048m - -# Turn on parallel compilation, caching and on-demand configurationv -org.gradle.configureondemand=true -org.gradle.caching=true -org.gradle.parallel=true - -# AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app's APK -# https://developer.android.com/topic/libraries/support-library/androidx-rn -android.useAndroidX=true - -# Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official +org.gradle.jvmargs=-Xmx4g \ No newline at end of file diff --git a/Jetcaster/gradle/wrapper/gradle-wrapper.properties b/Jetcaster/gradle/wrapper/gradle-wrapper.properties index 1921ff9a44..4cd7af9acd 100644 --- a/Jetcaster/gradle/wrapper/gradle-wrapper.properties +++ b/Jetcaster/gradle/wrapper/gradle-wrapper.properties @@ -14,6 +14,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionSha256Sum=7108fef32b066dcb8e074d4114e8614cfb6f1efeb9497c0b0268b7b4039f22bc distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Jetchat/gradle.properties b/Jetchat/gradle.properties index 9299bc6d0f..6e42d57f80 100644 --- a/Jetchat/gradle.properties +++ b/Jetchat/gradle.properties @@ -1,39 +1 @@ -# -# Copyright 2020 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Project-wide Gradle settings. - -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048m - -# Turn on parallel compilation, caching and on-demand configuration -org.gradle.configureondemand=true -org.gradle.caching=true -org.gradle.parallel=true - -# AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app's APK -# https://developer.android.com/topic/libraries/support-library/androidx-rn -android.useAndroidX=true - -# Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official +org.gradle.jvmargs=-Xmx4g \ No newline at end of file diff --git a/Jetchat/gradle/wrapper/gradle-wrapper.properties b/Jetchat/gradle/wrapper/gradle-wrapper.properties index 070f19ac4a..4cd7af9acd 100644 --- a/Jetchat/gradle/wrapper/gradle-wrapper.properties +++ b/Jetchat/gradle/wrapper/gradle-wrapper.properties @@ -14,7 +14,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806 +distributionSha256Sum=7108fef32b066dcb8e074d4114e8614cfb6f1efeb9497c0b0268b7b4039f22bc distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Jetsnack/gradle.properties b/Jetsnack/gradle.properties index 9299bc6d0f..6e42d57f80 100644 --- a/Jetsnack/gradle.properties +++ b/Jetsnack/gradle.properties @@ -1,39 +1 @@ -# -# Copyright 2020 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Project-wide Gradle settings. - -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048m - -# Turn on parallel compilation, caching and on-demand configuration -org.gradle.configureondemand=true -org.gradle.caching=true -org.gradle.parallel=true - -# AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app's APK -# https://developer.android.com/topic/libraries/support-library/androidx-rn -android.useAndroidX=true - -# Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official +org.gradle.jvmargs=-Xmx4g \ No newline at end of file diff --git a/Jetsnack/gradle/wrapper/gradle-wrapper.properties b/Jetsnack/gradle/wrapper/gradle-wrapper.properties index 070f19ac4a..4cd7af9acd 100644 --- a/Jetsnack/gradle/wrapper/gradle-wrapper.properties +++ b/Jetsnack/gradle/wrapper/gradle-wrapper.properties @@ -14,7 +14,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806 +distributionSha256Sum=7108fef32b066dcb8e074d4114e8614cfb6f1efeb9497c0b0268b7b4039f22bc distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Reply/gradle.properties b/Reply/gradle.properties index cd9d7e39fc..6e42d57f80 100644 --- a/Reply/gradle.properties +++ b/Reply/gradle.properties @@ -1,42 +1 @@ -# Copyright 2022 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Project-wide Gradle settings. -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true -# AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app"s APK -# https://developer.android.com/topic/libraries/support-library/androidx-rn -android.useAndroidX=true -# Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -#android.nonTransitiveRClass=true - -# Turn on parallel compilation, caching and on-demand configuration -org.gradle.configureondemand=true -org.gradle.caching=true -org.gradle.parallel=true +org.gradle.jvmargs=-Xmx4g \ No newline at end of file diff --git a/Reply/gradle/wrapper/gradle-wrapper.properties b/Reply/gradle/wrapper/gradle-wrapper.properties index 070f19ac4a..4cd7af9acd 100644 --- a/Reply/gradle/wrapper/gradle-wrapper.properties +++ b/Reply/gradle/wrapper/gradle-wrapper.properties @@ -14,7 +14,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806 +distributionSha256Sum=7108fef32b066dcb8e074d4114e8614cfb6f1efeb9497c0b0268b7b4039f22bc distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists