Skip to content

Commit fe32e5e

Browse files
LazyIonEsLazyIonEs
committed
升级Gradle至8.11.1
1 parent 73279f9 commit fe32e5e

3 files changed

Lines changed: 28 additions & 30 deletions

File tree

‎composeApp/build.gradle.kts‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ val linuxX64Target = "x86_64-unknown-linux-gnu"
1818

1919
val kitVersion by extra("1.5.3")
2020
val kitPackageName = "AndroidToolKit"
21-
val kitDescription = "Desktop tools for Android development, supports Windows and Mac"
21+
val kitDescription = "适用于安卓开发的桌面工具，支持 Windows、Mac 和 Linux"
2222
val kitCopyright = "Copyright (c) 2024 LazyIonEs"
2323
val kitVendor = "LazyIonEs"
2424
val kitLicenseFile = project.rootProject.file("LICENSE")
@@ -31,6 +31,13 @@ val rustGeneratedSource = "${layout.buildDirectory.get()}/generated/source/uniff
3131
group = "org.tool.kit"
3232
version = kitVersion
3333

34+
configurations.commonMainApi {
35+
// com.android.tools:sdk-common
36+
exclude(group = "org.bouncycastle", module = "bcpkix-jdk18on")
37+
exclude(group = "org.bouncycastle", module = "bcprov-jdk18on")
38+
exclude(group = "org.bouncycastle", module = "bcutil-jdk18on")
39+
}
40+
3441
kotlin {
3542
jvmToolchain {
3643
languageVersion.set(javaLanguageVersion)
@@ -56,24 +63,20 @@ kotlin {
5663
implementation(libs.slf4j.api)
5764
implementation(libs.slf4j.simple)
5865
implementation(libs.android.apksig)
66+
implementation(libs.android.sdk.common)
67+
implementation(libs.android.binary.resources)
5968
implementation(libs.commons.codec)
6069
implementation(libs.asm)
6170
implementation(libs.lifecycle.viewmodel.compose)
62-
runtimeOnly(libs.kotlinx.coroutines.swing)
6371
implementation(libs.jna)
64-
implementation("com.android.tools:sdk-common:31.9.0") {
65-
exclude(group = "org.bouncycastle", module = "bcpkix-jdk18on")
66-
exclude(group = "org.bouncycastle", module = "bcprov-jdk18on")
67-
exclude(group = "org.bouncycastle", module = "bcutil-jdk18on")
68-
}
6972
implementation(libs.filekit.core)
7073
implementation(libs.filekit.dialogs)
7174
implementation(libs.filekit.dialogs.compose)
7275
implementation(libs.multiplatform.settings)
7376
implementation(libs.multiplatform.settings.coroutines)
7477
implementation(libs.multiplatform.settings.serialization)
7578
implementation(libs.kotlinx.serialization.json)
76-
implementation(libs.binary.resources)
79+
implementation(libs.kotlinx.datetime)
7780
implementation("com.jetbrains.intellij.platform:util:243.26053.20") {
7881
exclude(group = "com.fasterxml", module = "aalto-xml")
7982
exclude(group = "com.github.ben-manes.caffeine", module = "caffeine")
@@ -94,8 +97,7 @@ kotlin {
9497
exclude(group = "org.slf4j", module = "log4j-over-slf4j")
9598
exclude(group = "oro", module = "oro")
9699
}
97-
implementation(libs.kotlinx.datetime)
98-
implementation(libs.compottie)
100+
runtimeOnly(libs.kotlinx.coroutines.swing)
99101
}
100102
desktopMain.dependencies {
101103
implementation(compose.desktop.currentOs)
@@ -231,7 +233,7 @@ fun currentOs(): OS {
231233
}
232234

233235
fun buildRust() {
234-
exec {
236+
providers.exec {
235237
println("Build rs called")
236238
val binary = if (currentOs() == OS.LINUX && useCross) {
237239
"cross"
@@ -253,7 +255,7 @@ fun buildRust() {
253255

254256
workingDir = File(rootDir, "rs")
255257
commandLine = params
256-
}
258+
}.result.get()
257259
}
258260

259261
fun copyRustBuild() {
@@ -294,13 +296,13 @@ fun copyRustBuild() {
294296
}
295297

296298
fun generateKotlinFromUdl() {
297-
exec {
299+
providers.exec {
298300
workingDir = File(rootDir, "rs")
299301
commandLine = listOf(
300302
"cargo", "run", "--features=uniffi/cli",
301303
"--bin", "uniffi-bindgen", "generate", "src/toolkit.udl",
302304
"--language", "kotlin",
303305
"--out-dir", rustGeneratedSource
304306
)
305-
}
306-
}
307+
}.result.get()
308+
}

‎gradle/libs.versions.toml‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,20 @@ compose-compiler = "1.5.8"
44
compose-plugin = "1.7.3"
55
junit = "4.13.2"
66
kotlin = "2.1.10"
7-
apksig = "8.9.0"
8-
tools = "31.9.0"
7+
apksig = "8.9.1"
8+
tools = "31.9.1"
99
slf4j = "2.0.17"
10-
buildconfig = "5.5.4"
10+
buildconfig = "5.6.2"
1111
commons-codec = "1.18.0"
12-
asm = "9.7.1"
12+
asm = "9.8"
1313
jna = "5.17.0"
1414
logging = "7.0.0"
1515
lifecycle = "2.8.4"
16-
coroutines = "1.9.0"
16+
coroutines = "1.10.2"
1717
filekit = "0.10.0-beta01"
1818
multiplatform-settings = "1.3.0"
19-
kotlinx-serialization-json = "1.8.0"
20-
apkparser = "31.9.0"
19+
kotlinx-serialization-json = "1.8.1"
2120
kotlinx-datetime = "0.6.2"
22-
compottie="2.0.0-rc04"
2321

2422
[libraries]
2523
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
@@ -37,7 +35,9 @@ lifecycle-viewmodel-compose = { module = "org.jetbrains.androidx.lifecycle:lifec
3735
# https://mvnrepository.com/artifact/com.android.tools.build/apksig
3836
android-apksig = { module = "com.android.tools.build:apksig", version.ref = "apksig" }
3937
# https://mvnrepository.com/artifact/com.android.tools/sdk-common
40-
android-tools-sdk-common = { module = "com.android.tools:sdk-common", version.ref = "tools" }
38+
android-sdk-common = { module = "com.android.tools:sdk-common", version.ref = "tools" }
39+
# https://mvnrepository.com/artifact/com.android.tools.apkparser/binary-resources
40+
android-binary-resources = { module = "com.android.tools.apkparser:binary-resources", version.ref = "tools" }
4141
# https://mvnrepository.com/artifact/org.slf4j/slf4j-api
4242
slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
4343
slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j" }
@@ -48,7 +48,7 @@ asm = { module = "org.ow2.asm:asm", version.ref = "asm" }
4848
# https://mvnrepository.com/artifact/net.java.dev.jna/jna
4949
jna = { module = "net.java.dev.jna:jna", version.ref = "jna" }
5050
logging = { module = "io.github.oshai:kotlin-logging-jvm", version.ref = "logging" }
51-
# https://mvnrepository.com/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-swing
51+
# https://github.com/Kotlin/kotlinx.coroutines
5252
kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "coroutines" }
5353
# https://github.com/vinceglb/FileKit
5454
filekit-core = { module = "io.github.vinceglb:filekit-core", version.ref = "filekit" }
@@ -60,12 +60,8 @@ multiplatform-settings-coroutines = { module = "com.russhwolf:multiplatform-sett
6060
multiplatform-settings-serialization = { module = "com.russhwolf:multiplatform-settings-serialization", version.ref = "multiplatform-settings" }
6161
# https://github.com/Kotlin/kotlinx.serialization
6262
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }
63-
# https://mvnrepository.com/artifact/com.android.tools.apkparser/binary-resources
64-
binary-resources = { module = "com.android.tools.apkparser:binary-resources", version.ref = "apkparser" }
6563
# https://github.com/Kotlin/kotlinx-datetime
6664
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
67-
# https://github.com/alexzhirkevich/compottie
68-
compottie = { module = "io.github.alexzhirkevich:compottie", version.ref = "compottie" }
6965

7066
[plugins]
7167
jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)