PM-31922: Remove deprecated Android block where possible (#6512)

This commit is contained in:
David Perez
2026-02-11 09:55:33 -06:00
committed by GitHub
parent a3aefd369a
commit e5875cd8fe
10 changed files with 225 additions and 148 deletions

View File

@@ -1,3 +1,6 @@
import com.android.build.api.dsl.LibraryExtension
import com.android.build.gradle.tasks.BundleAar
import org.gradle.kotlin.dsl.support.uppercaseFirstChar
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
// For more info on versioning, see the README.
@@ -9,14 +12,18 @@ plugins {
alias(libs.plugins.kotlin.serialization)
}
android {
configure<LibraryExtension> {
namespace = "com.bitwarden.authenticatorbridge"
compileSdk = libs.versions.compileSdk.get().toInt()
setVersion(version)
compileSdk {
version = release(libs.versions.compileSdk.get().toInt())
}
defaultConfig {
// This min value is selected to accommodate known consumers
minSdk = libs.versions.minSdkBwa.get().toInt()
minSdk {
version = release(libs.versions.minSdkBwa.get().toInt())
}
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
buildConfigField("String", "VERSION", "\"$version\"")
@@ -39,21 +46,23 @@ android {
buildConfig = true
aidl = true
}
// Add version name to the output .aar file:
libraryVariants.all {
val variant = this
outputs
.map { it as com.android.build.gradle.internal.api.BaseVariantOutputImpl }
.forEach { output ->
val outputFileName = "authenticatorbridge-$version-${variant.baseName}.aar"
output.outputFileName = outputFileName
}
androidComponents {
onVariants { libVariant ->
val bundleTaskName = "bundle${libVariant.name.uppercaseFirstChar()}Aar"
tasks
.withType<BundleAar>()
.named { it == bundleTaskName }
.configureEach {
archiveFileName.set("authenticatorbridge-$version-${libVariant.name}.aar")
}
}
}
kotlin {
compilerOptions {
jvmTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
}
}