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,4 @@
import com.android.build.api.dsl.LibraryExtension
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
plugins {
@@ -7,15 +8,18 @@ plugins {
alias(libs.plugins.ksp)
}
android {
configure<LibraryExtension> {
namespace = "com.bitwarden.core"
compileSdk = libs.versions.compileSdk.get().toInt()
compileSdk {
version = release(libs.versions.compileSdk.get().toInt())
}
defaultConfig {
// Set the minimum SDK version to the SDK version used by Authenticator, which is the lowest
// universally supported SDK version.
minSdk = libs.versions.minSdkBwa.get().toInt()
minSdk {
version = release(libs.versions.minSdkBwa.get().toInt())
}
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
}
@@ -64,6 +68,6 @@ dependencies {
kotlin {
compilerOptions {
jvmTarget = JvmTarget.fromTarget(libs.versions.jvmTarget.get())
jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get()))
}
}