Skip to content

Commit dc5ebcf

Browse files
authored
使用 libs.versions.toml 管理依赖版本 (#3873)
1 parent 038f56b commit dc5ebcf

5 files changed

Lines changed: 59 additions & 18 deletions

File tree

HMCL/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import java.security.spec.PKCS8EncodedKeySpec
99
import java.util.zip.ZipFile
1010

1111
plugins {
12-
id("com.gradleup.shadow") version "8.3.6"
12+
alias(libs.plugins.shadow)
1313
}
1414

1515
val isOfficial = System.getenv("HMCL_SIGNATURE_KEY") != null
@@ -40,7 +40,7 @@ version = "$versionRoot.$buildNumber"
4040
dependencies {
4141
implementation(project(":HMCLCore"))
4242
implementation("libs:JFoenix")
43-
implementation("com.twelvemonkeys.imageio:imageio-webp:3.12.0")
43+
implementation(libs.twelvemonkeys.imageio.webp)
4444

4545
if (launcherExe == null) {
4646
implementation("org.glavo.hmcl:HMCLauncher:3.6.0.1")

HMCLCore/build.gradle.kts

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,17 @@ plugins {
33
}
44

55
dependencies {
6-
val kalaCompressVersion = "1.27.1-1"
7-
8-
api("org.glavo.kala:kala-compress-archivers-zip:$kalaCompressVersion")
9-
api("org.glavo.kala:kala-compress-archivers-tar:$kalaCompressVersion")
10-
api("org.glavo:simple-png-javafx:0.3.0")
11-
api("com.google.code.gson:gson:2.13.0")
12-
api("com.moandjiezana.toml:toml4j:0.7.2")
13-
api("org.tukaani:xz:1.10")
14-
api("org.hildan.fxgson:fx-gson:5.0.0")
15-
api("org.jenkins-ci:constant-pool-scanner:1.2")
16-
api("com.github.steveice10:opennbt:1.5")
17-
api("org.nanohttpd:nanohttpd:2.3.1")
18-
api("org.jsoup:jsoup:1.19.1")
19-
api("org.glavo:chardet:2.5.0")
20-
compileOnlyApi("org.jetbrains:annotations:26.0.1")
6+
api(libs.kala.compress.zip)
7+
api(libs.kala.compress.tar)
8+
api(libs.simple.png.javafx)
9+
api(libs.gson)
10+
api(libs.toml)
11+
api(libs.xz)
12+
api(libs.fx.gson)
13+
api(libs.constant.pool.scanner)
14+
api(libs.opennbt)
15+
api(libs.nanohttpd)
16+
api(libs.jsoup)
17+
api(libs.chardet)
18+
compileOnlyApi(libs.jetbrains.annotations)
2119
}

buildSrc/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ repositories {
33
}
44

55
dependencies {
6-
implementation("com.google.code.gson:gson:2.13.0")
6+
implementation(libs.gson)
77
}
88

99
java {

buildSrc/settings.gradle.kts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
dependencyResolutionManagement {
2+
versionCatalogs {
3+
create("libs") {
4+
from(files("../gradle/libs.versions.toml"))
5+
}
6+
}
7+
}

gradle/libs.versions.toml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
[versions]
2+
jetbrains-annotations = "26.0.1"
3+
kala-compress = "1.27.1-1"
4+
simple-png-javafx = "0.3.0"
5+
gson = "2.13.0"
6+
toml4j = "0.7.2"
7+
xz = "1.10"
8+
fx-gson = "5.0.0"
9+
constant-pool-scanner = "1.2"
10+
opennbt = "1.5"
11+
nanohttpd = "2.3.1"
12+
jsoup = "1.19.1"
13+
chardet = "2.5.0"
14+
twelvemonkeys = "3.12.0"
15+
16+
# plugins
17+
shadow = "8.3.6"
18+
19+
[libraries]
20+
jetbrains-annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrains-annotations" }
21+
kala-compress-zip = { module = "org.glavo.kala:kala-compress-archivers-zip", version.ref = "kala-compress" }
22+
kala-compress-tar = { module = "org.glavo.kala:kala-compress-archivers-tar", version.ref = "kala-compress" }
23+
simple-png-javafx = { module = "org.glavo:simple-png-javafx", version.ref = "simple-png-javafx" }
24+
gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
25+
toml = { module = "com.moandjiezana.toml:toml4j", version.ref = "toml4j" }
26+
xz = { module = "org.tukaani:xz", version.ref = "xz" }
27+
fx-gson = { module = "org.hildan.fxgson:fx-gson", version.ref = "fx-gson" }
28+
constant-pool-scanner = { module = "org.jenkins-ci:constant-pool-scanner", version.ref = "constant-pool-scanner" }
29+
opennbt = { module = "com.github.steveice10:opennbt", version.ref = "opennbt" }
30+
nanohttpd = { module = "org.nanohttpd:nanohttpd", version.ref = "nanohttpd" }
31+
jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
32+
chardet = { module = "org.glavo:chardet", version.ref = "chardet" }
33+
twelvemonkeys-imageio-webp = { module = "com.twelvemonkeys.imageio:imageio-webp", version.ref = "twelvemonkeys" }
34+
35+
[plugins]
36+
shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }

0 commit comments

Comments
 (0)