mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-08-03 20:33:58 +00:00
Code Issues Releases Wiki Activity

Update Gradle to 8.5

Browse Source 
- Update FG to 6.0.20 - no major changes, but required for the Gradle
   update.
 - Update Loom to 1.5.x - this adds Vineflower support by default, so we
   can remove loom-vineflower.
This commit is contained in:
Jonathan Coates 2024-01-27 09:28:12 +00:00
parent 9ccee75a99
commit d38b1d04e7
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06
6 changed files with 1046 additions and 342 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
buildSrc/build.gradle.kts
View File

@ -56,7 +56,6 @@ dependencies {
implementation(libs.librarian) implementation(libs.librarian)
implementation(libs.minotaur) implementation(libs.minotaur)
implementation(libs.vanillaGradle) implementation(libs.vanillaGradle)
implementation(libs.vineflower)
} }
gradlePlugin { gradlePlugin {

1
buildSrc/src/main/kotlin/cc-tweaked.fabric.gradle.kts
View File

@ -12,7 +12,6 @@ import cc.tweaked.gradle.MinecraftConfigurations
plugins { plugins {
`java-library` `java-library`
id("fabric-loom") id("fabric-loom")
id("io.github.juuxel.loom-vineflower")
id("cc-tweaked.java-convention") id("cc-tweaked.java-convention")
} }

6
gradle/libs.versions.toml
View File

@ -57,8 +57,8 @@ checkstyle = "10.12.6"
curseForgeGradle = "1.0.14" curseForgeGradle = "1.0.14"
errorProne-core = "2.23.0" errorProne-core = "2.23.0"
errorProne-plugin = "3.1.0" errorProne-plugin = "3.1.0"
fabric-loom = "1.3.9" fabric-loom = "1.5.7"
forgeGradle = "6.0.8" forgeGradle = "6.0.20"
githubRelease = "2.5.2" githubRelease = "2.5.2"
gradleVersions = "0.50.0" gradleVersions = "0.50.0"
ideaExt = "1.1.7" ideaExt = "1.1.7"
@ -73,7 +73,6 @@ taskTree = "2.1.1"
teavm = "0.10.0-SQUID.2" teavm = "0.10.0-SQUID.2"
vanillaGradle = "0.2.1-SNAPSHOT" vanillaGradle = "0.2.1-SNAPSHOT"
versionCatalogUpdate = "0.8.1" versionCatalogUpdate = "0.8.1"
vineflower = "1.11.0"
[libraries] [libraries]
# Normal dependencies # Normal dependencies
@ -160,7 +159,6 @@ teavm-metaprogramming-impl = { module = "org.teavm:teavm-metaprogramming-impl",
teavm-platform = { module = "org.teavm:teavm-platform", version.ref = "teavm" } teavm-platform = { module = "org.teavm:teavm-platform", version.ref = "teavm" }
teavm-tooling = { module = "org.teavm:teavm-tooling", version.ref = "teavm" } teavm-tooling = { module = "org.teavm:teavm-tooling", version.ref = "teavm" }
vanillaGradle = { module = "org.spongepowered:vanillagradle", version.ref = "vanillaGradle" } vanillaGradle = { module = "org.spongepowered:vanillagradle", version.ref = "vanillaGradle" }
vineflower = { module = "io.github.juuxel:loom-vineflower", version.ref = "vineflower" }
[plugins] [plugins]
forgeGradle = { id = "net.minecraftforge.gradle", version.ref = "forgeGradle" } forgeGradle = { id = "net.minecraftforge.gradle", version.ref = "forgeGradle" }

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000 networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

1376
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -23,7 +23,7 @@
"rehype-highlight": "^7.0.0", "rehype-highlight": "^7.0.0",
"rehype-react": "^8.0.0", "rehype-react": "^8.0.0",
"rollup": "^4.0.0", "rollup": "^4.0.0",
"tsx": "^3.12.10", "tsx": "^4.7.0",
"typescript": "^5.2.2" "typescript": "^5.2.2"
} }
} }