mmo-ref/mc-forge
1
0
Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge synced 2026-08-22 04:26:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bump Dependencies, Notably ASM for Java 27 support

Browse source
This commit is contained in:
LexManos 2026-07-21 16:05:10 -07:00
parent 703195cd36
commit d697be351f
No known key found for this signature in database
GPG key ID: 6E90061A7AE1F652
3 changed files with 28 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

19
build.gradle
View file

@ -10,7 +10,6 @@ plugins {
alias libs.plugins.gradleutils
alias libs.plugins.gitversion
alias libs.plugins.changelog
alias libs.plugins.renamer
alias libs.plugins.jarsigner
id 'net.minecraftforge.forgedev'
id 'net.minecraftforge.forge.build.convention'
@ -40,15 +39,6 @@ fdtools {
javaLauncher = javaToolchains.launcherFor(java.toolchain)
}
}
renamerTools {
configure('classes') {
artifact = buildLibs.renamer.get().toString() + ':all'
}
configure('srg2source') {
version = buildLibs.srg2source.get().version
javaLauncher = javaToolchains.launcherFor(java.toolchain)
}
}
/* This is used for debugging, comparing all published artifacts against actual production
forgedev.validatePublish {
@ -496,7 +486,6 @@ forgedev.installer {
final launcherId = "${minecraftVersion}-${project.name}-${forgeVersion}"
final installertools = tool(buildLibs.installertools)
final binarypatcher = tool(buildLibs.binarypatcher)
final renamer = tool(buildLibs.renamer)
jar {
from(EXTRA_TXTS)
@ -796,3 +785,11 @@ forgedev.runs.configureEach {
run.configure { dependsOn finalizeSpawn}
runTest.configure { dependsOn finalizeSpawn}
}
// run gradlew dependencyUpdates --no-parallel
//noinspection UnnecessaryQualifiedReference
tasks.named('dependencyUpdates', com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask) {
resolutionStrategy {
mcpBase.dependencies.get().forEach {dep -> force(dep) } // Force all vanilla dependencies to their correct versions
force(earlyDisplayLibs.slf4j.jdk14) // Force slf4j implementation, its tied to the api from the manifest
}
}

6
fmlloader/src/main/resources/jarjar_options.json
View file

@ -11,8 +11,8 @@
"artifact": "MixinExtras"
},
"version": {
"range": "[0.5.3,)",
"artifactVersion": "0.5.3"
"range": "[0.5.4,)",
"artifactVersion": "0.5.4"
},
"path": "",
"isObfuscated": false
@ -24,7 +24,7 @@
"artifact": "mixinextras-forge"
},
"version": {
"artifactVersion": "0.5.3"
"artifactVersion": "0.5.4"
},
"path": "",
"isObfuscated": false

36
settings.gradle
View file

@ -89,7 +89,6 @@ dependencyResolutionManagement.versionCatalogs {
library 'binarypatcher', 'net.minecraftforge', 'binarypatcher' version '1.3.4'
library 'installer', 'net.minecraftforge', 'installer' version '2.2.+'
library 'installertools', 'net.minecraftforge', 'installertools' version '1.4.5'
library 'renamer', 'net.minecraftforge', 'ForgeAutoRenamingTool' version '1.0.6'
library 'srg2source', 'net.minecraftforge', 'Srg2Source' version '8.2.0'
}
@ -98,11 +97,10 @@ dependencyResolutionManagement.versionCatalogs {
description = 'Libraries used by Forge and its subprojects.'
plugin 'licenser', 'net.minecraftforge.licenser' version '1.2.0'
plugin 'versions', 'com.github.ben-manes.versions' version '0.53.0'
plugin 'gradleutils', 'net.minecraftforge.gradleutils' version '3.3.35'
plugin 'versions', 'com.github.ben-manes.versions' version '0.54.0'
plugin 'gradleutils', 'net.minecraftforge.gradleutils' version '3.4.5'
plugin 'gitversion', 'net.minecraftforge.gitversion' version '3.1.7'
plugin 'changelog', 'net.minecraftforge.changelog' version '3.2.2'
plugin 'renamer', 'net.minecraftforge.renamer' version '1.0.16'
plugin 'download', 'de.undercouch.download' version '5.6.0'
plugin 'jarsigner', 'net.minecraftforge.gradlejarsigner' version '1.2.1'
plugin 'apt', 'com.diffplug.eclipse.apt' version '4.4.1'
@ -110,24 +108,24 @@ dependencyResolutionManagement.versionCatalogs {
// TODO [Forge][Buildscript We should not be needing to manually add transitive dependencies
// If we need to make strict versions for dependencies, we should do so using dependency constraints
library 'forgespi', 'net.minecraftforge', 'forgespi' version '8.0.0' // Needs modlauncher
library 'modlauncher', 'net.minecraftforge', 'modlauncher' version '10.2.4' // Needs securemodules
library 'modlauncher', 'net.minecraftforge', 'modlauncher' version '10.2.6' // Needs securemodules
library 'securemodules', 'net.minecraftforge', 'securemodules' version '2.2.24' // Needs unsafe
library 'unsafe', 'net.minecraftforge', 'unsafe' version '0.9.2'
library 'accesstransformers', 'net.minecraftforge', 'accesstransformers' version '8.2.2'
library 'coremods-api', 'net.minecraftforge', 'coremods-api' version '5.3.0'
version 'eventbus', '7.0.1'
library 'accesstransformers', 'net.minecraftforge', 'accesstransformers' version '8.2.17'
library 'coremods-api', 'net.minecraftforge', 'coremods-api' version '5.3.1'
version 'eventbus', '7.0.5'
library 'eventbus', 'net.minecraftforge', 'eventbus' versionRef 'eventbus'
library 'eventbus-validator', 'net.minecraftforge', 'eventbus-validator' versionRef 'eventbus'
library 'mergetool-api', 'net.minecraftforge', 'mergetool-api' version '1.0'
library 'roimfs', 'net.minecraftforge', 'roimfs' version '1.0.0' // ReadOnlyInMemoryFileSystem - Used for JarInJar extraction at runtime
library 'mixin', 'org.spongepowered', 'mixin' version '0.8.7'
version 'mixinextras', '0.5.3'
version 'mixinextras', '0.5.4'
library 'mixinextras-forge', 'io.github.llamalad7', 'mixinextras-forge' versionRef 'mixinextras'
library 'mixinextras-common', 'io.github.llamalad7', 'mixinextras-common' versionRef 'mixinextras'
library 'jetbrains-annotations', 'org.jetbrains', 'annotations' version '24.1.0' // for ApiStatus annotations
library 'jetbrains-annotations', 'org.jetbrains', 'annotations' version '24.0.1' // for ApiStatus annotations
library 'jspecify', 'org.jspecify', 'jspecify' version '1.0.0' // for nullability annotations
library 'slf4j-api', 'org.slf4j', 'slf4j-api' version '2.0.7'
library 'slf4j-api', 'org.slf4j', 'slf4j-api' version '2.0.17'
library 'maven-artifact', 'org.apache.maven', 'maven-artifact' version '3.8.8'
// Google's InMemory File System. Used by ForgeDev Tests for now, but could be useful for a lot of things.
@ -141,7 +139,7 @@ dependencyResolutionManagement.versionCatalogs {
library 'bootstrap-shim', 'net.minecraftforge', 'bootstrap-shim' versionRef 'bootstrap'
// ASM it's used for so many of our hacks
version 'asm', '9.9.1'
version 'asm', '9.10.1'
library 'asm', 'org.ow2.asm', 'asm' versionRef 'asm'
library 'asm-tree', 'org.ow2.asm', 'asm-tree' versionRef 'asm'
library 'asm-util', 'org.ow2.asm', 'asm-util' versionRef 'asm'
@ -172,19 +170,19 @@ dependencyResolutionManagement.versionCatalogs {
// These are libraries shipped by the MC launcher, try and keep them in sync with the manifest
// but honestly if we don't it just means we ship them as normal libraries by adding them to the installer config in the forge project
library 'gson', 'com.google.code.gson', 'gson' version '2.11.0'
library 'guava', 'com.google.guava', 'guava' version '33.5.0-jre'
library 'gson', 'com.google.code.gson', 'gson' version '2.14.0'
library 'guava', 'com.google.guava', 'guava' version '33.6.0-jre'
library 'failureaccess', 'com.google.guava', 'failureaccess' version '1.0.3'
version 'log4j', '2.24.3'
version 'log4j', '2.26.0'
library 'log4j-api', 'org.apache.logging.log4j', 'log4j-api' versionRef 'log4j'
library 'log4j-core', 'org.apache.logging.log4j', 'log4j-core' versionRef 'log4j'
bundle 'log4j', ['log4j-api', 'log4j-core']
library 'apache-commons', 'org.apache.commons', 'commons-lang3' version '3.17.0'
library 'mojang-logging', 'com.mojang', 'logging' version '1.5.10'
library 'apache-commons', 'org.apache.commons', 'commons-lang3' version '3.20.0'
library 'mojang-logging', 'com.mojang', 'logging' version '1.7.12'
library 'jopt-simple', 'net.sf.jopt-simple', 'jopt-simple' version '5.0.4'
library 'commons-io', 'commons-io', 'commons-io' version '2.17.0'
library 'commons-io', 'commons-io', 'commons-io' version '2.20.0'
version 'lwjgl', '3.4.1'
library 'lwjgl', 'org.lwjgl', 'lwjgl' versionRef 'lwjgl'
@ -196,7 +194,7 @@ dependencyResolutionManagement.versionCatalogs {
}
register('earlyDisplayLibs') {
version 'slf4j', '1.8.0-beta4'
version 'slf4j', '2.0.17'
library 'slf4j-api', 'org.slf4j', 'slf4j-api' versionRef 'slf4j'
library 'slf4j-jdk14', 'org.slf4j', 'slf4j-jdk14' versionRef 'slf4j'
}