Skip to content

Commit 18b3049

Browse files
chore(1.21.11-fabric): upgrade fabric-loom-remap to 1.15.5
chore(1.21.11-fabric): upgrade fabric-loader to 0.18.4 chore(1.21.11-fabric): upgrade fabric-api to 0.141.3+1.21.11 chore(1.21.11-fabric): upgrade jackson to 3.1.0 chore(1.21.11-fabric): upgrade jetbrains-annotations to 26.1.0 chore(1.21.11-fabric): upgrade flowerinsnowlib to 1.6.0
1 parent 4639676 commit 18b3049

9 files changed

Lines changed: 74 additions & 26 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- run: |
3434
./gradlew build
3535
env:
36-
GITHUB_PKG_R_TOKEN: ${{ secrets.PKG_R_TOKEN }}
36+
GITHUB_PUBLIC_READONLY_TOKEN: ${{ secrets.PUBLIC_READONLY_TOKEN }}
3737
3838
- name: 'Upload release'
3939
uses: 'softprops/action-gh-release@v2'

1.21.11-fabric/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ repositories {
2323

2424
credentials {
2525
username = "x-access-token"
26-
password = "${System.getenv("GITHUB_PKG_R_TOKEN")}"
26+
password = "${System.getenv("GITHUB_PUBLIC_READONLY_TOKEN")}"
2727
}
2828
}
2929

1.21.11-fabric/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ org.gradle.parallel=true
66
org.gradle.configuration-cache=false
77

88
# Mod Properties
9-
mod_version=19.0.0+fabric
9+
mod_version=19.0.1+fabric
1010
maven_group=cn.flowerinsnow.greatscrollabletooltips
1111
archives_base_name=great-scrollable-tooltips

1.21.11-fabric/gradle/libs.versions.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[versions]
2-
fabric-loom-remap = '1.15.0-alpha.29'
2+
fabric-loom-remap = '1.15.5'
33
minecraft = '1.21.11'
4-
fabric-loader = '0.18.3'
5-
fabric-api = '0.141.1+1.21.11'
4+
fabric-loader = '0.18.4'
5+
fabric-api = '0.141.3+1.21.11'
66
modmenu = '17.0.0-beta.2'
7-
jackson-bom = '3.0.3'
8-
jetbrains-annotations = '26.0.2-1'
9-
flowerinsnowlib-bom = '1.4.0'
7+
jackson-bom = '3.1.0'
8+
jetbrains-annotations = '26.1.0'
9+
flowerinsnowlib-bom = '1.6.0'
1010

1111
[libraries]
1212
minecraft = { module = 'com.mojang:minecraft', version.ref = 'minecraft' }
@@ -23,4 +23,4 @@ flowerinsnowlib-jackson-databind-core = { module = 'cn.flowerinsnow.flowerinsnow
2323
flowerinsnowlib-jackson-databind-java11 = { module = 'cn.flowerinsnow.flowerinsnowlib:jackson-databind-java11' }
2424

2525
[plugins]
26-
fabric-loom-remap = { id = 'net.fabricmc.fabric-loom-remap', version.ref = 'fabric-loom-remap' }
26+
fabric-loom-remap = { id = 'net.fabricmc.fabric-loom-remap', version.ref = 'fabric-loom-remap' }
2.73 KB
Binary file not shown.

1.21.11-fabric/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-9.3.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

1.21.11-fabric/gradlew

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 36 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id("net.fabricmc.fabric-loom-remap") version "1.15.0-alpha.6"
2+
alias(libs.plugins.fabric.loom.remap)
33
}
44

55
group = "${project.property("maven_group")}"
@@ -16,30 +16,47 @@ repositories {
1616
}
1717
}
1818

19+
maven("https://maven.pkg.github.com/flowerinsnowdh/FlowerinsnowLib") {
20+
content {
21+
includeGroup("cn.flowerinsnow.flowerinsnowlib")
22+
}
23+
24+
credentials {
25+
username = "x-access-token"
26+
password = "${System.getenv("GITHUB_PKG_R_TOKEN")}"
27+
}
28+
}
29+
1930
System.getenv("GRADLE_CENTRAL_MIRROR")?.let {
2031
maven(it)
2132
}
2233
mavenCentral()
2334
}
2435

