From 30302d63d65de303f655a37d69d7b69fabaee55f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 11 Apr 2026 12:22:32 +0000 Subject: [PATCH 1/2] Bumps com.android.tools.build:gradle from 8.7.3 to 9.1.0. --- updated-dependencies: - dependency-name: com.android.tools.build:gradle dependency-version: 9.1.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- android-beans/build.gradle.kts | 33 +++++++++------------------------ gradle.properties | 2 -- gradle/libs.versions.toml | 2 +- 3 files changed, 10 insertions(+), 27 deletions(-) diff --git a/android-beans/build.gradle.kts b/android-beans/build.gradle.kts index 35ea114..fe13dd6 100644 --- a/android-beans/build.gradle.kts +++ b/android-beans/build.gradle.kts @@ -1,25 +1,14 @@ -import com.android.build.gradle.internal.api.BaseVariantOutputImpl -import org.jetbrains.kotlin.gradle.dsl.JvmTarget +import com.android.build.gradle.internal.component.AarCreationConfig plugins { id("com.android.library") - id("kotlin-android") id("org.jetbrains.dokka") version "2.0.0" id("jacoco") id("maven-publish") id("signing") } -kotlin { - compilerOptions { - jvmTarget = JvmTarget.JVM_11 - } -} android { - sourceSets { - maybeCreate("main").java.srcDirs("src/main/kotlin/") - maybeCreate("test").java.srcDirs("src/test/kotlin/") - } namespace = "rocks.frieler.android.beans" compileOptions { @@ -27,27 +16,23 @@ android { sourceCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11 } - compileSdk = 34 - buildToolsVersion = "36.0.0" + compileSdk = 35 defaultConfig { minSdk = 21 - // append version to android build-artifacts: - libraryVariants.all { outputs.all { this as BaseVariantOutputImpl - outputFileName = outputFileName.replace(base.archivesName.get(), "${base.archivesName.get()}-${version}") - }} + // append version to and strip "release" (which ought to be the default) qualifier from android build-artifacts: + androidComponents.onVariants { variant -> + (variant as AarCreationConfig).apply { + aarOutputFileName = listOfNotNull(project.name, project.version, name.takeIf { it != "release" }).joinToString("-", postfix = ".aar") + } + } fileTree("proguard/").forEach(defaultConfig::consumerProguardFile) } buildTypes { getByName("release") { isMinifyEnabled = false - - // strip "-release"-qualifier from artifact file-names, because release is the default: - android.libraryVariants.matching { name == "release" }.all { outputs.all { this as BaseVariantOutputImpl - outputFileName = outputFileName.replace("-release", "") } - } testBuildType = this.name } } @@ -82,7 +67,7 @@ val kdocJar by tasks.registering(Jar::class) { } val sourcesJar by tasks.registering(Jar::class) { - from(android.sourceSets["main"].java.srcDirs) + from(android.sourceSets["main"].kotlin.directories.map { file(it) }) archiveClassifier.set("sources") } diff --git a/gradle.properties b/gradle.properties index dba1d98..bd1b404 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,8 +15,6 @@ org.gradle.jvmargs=-Xmx1536m org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true -android.useAndroidX=true - # configuration for the signing-plugin: # These will be set in the build-script, but must be defined to exist. signing.keyId= diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4f001a0..730fd93 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] kotlin = "2.3.20" -android-build-tools-gradle = "8.7.3" +android-build-tools-gradle = "9.1.0" androidx-activity = "1.10.1" androidx-lifecycle = "2.8.7" android-tools-desugar_jdk_libs = "2.1.5" From a3d712a815109d1f2f7c695f69bafc16f863597c Mon Sep 17 00:00:00 2001 From: "Frieler, Christopher" Date: Sat, 11 Apr 2026 16:08:54 +0200 Subject: [PATCH 2/2] Workaround for sonar gradle plugin ...until it works with Android Gradle Plugin 9. --- android-beans/build.gradle.kts | 5 +++-- gradle.properties | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/android-beans/build.gradle.kts b/android-beans/build.gradle.kts index fe13dd6..142826a 100644 --- a/android-beans/build.gradle.kts +++ b/android-beans/build.gradle.kts @@ -1,3 +1,4 @@ +import com.android.build.api.dsl.LibraryExtension import com.android.build.gradle.internal.component.AarCreationConfig plugins { @@ -8,7 +9,7 @@ plugins { id("signing") } -android { +extensions.configure("android") { namespace = "rocks.frieler.android.beans" compileOptions { @@ -67,7 +68,7 @@ val kdocJar by tasks.registering(Jar::class) { } val sourcesJar by tasks.registering(Jar::class) { - from(android.sourceSets["main"].kotlin.directories.map { file(it) }) + from((project.extensions["android"] as LibraryExtension).sourceSets["main"].kotlin.directories.map { file(it) }) archiveClassifier.set("sources") } diff --git a/gradle.properties b/gradle.properties index bd1b404..88f2151 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,6 +15,9 @@ org.gradle.jvmargs=-Xmx1536m org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true +# workaround, until sonar gradle plugin supports new DSL of AGP9: +android.newDsl = false + # configuration for the signing-plugin: # These will be set in the build-script, but must be defined to exist. signing.keyId=