Bump com.android.tools.build:gradle from 8.1.4 to 8.2.0 (#110)

Bumps com.android.tools.build:gradle from 8.1.4 to 8.2.0. --- updated-dependencies: - dependency-name: com.android.tools.build:gradle dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
ansman · Dec 30, 2023 · 7354dc3 · 7354dc3
1 parent c865fa1
commit 7354dc3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -34,7 +34,7 @@ okio = "com.squareup.okio:okio:3.7.0"
 retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 retrofit-moshi = { module = "com.squareup.retrofit2:converter-moshi", version.ref = "retrofit" }
 
-android-gradlePlugin = "com.android.tools.build:gradle:8.1.4"
+android-gradlePlugin = "com.android.tools.build:gradle:8.2.0"
 androidx-startup = "androidx.startup:startup-runtime:1.1.1"
 androidx-lifecycle-viewmodel = "androidx.lifecycle:lifecycle-viewmodel:2.6.2"
 androidx-test = { module = "androidx.test:core-ktx", version.ref = "androidx-test" }

diff --git a/tests/build.gradle.kts b/tests/build.gradle.kts
@@ -1,5 +1,8 @@
 @file:Suppress("UnstableApiUsage")
 
+import com.android.build.api.variant.HasAndroidTestBuilder
+import com.android.build.api.variant.HasTestFixturesBuilder
+import com.android.build.api.variant.HasUnitTestBuilder
 import com.android.build.gradle.internal.lint.AndroidLintAnalysisTask
 import com.google.devtools.ksp.gradle.KspTask
 
@@ -26,23 +29,13 @@ android {
             dimension = "type"
         }
     }
-    sourceSets {
-        configureEach {
-            java.srcDir(buildDir.resolve("generated/ksp/$name/kotlin"))
-            if (name.startsWith("test")) {
-                java.srcDir(buildDir.resolve("generated/ksp/${name.removePrefix("test").replaceFirstChar(Char::lowercaseChar)}UnitTest/kotlin"))
-            }
-        }
-    }
 }
 
 androidComponents {
     beforeVariants { variant ->
-        with(variant) {
-            enableAndroidTest = variant.buildType == "debug"
-            enableTestFixtures = false
-            enableUnitTest = variant.buildType == "debug"
-        }
+        (variant as? HasAndroidTestBuilder)?.enableAndroidTest = variant.buildType == "debug"
+        (variant as? HasTestFixturesBuilder)?.enableTestFixtures = false
+        (variant as? HasUnitTestBuilder)?.enableUnitTest = variant.buildType == "debug"
     }
 }