2536
dependencies {
26-
minecraft("com.mojang:minecraft:${project.property("minecraft_version")}")
37+
minecraft(libs.minecraft)
2738
mappings(loom.officialMojangMappings())
28-
modImplementation("net.fabricmc:fabric-loader:${project.property("loader_version")}")
39+
modImplementation(libs.fabric.loader)
40+
41+
modImplementation(libs.fabric.api)
2942

30-
modImplementation("net.fabricmc.fabric-api:fabric-api:${project.property("fabric_version")}")
43+
modImplementation(libs.modmenu)
3144

32-
modImplementation("com.terraformersmc:modmenu:${project.property("modmenu_version")}")
45+
include(platform(libs.jackson.bom))
46+
include(libs.jackson.annotations)
47+
include(libs.jackson.core)
48+
include(libs.jackson.databind)
3349

34-
include(implementation("tools.jackson.core:jackson-core:${project.property("jackson_version")}") as Dependency)
35-
include(implementation("com.fasterxml.jackson.core:jackson-annotations:2.20") as Dependency)
36-
include(implementation("tools.jackson.core:jackson-databind:${project.property("jackson_version")}") as Dependency)
37-
include(implementation("tools.jackson.dataformat:jackson-dataformat-toml:${project.property("jackson_version")}") as Dependency)
50+
implementation(platform(libs.flowerinsnowlib.bom))
51+
include(platform(libs.flowerinsnowlib.bom))
52+
implementation(libs.flowerinsnowlib.jackson.databind.java11)
53+
include(libs.flowerinsnowlib.jackson.databind.core)
54+
include(libs.flowerinsnowlib.jackson.databind.java11)
3855

39-
compileOnly("org.jetbrains:annotations:${project.property("jetbrains_annotations_version")}")
56+
compileOnly(libs.jetbrains.annotations)
4057
}
4158

42-
tasks.processResources {
59+
tasks.named<ProcessResources>("processResources").configure {
4360
val replaceProperties = mapOf(
4461
"version" to "${project.version}"
4562
)
@@ -52,10 +69,15 @@ tasks.processResources {
5269

5370
java {
5471
toolchain {
55-
languageVersion = JavaLanguageVersion.of(21)
72+
languageVersion = JavaLanguageVersion.of(25)
5673
}
5774
}
5875

59-
tasks.jar {
76+
tasks.withType<JavaCompile>().configureEach {
77+
options.encoding = "UTF-8"
78+
options.release = 21
79+
}
80+
81+
tasks.named<Jar>("jar").configure {
6082
from("../LICENSE")
61-
}
83+
}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
[versions]
2+
fabric-loom-remap = '1.15.3'
3+
minecraft = '1.21.11'
4+
fabric-loader = '0.18.3'
5+
fabric-api = '0.141.1+1.21.11'
6+
modmenu = '17.0.0-beta.2'
7+
jackson-bom = '3.0.3'
8+
jetbrains-annotations = '26.0.2-1'
9+
flowerinsnowlib-bom = '1.4.0'
10+
11+
[libraries]
12+
minecraft = { module = 'com.mojang:minecraft', version.ref = 'minecraft' }
13+
fabric-loader = { module = 'net.fabricmc:fabric-loader', version.ref = 'fabric-loader' }
14+
fabric-api = { module = 'net.fabricmc.fabric-api:fabric-api', version.ref = 'fabric-api' }
15+
modmenu = { module = 'com.terraformersmc:modmenu', version.ref = 'modmenu' }
16+
jackson-bom = { module = 'tools.jackson:jackson-bom', version.ref = 'jackson-bom' }
17+
jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations" }
18+
jackson-core = { module = 'tools.jackson.core:jackson-core' }
19+
jackson-databind = { module = 'tools.jackson.core:jackson-databind' }
20+
jetbrains-annotations = { module = 'org.jetbrains:annotations', version.ref = 'jetbrains-annotations' }
21+
flowerinsnowlib-bom = { module = 'cn.flowerinsnow.flowerinsnowlib:bom', version.ref = 'flowerinsnowlib-bom' }
22+
flowerinsnowlib-jackson-databind-core = { module = 'cn.flowerinsnow.flowerinsnowlib:jackson-databind-core' }
23+
flowerinsnowlib-jackson-databind-java11 = { module = 'cn.flowerinsnow.flowerinsnowlib:jackson-databind-java11' }
24+
25+
[plugins]
26+
fabric-loom-remap = { id = 'net.fabricmc.fabric-loom-remap', version.ref = 'fabric-loom-remap' }

0 commit comments

Comments
 (0)