Bump compileSdk to 37.1

This commit is contained in:
AntsyLich
2026-09-12 15:24:52 +06:00
parent 2292554d97
commit 802958b1ea
4 changed files with 21 additions and 3 deletions
@@ -8,6 +8,7 @@ import mihon.gradle.extensions.configureTest
import mihon.gradle.extensions.coreLibraryDesugaring import mihon.gradle.extensions.coreLibraryDesugaring
import mihon.gradle.extensions.libs import mihon.gradle.extensions.libs
import mihon.gradle.extensions.mihonx import mihon.gradle.extensions.mihonx
import mihon.gradle.extensions.release
import org.gradle.api.Plugin import org.gradle.api.Plugin
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.kotlin.dsl.dependencies import org.gradle.kotlin.dsl.dependencies
@@ -28,7 +29,9 @@ class PluginAndroidBase : Plugin<Project> {
ndkVersion = mihonx.versions.android.ndk.get() ndkVersion = mihonx.versions.android.ndk.get()
} }
compileSdk = mihonx.versions.android.sdk.compile.get().toInt() compileSdk {
version = release(mihonx.versions.android.sdk.compile)
}
compileOptions { compileOptions {
isCoreLibraryDesugaringEnabled = true isCoreLibraryDesugaringEnabled = true
@@ -6,6 +6,7 @@ import mihon.gradle.extensions.coreLibraryDesugaring
import mihon.gradle.extensions.libs import mihon.gradle.extensions.libs
import mihon.gradle.extensions.mihonx import mihon.gradle.extensions.mihonx
import mihon.gradle.extensions.plugins import mihon.gradle.extensions.plugins
import mihon.gradle.extensions.release
import org.gradle.api.Plugin import org.gradle.api.Plugin
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.configure
@@ -31,7 +32,9 @@ class PluginKotlinMultiplatform : Plugin<Project> {
android { android {
minSdk = mihonx.versions.android.sdk.min.get().toInt() minSdk = mihonx.versions.android.sdk.min.get().toInt()
compileSdk = mihonx.versions.android.sdk.compile.get().toInt() compileSdk {
version = release(mihonx.versions.android.sdk.compile)
}
enableCoreLibraryDesugaring = true enableCoreLibraryDesugaring = true
} }
} }
@@ -0,0 +1,12 @@
package mihon.gradle.extensions
import com.android.build.api.dsl.CompileSdkSpec
import com.android.build.api.dsl.CompileSdkVersion
import org.gradle.api.provider.Provider
internal fun CompileSdkSpec.release(version: Provider<String>): CompileSdkVersion {
val (major, minor) = version.get().split(".", limit = 2).let {
it[0].toInt() to it.getOrNull(1)?.toInt()
}
return release(major) { minorApiLevel = minor }
}
+1 -1
View File
@@ -1,7 +1,7 @@
[versions] [versions]
# Used in [/gradle/build-config/src/main/kotlin/PluginKotlinMultiplatform.kt] # Used in [/gradle/build-config/src/main/kotlin/PluginKotlinMultiplatform.kt]
android-sdk-min = "26" android-sdk-min = "26"
android-sdk-compile = "37" android-sdk-compile = "37.1"
android-sdk-target = "36" android-sdk-target = "36"
android-ndk = "29.0.14206865" android-ndk = "29.0.14206865"
java = "17" java = "17"