Skip to content

Commit ebf7985

Browse files
committed
update build stuff to 26.1
1 parent f311f45 commit ebf7985

5 files changed

Lines changed: 24 additions & 27 deletions

File tree

build.gradle

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ plugins {
77
}
88

99
version = "$baseVersion+$branch"
10-
archivesBaseName = project.slug
10+
11+
base {
12+
archivesName = project.slug
13+
}
1114

1215
repositories {
1316
maven { url "https://staging.alexiil.uk/maven/" }
@@ -20,15 +23,14 @@ dependencies {
2023
include libs.kaleidoConfig
2124

2225
minecraft libs.mc
23-
mappings loom.officialMojangMappings()
2426

25-
modImplementation libs.fl
26-
modImplementation libs.fapi
27+
implementation libs.fl
28+
implementation libs.fapi
2729

28-
modImplementation libs.libgui
29-
modImplementation libs.fpapi
30+
//modImplementation libs.libgui
31+
implementation libs.fpapi
3032

31-
include libs.libgui
33+
//include libs.libgui
3234
include libs.fpapi
3335
}
3436

@@ -51,7 +53,7 @@ processResources {
5153
mc : compatibleVersions.split(", ")[0],
5254
fl : libs.versions.fl.get(),
5355
fapi : libs.versions.fapi.get(),
54-
libgui : libs.versions.libgui.get(),
56+
//libgui : libs.versions.libgui.get(),
5557
fpapi : libs.versions.fpapi.get()
5658
]
5759
inputs.properties meta
@@ -61,18 +63,18 @@ processResources {
6163

6264
tasks.withType(JavaCompile).configureEach {
6365
it.options.encoding = "UTF-8"
64-
it.options.release = 21
66+
it.options.release = 25
6567
}
6668

6769
java {
6870
withSourcesJar()
69-
sourceCompatibility = JavaVersion.VERSION_21
70-
targetCompatibility = JavaVersion.VERSION_21
71+
sourceCompatibility = JavaVersion.VERSION_25
72+
targetCompatibility = JavaVersion.VERSION_25
7173
}
7274

7375
jar {
7476
from("LICENSE") {
75-
rename { "${it}_${archivesBaseName}" }
77+
rename { "${it}_${project.base.archivesName.get()}"}
7678
}
7779
}
7880

@@ -88,7 +90,7 @@ modrinth {
8890
token = "$System.env.MODRINTH_TOKEN"
8991
projectId = slug
9092
versionNumber = project.version
91-
uploadFile = remapJar
93+
uploadFile = jar
9294
gameVersions = compatibleVersions.split(", ").toList()
9395
loaders = compatibleLoaders.split(", ").toList()
9496
changelog = "$System.env.CHANGELOG"

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

libs.versions.toml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
11
[versions]
2-
loom = "1.11.+"
2+
loom = "1.15-SNAPSHOT"
33
minotaur = "2.+"
44

5-
kaleidoConfig = "0.3.1+1.3.1"
5+
kaleidoConfig = "0.3.1+1.3.2"
66

7-
mc = "1.21.7"
8-
fl = "0.16.14"
9-
yarn = "1.21.7+build.2"
10-
fapi = "0.128.2+1.21.7"
7+
mc = "26.1"
8+
fl = "0.18.4"
9+
fapi = "0.144.0+26.1"
1110

12-
fpapi = "0.4.0"
13-
libgui = "14.0.0+1.21.6"
11+
fpapi = "0.7.0"
1412

1513
[plugins]
16-
loom = { id = "fabric-loom", version.ref = "loom" }
14+
loom = { id = "net.fabricmc.fabric-loom", version.ref = "loom" }
1715
minotaur = { id = "com.modrinth.minotaur", version.ref = "minotaur" }
1816

1917
[libraries]
2018
kaleidoConfig = { group = "folk.sisby", name = "kaleido-config", version.ref = "kaleidoConfig" }
2119

2220
mc = { group = "mojang", name = "minecraft", version.ref = "mc" }
2321
fl = { group = "net.fabricmc", name = "fabric-loader", version.ref = "fl" }
24-
yarn = { group = "net.fabricmc", name = "yarn", version.ref = "yarn" }
2522
fapi = { group = "net.fabricmc.fabric-api", name = "fabric-api", version.ref = "fapi" }
2623

2724
fpapi = { group = "me.lucko", name = "fabric-permissions-api", version.ref = "fpapi" }
28-
libgui = { group = "io.github.cottonmc", name = "LibGui", version.ref = "libgui" }

src/main/resources/fabric.mod.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
"minecraft": ">=1.21.1",
2525
"fabricloader": ">=0.16.7",
2626
"fabric-api": ">=0.104.0+1.21.1",
27-
"libgui": ">=11.0.0+1.21",
2827
"fabric-permissions-api-v0": ">=0.3.1"
2928
},
3029
"accessWidener": "scattered_shards.accesswidener",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
accessWidener v2 named
1+
accessWidener v2 official
22

33
accessible class net/minecraft/commands/arguments/item/ItemParser$State

0 commit comments

Comments
 (0)