From 2e8e3de49a63544f123e96cdb7fd7f70af6b4276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E5=9D=82=E9=9B=85?= <23130178+ShadowRZ@users.noreply.github.com> Date: Sun, 27 Sep 2026 08:28:48 +0800 Subject: [PATCH] feat(android-app): compileSdk: 37 -> 37.2 --- android-app/build.gradle.kts | 4 ++++ .../projectkafka/gradle/plugins/MultiplatformPlugin.kt | 4 +++- .../projectkafka/gradle/plugins/configure/Android.kt | 8 +++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/android-app/build.gradle.kts b/android-app/build.gradle.kts index 7d759233..55eac78b 100644 --- a/android-app/build.gradle.kts +++ b/android-app/build.gradle.kts @@ -21,6 +21,10 @@ android { versionCode = versionCodeP.get() versionName = versionNameP.get() + targetSdk { + version = release(37) + } + resValue( "string", "app_name", diff --git a/plugins/src/main/kotlin/io/github/shadowrz/projectkafka/gradle/plugins/MultiplatformPlugin.kt b/plugins/src/main/kotlin/io/github/shadowrz/projectkafka/gradle/plugins/MultiplatformPlugin.kt index 4df82e72..a7d3691d 100644 --- a/plugins/src/main/kotlin/io/github/shadowrz/projectkafka/gradle/plugins/MultiplatformPlugin.kt +++ b/plugins/src/main/kotlin/io/github/shadowrz/projectkafka/gradle/plugins/MultiplatformPlugin.kt @@ -7,6 +7,7 @@ import io.github.shadowrz.projectkafka.gradle.plugins.configure.applyCodestyle import io.github.shadowrz.projectkafka.gradle.plugins.configure.applyKover import io.github.shadowrz.projectkafka.gradle.plugins.configure.configureKotlin import io.github.shadowrz.projectkafka.gradle.plugins.configure.configureNonAndroidLint +import io.github.shadowrz.projectkafka.gradle.plugins.configure.kafkaCompileSdkSpec import io.github.shadowrz.projectkafka.gradle.plugins.extensions.libs import org.gradle.api.Plugin import org.gradle.api.Project @@ -37,7 +38,8 @@ class MultiplatformPlugin : Plugin { } kotlin.targets.withType(KotlinMultiplatformAndroidLibraryTarget::class.java).configureEach { android -> - android.compileSdk = kafkaProperties.compileSdk.get() + android.compileSdk { kafkaCompileSdkSpec() } + android.minSdk = kafkaProperties.minSdk.get() android.enableCoreLibraryDesugaring = true diff --git a/plugins/src/main/kotlin/io/github/shadowrz/projectkafka/gradle/plugins/configure/Android.kt b/plugins/src/main/kotlin/io/github/shadowrz/projectkafka/gradle/plugins/configure/Android.kt index 4335cf8d..fa902b42 100644 --- a/plugins/src/main/kotlin/io/github/shadowrz/projectkafka/gradle/plugins/configure/Android.kt +++ b/plugins/src/main/kotlin/io/github/shadowrz/projectkafka/gradle/plugins/configure/Android.kt @@ -1,6 +1,7 @@ package io.github.shadowrz.projectkafka.gradle.plugins.configure import com.android.build.api.dsl.CommonExtension +import com.android.build.api.dsl.CompileSdkSpec import io.github.shadowrz.projectkafka.gradle.plugins.ConfigurationNames import io.github.shadowrz.projectkafka.gradle.plugins.KafkaProperties import io.github.shadowrz.projectkafka.gradle.plugins.PluginIds @@ -15,7 +16,8 @@ internal fun Project.configureAndroid(kafkaProperties: KafkaProperties) { pluginManager.withPlugin(PluginIds.AGP_BASE) { extensions.configure(CommonExtension::class.java) { android -> - android.compileSdk = kafkaProperties.compileSdk.get() + android.compileSdk { kafkaCompileSdkSpec() } + android.defaultConfig.apply { minSdk = kafkaProperties.minSdk.get() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" @@ -47,3 +49,7 @@ internal fun Project.configureAndroid(kafkaProperties: KafkaProperties) { dependencies.add(ConfigurationNames.CORE_LIBRARY_DESUGARING, desugar) } } + +internal fun CompileSdkSpec.kafkaCompileSdkSpec() { + version = release(37) { minorApiLevel = 2 } +}