Merge branch 'main' into optimize-gradle

android · Jul 3, 2024 · ce58a5a · ce58a5a
2 parents f358143 + 8c93618
commit ce58a5a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -19,6 +19,7 @@ plugins {
   alias(libs.plugins.kotlin.android)
   alias(libs.plugins.ksp)
   alias(libs.plugins.hilt)
+  alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -74,9 +75,6 @@ android {
     dataBinding = true
     buildConfig = true
   }
-  composeOptions {
-    kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-  }
   packagingOptions {
     // Multiple dependency bring these files in. Exclude them to enable
     // our test APK to build (has no effect on our AARs)

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -30,6 +30,7 @@ plugins {
     alias(libs.plugins.android.test) apply false
     alias(libs.plugins.gradle.versions)
     alias(libs.plugins.version.catalog.update)
+    alias(libs.plugins.compose.compiler)
 }
 
 apply("${project.rootDir}/buildscripts/toml-updater-config.gradle")
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -14,51 +14,51 @@
 ## limitations under the License.
 ##
 [versions]
-accessibilityTestFramework = "4.1.0"
-activityCompose = "1.8.2"
-androidGradlePlugin = "8.2.2"
-benchmark = "1.2.3"
+accessibilityTestFramework = "4.1.1"
+activityCompose = "1.9.0"
+androidGradlePlugin = "8.4.0"
+benchmark = "1.2.4"
 # @keep
 compileSdk = "34"
 # @keep
-compose-compiler = "1.5.8"
-composeBom = "2024.02.00"
+compose-compiler = "1.5.13"
+composeBom = "2024.05.00"
 composeLatest = "1.7.0-alpha01"
 constraintLayoutCompose = "1.0.1"
 coreTesting = "2.2.0"
-coroutines = "1.7.3"
+coroutines = "1.8.0"
 espresso = "3.5.1"
 glide = "1.0.0-beta01"
 gradle = "7.2.0"
 gradle-versions = "0.51.0"
-gson = "2.9.0"
-guava = "33.0.0-jre"
-hilt = "2.50"
-hiltNavigationCompose = "1.1.0"
+gson = "2.10.1"
+guava = "33.1.0-jre"
+hilt = "2.51.1"
+hiltNavigationCompose = "1.2.0"
 junit = "4.13.2"
-kotlin = "1.9.22"
-ksp = "1.9.22-1.0.17"
+kotlin = "2.0.0"
+ksp = "2.0.0-1.0.21"
 # @keep
 ktlint = "0.40.0"
-ktx = "1.7.0"
+ktx = "1.13.1"
 lifecycle = "2.7.0"
-material = "1.8.0-rc01"
-material3 = "1.2.0-rc01"
+material = "1.13.0-alpha01"
+material3 = "1.2.1"
 # @keep
 minSdk = "24"
 monitor = "1.6.1"
 navigation = "2.7.7"
 okhttpLogging = "4.12.0"
-pagingCompose = "3.3.0-alpha03"
+pagingCompose = "3.3.0-rc01"
 profileInstaller = "1.3.1"
-retrofit = "2.9.0"
+retrofit = "2.11.0"
 room = "2.6.1"
 spotless = "6.25.0"
 systemuicontroller = "0.34.0"
 # @keep
 targetSdk = "34"
 testExtJunit = "1.1.5"
-uiAutomator = "2.2.0"
+uiAutomator = "2.3.0"
 version-catalog-update = "0.8.4"
 viewModelCompose = "2.7.0"
 work = "2.9.0"
@@ -123,3 +123,4 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
 version-catalog-update = { id = "nl.littlerobots.version-catalog-update", version.ref = "version-catalog-update" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Jan 03 11:14:53 PST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists