From 51d4f1505fccc118cb8876ae7c2486470bc6fbce Mon Sep 17 00:00:00 2001 From: J-RAP Date: Sun, 10 Mar 2024 15:26:07 -0600 Subject: [PATCH] Bump some deps (#9877) - CoreMods 5.0.1 -> 5.1.2 - ASM 9.5 -> 9.6 - Installer 2.1 -> 2.2 - Installer tools 1.3.0 -> 1.4.1 --- build.gradle | 10 +++++----- .../minecraftforge/forge/tasks/checks/CheckATs.groovy | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 30fdb6b716..718629be38 100644 --- a/build.gradle +++ b/build.gradle @@ -56,13 +56,13 @@ ext { MCP_VERSION = '20220404.173914' SPI_VERSION = '4.0.15-4.x' ACCESSTRANSFORMERS_VERSION = '8.0.4' - COREMODS_VERSION = '5.0.1' + COREMODS_VERSION = '5.1.2' EVENTBUS_VERSION = '5.0.3' MODLAUNCHER_VERSION = '9.1.3' SECUREJARHANDLER_VERSION = '1.0.8' BOOTSTRAPLAUNCHER_VERSION = '1.0.0' - ASM_VERSION = '9.5' - INSTALLER_VERSION = '2.1.+' + ASM_VERSION = '9.6' + INSTALLER_VERSION = '2.2.+' MIXIN_VERSION = '0.8.5' JARJAR_VERSION = '0.3.19' @@ -72,7 +72,7 @@ ext { FORGE_VERSION = VERSION.substring(MC_VERSION.length() + 1) BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.0.12:fatjar' - INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.3.0' + INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.4.1' JAR_SPLITTER = 'net.minecraftforge:jarsplitter:1.1.4' FART = 'net.minecraftforge:ForgeAutoRenamingTool:0.1.25:all' MIN_TAG_FOR_CHANGELOG = "39.0" @@ -333,7 +333,7 @@ def sharedFmlonlyForge = { Project prj -> } prj.task([type: DownloadMavenArtifact], 'downloadInstaller') { - artifact = "net.minecraftforge:installer:${INSTALLER_VERSION}:shrunk" + artifact = "net.minecraftforge:installer:${INSTALLER_VERSION}:fatjar" changing = true } diff --git a/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/checks/CheckATs.groovy b/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/checks/CheckATs.groovy index 96f557d7e5..55046da0aa 100644 --- a/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/checks/CheckATs.groovy +++ b/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/checks/CheckATs.groovy @@ -171,7 +171,7 @@ abstract class CheckATs extends CheckTask { } private static List joinBack(TreeMap lines, Map inheritance, IMappingFile mappings) { - final data = [] + final List data = [] final remapComment = { ATParser.Entry entry -> if (!mappings || !entry || !entry.desc) return null final comment = entry.comment?.substring(1)?.trim()