Bump to AGP 8.2.0 and Gradle 8.5

VincentMasselis · Dec 1, 2023 · bc9f11c · bc9f11c
1 parent 9711c5d
commit bc9f11c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/buildSrc/src/main/kotlin/android-common.gradle.kts b/buildSrc/src/main/kotlin/android-common.gradle.kts
@@ -1,5 +1,4 @@
 import com.android.build.gradle.BaseExtension
-import com.android.build.gradle.LibraryExtension
 import com.android.build.gradle.internal.tasks.DeviceProviderInstrumentTestTask
 import org.gradle.api.JavaVersion.VERSION_17
 
@@ -21,6 +20,8 @@ the<BaseExtension>().apply android@{
     compileOptions {
         // Using sdk 34 allow the usage of Java 17 compatibility
         // Check https://developer.android.com/build/jdks#compileSdk
+        // `sourceCompatibility` is only for Java classes generated by Dagger
+        sourceCompatibility = VERSION_17
         targetCompatibility = VERSION_17
     }
     flavorDimensions("mode")

diff --git a/buildSrc/src/main/kotlin/compose.gradle.kts b/buildSrc/src/main/kotlin/compose.gradle.kts
@@ -1,6 +1,5 @@
+
 import com.android.build.gradle.BaseExtension
-import org.gradle.kotlin.dsl.dependencies
-import org.gradle.kotlin.dsl.the
 
 plugins {
     com.android.base
@@ -13,6 +12,6 @@ the<BaseExtension>().apply android@{
             versionCatalog.findVersion("composeCompiler").get().toString()
     }
     dependencies {
-        "lintChecks"("com.slack.lint.compose:compose-lint-checks:1.2.0")
+        "lintChecks"(versionCatalog.findLibrary("compose-lint").get())
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,12 +5,12 @@ testServices = "1.4.2"
 sqlDelight = "2.0.0"
 # Check the compatiblity of the compose compiler with the latest kotlin version here https://developer.android.com/jetpack/androidx/releases/compose-kotlin#pre-release_kotlin_compatibility
 composeCompiler = "1.5.4"
-dagger = "2.47"
+dagger = "2.48.1"
 mockk = "1.13.8"
 
 [libraries]
 accompanist-permissions = "com.google.accompanist:accompanist-permissions:0.32.0"
-android-gradle-plugin = "com.android.tools.build:gradle:8.1.4"
+android-gradle-plugin = "com.android.tools.build:gradle:8.2.0"
 androidx-arch-core-testing = "androidx.arch.core:core-testing:2.2.0"
 androidx-camera2-core = "androidx.camera:camera-camera2:1.3.0"
 androidx-camera2-lifecycle = "androidx.camera:camera-lifecycle:1.3.0"
@@ -34,6 +34,7 @@ compose-ui = { module = "androidx.compose.ui:ui" }
 compose-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
 compose-activity = "androidx.activity:activity-compose:1.8.1"
 compose-constraintlayout = "androidx.constraintlayout:constraintlayout-compose:1.0.1"
+compose-lint = "com.slack.lint.compose:compose-lint-checks:1.2.0"
 compose-navigation = "androidx.navigation:navigation-compose:2.7.4" # 2.7.5 crashes when running instrumented tests
 dagger-lib = { module = "com.google.dagger:dagger", version.ref = "dagger" }
 dagger-compiler = { module = "com.google.dagger:dagger-compiler", version.ref = "dagger" }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Jun 09 20:54:16 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-rc-4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME