From e4662b832abfea3ed9167757beae9fa32844280b Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Tue, 5 Mar 2024 10:49:07 +0000 Subject: [PATCH 1/4] Android Gradle Plugin 8.3.0. Signed-off-by: Kenneth J. Shackleton --- buildSrc/build.gradle.kts | 2 +- buildSrc/src/main/kotlin/Versions.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 74fcd282ac..df7e4ae1b6 100644 --- 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 index 0ec0211335..0409e1f65a 100644 --- 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.0", 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")), From 4479b21aa4a7a18d28f62a9b536203e6213a4b29 Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Wed, 6 Mar 2024 07:09:34 +0000 Subject: [PATCH 2/4] Add task dependency. Signed-off-by: Kenneth J. Shackleton --- selekt-android/build.gradle.kts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/selekt-android/build.gradle.kts b/selekt-android/build.gradle.kts index e4e8565ae4..bb8ffa769f 100644 --- 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().configureEach { + dependsOn("copyJniLibs") +} + +tasks.withType().configureEach { + dependsOn("copyJniLibs") +} + arrayOf("Debug", "Release").map { "merge${it}UnitTestAssets" }.forEach { tasks.whenTaskAdded { if (it == name) { From 5672d4984a660e3e55ad61e9a3d045c4097a0bfa Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Sun, 21 Apr 2024 16:35:02 +0100 Subject: [PATCH 3/4] Android Gradle Plugin 8.3.2. Signed-off-by: Kenneth J. Shackleton --- buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 0409e1f65a..15de5931c4 100644 --- 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.3.0", 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")), From 6673f9fcb9cb486c59748345dec6070d869c051b Mon Sep 17 00:00:00 2001 From: "Kenneth J. Shackleton" Date: Mon, 22 Apr 2024 07:27:40 +0100 Subject: [PATCH 4/4] Update path to built native libaries. Signed-off-by: Kenneth J. Shackleton --- build.gradle.kts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index a64b621796..719f8e07b3 100644 --- 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().configureEach {