Skip to content

Commit 21e8445

Browse files
committed
chore: Update compileSdk to 36.1
Signed-off-by: Hu Shenghao <dede.hu@qq.com>
1 parent 8bac0b4 commit 21e8445

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

build-logic/convention/src/main/kotlin/Versions.kt

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,21 @@
1+
import com.android.build.api.dsl.CompileSdkSpec
2+
import com.android.build.api.dsl.TargetSdkSpec
13
import org.gradle.jvm.toolchain.JavaLanguageVersion
24

35
object Versions {
46

5-
const val COMPILE_SDK = 36
6-
const val BUILD_TOOLS = "36.0.0"
7-
const val TARGET_SDK = 36
7+
val compileSdk: CompileSdkSpec.() -> Unit = {
8+
version = release(36) {
9+
minorApiLevel = 1
10+
}
11+
}
12+
13+
const val BUILD_TOOLS = "36.1.0"
14+
15+
val targetSdk: TargetSdkSpec.() -> Unit = {
16+
version = release(36)
17+
}
18+
819
const val MIN_SDK = 21
920

1021
val JAVA_VERSION: JavaLanguageVersion = JavaLanguageVersion.of(17)

build-logic/convention/src/main/kotlin/com/dede/android_eggs/plugins/AbsConfigurablePlugin.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ abstract class AbsConfigurablePlugin(
107107
private fun Project.configureAndroid(configurable: Configurable) {
108108

109109
android<CommonExtension<*, *, *, *, *, *>> {
110-
compileSdk = Versions.COMPILE_SDK
110+
compileSdk(Versions.compileSdk)
111111
buildToolsVersion = Versions.BUILD_TOOLS
112112

113113
defaultConfig {
@@ -127,7 +127,7 @@ abstract class AbsConfigurablePlugin(
127127
ModuleType.APP -> {
128128
with(this as AppExtension) {
129129
defaultConfig {
130-
targetSdk = Versions.TARGET_SDK
130+
targetSdk(Versions.targetSdk)
131131
}
132132
}
133133
}

0 commit comments

Comments
 (0)