Merge pull request #510 from kennethshackleton/agp-8.3

Android Gradle Plugin 8.3.2.
bloomberg · Apr 22, 2024 · 496a666 · 496a666
2 parents 545253c + 6673f9f
commit 496a666
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -129,7 +129,8 @@ subprojects {
         systemProperty("com.bloomberg.selekt.can_use_load", true)
         systemProperty(
             "com.bloomberg.selekt.library_path",
-            layout.buildDirectory.dir("intermediates/assets/debugUnitTest").get().asFile.toString()
+            layout.buildDirectory.dir("intermediates/assets/debugUnitTest/mergeDebugUnitTestAssets").get()
+                .asFile.toString()
         )
     }
     tasks.withType<KotlinCompile>().configureEach {

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -38,5 +38,5 @@ gradlePlugin {
 
 dependencies {
     implementation(kotlin("gradle-plugin", version = kotlinVersion))
-    implementation("com.android.tools.build:gradle:8.2.2")
+    implementation("com.android.tools.build:gradle:8.3.0")
 }
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -22,7 +22,7 @@ enum class Versions(
 ) {
     ANDROID_BENCHMARK("1.2.0-alpha13", URL("https://developer.android.com/studio/profile/benchmark")),
     ANDROID_BUILD_TOOLS("34.0.0", URL("https://developer.android.com/studio/releases/build-tools")),
-    ANDROID_GRADLE_PLUGIN("8.2.2", URL("https://developer.android.com/tools/revisions/gradle-plugin.html")),
+    ANDROID_GRADLE_PLUGIN("8.3.2", URL("https://developer.android.com/tools/revisions/gradle-plugin.html")),
     ANDROID_LINT("30.0.2", URL("https://github.com/googlesamples/android-custom-lint-rules")),
     ANDROID_NDK("26.1.10909125", URL("https://developer.android.com/ndk")),
     ANDROID_SDK("34", URL("https://developer.android.com/sdk")),

diff --git a/selekt-android/build.gradle.kts b/selekt-android/build.gradle.kts
@@ -1,3 +1,6 @@
+import com.android.build.gradle.internal.lint.AndroidLintAnalysisTask
+import com.android.build.gradle.internal.lint.LintModelWriterTask
+
 /*
  * Copyright 2020 Bloomberg Finance L.P.
  *
@@ -108,6 +111,14 @@ arrayOf("Debug", "Release").map { "pre${it}UnitTestBuild" }.forEach {
     }
 }
 
+tasks.withType<AndroidLintAnalysisTask>().configureEach {
+    dependsOn("copyJniLibs")
+}
+
+tasks.withType<LintModelWriterTask>().configureEach {
+    dependsOn("copyJniLibs")
+}
+
 arrayOf("Debug", "Release").map { "merge${it}UnitTestAssets" }.forEach {
     tasks.whenTaskAdded {
         if (it == name) {