Skip to content

Commit 3f18581

Browse files
committed
Feat: AGP 9
Signed-off-by: imknown <imknown@qq.com>
1 parent 0029e1d commit 3f18581

7 files changed

Lines changed: 4 additions & 14 deletions

File tree

app/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import kotlin.reflect.KFunction1
77
plugins {
88
alias(libsAndroid.plugins.android.application)
99

10-
alias(libsKotlin.plugins.kotlin.android)
1110
alias(libsKotlin.plugins.kotlinx.serialization)
1211

1312
alias(libsGoogle.plugins.googleServices)
@@ -60,7 +59,7 @@ android {
6059
fun String.toResString() = "$javaPathString/$javaPackageName/$this/res"
6160
val baseResString = "base".toResString()
6261

63-
res.srcDirs(
62+
res.directories += listOf(
6463
baseResString,
6564
"${baseResString}Launcher",
6665
"${baseResString}Backup",

base/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
plugins {
22
alias(libsAndroid.plugins.android.library)
3-
4-
alias(libsKotlin.plugins.kotlin.android)
53
}
64

75
private val buildVersion = libsBuild.versions

binderDetector/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
plugins {
22
alias(libsAndroid.plugins.android.library)
3-
4-
alias(libsKotlin.plugins.kotlin.android)
53
}
64

75
private val buildVersion = libsBuild.versions

build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ plugins {
33
alias(libsAndroid.plugins.android.application) apply false
44
alias(libsAndroid.plugins.android.library) apply false
55

6-
alias(libsKotlin.plugins.kotlin.android) apply false
76
alias(libsKotlin.plugins.kotlinx.serialization) apply false
87

98
alias(libsGoogle.plugins.googleServices) apply false

gradle.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ android.useAndroidX=true
4141
android.enableBuildConfigAsBytecode=true
4242
#
4343
android.debug.obsoleteApi=true
44-
#
45-
android.r8.optimizedResourceShrinking=true
4644
# endregion [Android]
4745
#
4846
# region [Kotlin]

gradle/toml/android.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
# https://developer.android.com/studio/releases
55
# https://androidstudio.googleblog.com/
66
# https://maven.google.com/web/index.html?q=com.android.tools.build
7-
androidGradlePlugin = "8.13.2"
8-
androidGradlePlugin-beta = "9.0.0-beta03"
9-
androidGradlePlugin-canary = "9.0.0-beta03"
7+
androidGradlePlugin = "9.0.0-rc01"
8+
androidGradlePlugin-beta = "9.0.0-rc01"
9+
androidGradlePlugin-canary = "9.0.0-rc01"
1010

1111
# https://developer.android.com/studio/write/java8-support#library-desugaring
1212
# https://maven.google.com/web/index.html?q=desugar_jdk_libs

gradle/toml/kotlin.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,4 @@ ktor-client-logging = { group = "io.ktor", name = "ktor-client-logging", version
2323
ktor-client = ["ktor-client-core", "ktor-client-okhttp", "ktor-client-logging"]
2424

2525
[plugins]
26-
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
27-
2826
kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }

0 commit comments

Comments
 (0)