Update to Gradle 9 (#36)

ScribbleTAS · web-flow · commit a3998bf46788 · 2025-12-14T20:31:50.000+01:00
diff --git a/.github/workflows/publish-main.yml b/.github/workflows/publish-main.yml
@@ -1,25 +1,25 @@
-# Publish Main to https://maven.minecrafttas.com/main
-name: Publish Main
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    if: github.repository == 'MinecraftTAS/Discombobulator'
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set up JDK 23 for x64
-      uses: actions/setup-java@v4
-      with:
-        java-version: '23'
-        distribution: 'temurin'
-        architecture: x64
-    - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@v3
-      with:
-        gradle-version: 8.13
-    - name: Publish
-      run: gradle publishAllPublicationsToMinecrafttasMainRepository -Prelease=true -PminecrafttasMainUsername=${{ secrets.MAVEN_NAME }} -PminecrafttasMainPassword=${{ secrets.MAVEN_SECRET }}
+# Publish Main to https://maven.minecrafttas.com/main
+name: Publish Main
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    if: github.repository == 'MinecraftTAS/Discombobulator'
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 25 for x64
+      uses: actions/setup-java@v4
+      with:
+        java-version: '25'
+        distribution: 'temurin'
+        architecture: x64
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v3
+      with:
+        gradle-version: 9.2.1
+    - name: Publish
+      run: gradle publishAllPublicationsToMinecrafttasMainRepository -Prelease=true -PminecrafttasMainUsername=${{ secrets.MAVEN_NAME }} -PminecrafttasMainPassword=${{ secrets.MAVEN_SECRET }}
diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml
@@ -9,15 +9,15 @@ jobs:
     if: github.repository == 'MinecraftTAS/Discombobulator'
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 23 for x64
+    - name: Set up JDK 25 for x64
       uses: actions/setup-java@v4
       with:
-        java-version: '23'
+        java-version: '25'
         distribution: 'temurin'
         architecture: x64
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@v3
       with:
-        gradle-version: 8.13
+        gradle-version: 9.2.1
     - name: Publish
       run: gradle publishAllPublicationsToMinecrafttasSnapshotsRepository -PminecrafttasSnapshotsUsername=${{ secrets.MAVEN_NAME }} -PminecrafttasSnapshotsPassword=${{ secrets.MAVEN_SECRET }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,16 +11,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 23 for x64
+    - name: Set up JDK 25 for x64
       uses: actions/setup-java@v4
       with:
-        java-version: '23'
+        java-version: '25'
         distribution: 'temurin'
         architecture: x64
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@v4
       with:
-        gradle-version: 8.13
+        gradle-version: 9.2.1
     - name: Build
       run: gradle build
     - name: Upload Test Report
diff --git a/Test/Test1.12.2/build.gradle b/Test/Test1.12.2/build.gradle
@@ -1,5 +1,6 @@
 plugins {
-	id 'fabric-loom' version '1.10-SNAPSHOT'
+	id 'fabric-loom' version '1.14-SNAPSHOT'
+	id "legacy-looming" version "1.14-SNAPSHOT"
 }
 
 java {
@@ -8,11 +9,11 @@ java {
 
 repositories {
 	//mavenLocal()
-	maven { url 'https://raw.githubusercontent.com/BleachDev/cursed-mappings/main/' }
+	maven { url = 'https://raw.githubusercontent.com/BleachDev/cursed-mappings/main/' }
 }
 
 dependencies {
 	minecraft "com.mojang:minecraft:1.12.2"
 	mappings "net.legacyfabric:yarn:1.12.2+build.mcp"
-	modImplementation "net.fabricmc:fabric-loader:0.16.9"
+	modImplementation "net.fabricmc:fabric-loader:0.18.2"
 }
diff --git a/Test/Test1.14.4/build.gradle b/Test/Test1.14.4/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.10-SNAPSHOT'
+	id 'fabric-loom' version '1.14-SNAPSHOT'
 }
 
 java {
@@ -9,5 +9,5 @@ java {
 dependencies {
 	minecraft "com.mojang:minecraft:1.14.4"
 	mappings loom.officialMojangMappings()
-	modImplementation "net.fabricmc:fabric-loader:0.16.9"
+	modImplementation "net.fabricmc:fabric-loader:0.18.2"
 }
diff --git a/Test/build.gradle b/Test/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'discombobulator' version '1.3-SNAPSHOT'
+	id 'discombobulator' version "1.4-SNAPSHOT"
 }
 
 discombobulator {
diff --git a/Test/gradle.properties b/Test/gradle.properties
@@ -1 +1,3 @@
-org.gradle.jvmargs=-Xmx6G
+org.gradle.jvmargs=-Xmx6G
+org.gradle.configuration-cache=true
+org.gradle.warning.mode=fail
diff --git a/Test/settings.gradle b/Test/settings.gradle
@@ -4,6 +4,7 @@ pluginManagement {
 		mavenCentral()
 		maven { url = "https://maven.minecrafttas.com/main" }
 		maven { url = "https://maven.fabricmc.net" }
+		maven { url = "https://maven.legacyfabric.net/" }
 		gradlePluginPortal()
 	}
 }
diff --git a/build.gradle b/build.gradle
@@ -1,36 +1,36 @@
 // Plugins used in the project
 plugins {
-    id 'java-gradle-plugin'
+	id 'java-gradle-plugin'
 	id 'maven-publish'
 }
 
-// Change java compatibility level to 23
-sourceCompatibility = targetCompatibility = 23
-
 def snapshot = project.release=="true" ? "" : "-SNAPSHOT"
 version = project.version+snapshot
 // Name, version and group for the project
 group = "com.minecrafttas"
-archivesBaseName = "discombobulator"
+base {
+	archivesName = "discombobulator"
+}
 
 // Configure the gradle plugin
 gradlePlugin {
-    plugins {
-        discombobulator {
-            id = 'discombobulator'
-            implementationClass = 'com.minecrafttas.discombobulator.Discombobulator'
-        }
-    }
+	plugins {
+		discombobulator {
+			id = 'discombobulator'
+			implementationClass = 'com.minecrafttas.discombobulator.Discombobulator'
+		}
+	}
 }
 
 repositories {
 	mavenCentral()
 }
 
 dependencies {
-	testImplementation(platform('org.junit:junit-bom:5.11.3'))
+	testImplementation(platform('org.junit:junit-bom:6.0.1'))
 	testImplementation('org.junit.jupiter:junit-jupiter')
-	implementation 'commons-io:commons-io:2.17.0'
+	testRuntimeOnly('org.junit.platform:junit-platform-launcher')
+	implementation 'commons-io:commons-io:2.21.0'
 }
 
 test {
@@ -41,8 +41,10 @@ test {
 }
 
 java {
-    withSourcesJar()
-    withJavadocJar()
+	sourceCompatibility = JavaVersion.VERSION_21
+	targetCompatibility = JavaVersion.VERSION_21
+	withSourcesJar()
+	withJavadocJar()
 }
 
 javadoc {
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,3 @@
-version=1.3.1
+version=1.4
 release=false
+org.gradle.configuration-cache=true
diff --git a/src/main/java/com/minecrafttas/discombobulator/Discombobulator.java b/src/main/java/com/minecrafttas/discombobulator/Discombobulator.java
@@ -1,19 +1,9 @@
 package com.minecrafttas.discombobulator;
 
-import static com.minecrafttas.discombobulator.utils.Colors.BLUE;
-import static com.minecrafttas.discombobulator.utils.Colors.CYAN;
-import static com.minecrafttas.discombobulator.utils.Colors.GREEN;
-import static com.minecrafttas.discombobulator.utils.Colors.GREEN_BRIGHT;
-import static com.minecrafttas.discombobulator.utils.Colors.PURPLE;
-import static com.minecrafttas.discombobulator.utils.Colors.PURPLE_BRIGHT;
-import static com.minecrafttas.discombobulator.utils.Colors.RED;
-import static com.minecrafttas.discombobulator.utils.Colors.RED_BRIGHT;
-import static com.minecrafttas.discombobulator.utils.Colors.WHITE;
-import static com.minecrafttas.discombobulator.utils.Colors.YELLOW;
-
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -49,16 +39,45 @@ public class Discombobulator implements Plugin<Project> {
 	 */
 	public static int PORT_LOCK = 8762;
 
+	/**
+	 * The config set in the build.gradle file of the discombobulator
+	 */
 	public static PreprocessingConfiguration config;
 
+	/**
+	 * If true: Disables color output in the console
+	 */
 	public static boolean DISABLE_ANSI = false;
 
+	/**
+	 * Whether to use Windows or Unix style line feeds
+	 */
 	public static String DEFAULT_LINE_FEED = System.lineSeparator();
 
+	/**
+	 * The base dir of the project
+	 */
+	public static Path BASE_PROJECT_DIR;
+
+	/**
+	 * The base build directory, usually {@link #BASE_PROJECT_DIR}/build
+	 */
+	public static Path BUILD_DIR;
+
+	/**
+	 * The {@link FilePreprocessor}
+	 */
 	public static FilePreprocessor fileProcessor;
 
+	/**
+	 * The {@link PathLock}
+	 */
 	public static PathLock pathLock;
 
+	/**
+	 * The version of Discombobulator,
+	 * used for the splash in the console
+	 */
 	private static String discoVersion;
 
 	/**
@@ -72,27 +91,42 @@ public void apply(Project project) {
 		pathLock = new PathLock();
 
 		// Register tasks
+
+		/* preprocessBase */
 		TaskPreprocessBase baseTask = project.getTasks().register("preprocessBase", TaskPreprocessBase.class).get();
 		baseTask.setGroup("discombobulator");
 		baseTask.setDescription("Split base source into seperate version folders");
 
+		/* preprocessWatch */
 		TaskPreprocessWatch watchTask = project.getTasks().register("preprocessWatch", TaskPreprocessWatch.class).get();
 		watchTask.setGroup("discombobulator");
 		watchTask.setDescription("Starts a watch session. Preprocesses files into other versions on file change.");
+		watchTask.setProperty("projectName", project.getName());
 
+		/* collectBuilds */
 		TaskCollectBuilds collectBuilds = project.getTasks().register("collectBuilds", TaskCollectBuilds.class).get();
 		collectBuilds.setGroup("discombobulator");
 		collectBuilds.setDescription("Builds, then collects all versions in root/build");
 
-		List<Task> compileTasks = new ArrayList<>();
+		List<Task> compileTaskList = new ArrayList<>();
+		Map<String, Path> buildDirs = new HashMap<>();
+		for (Project subProject : project.getSubprojects()) {
+			Task compileTask = subProject.getTasksByName("remapJar", false).iterator().next();
+			compileTaskList.add(compileTask);
+
+			buildDirs.put(subProject.getName(), getBuildDir(subProject).resolve("libs"));
+		}
+		collectBuilds.setDependsOn(compileTaskList);
+		collectBuilds.setProperty("buildDirectories", buildDirs);
+
+		/* preprocessVersion */
 		for (Project subProject : project.getSubprojects()) {
-			compileTasks.add(subProject.getTasksByName("remapJar", false).iterator().next());
 			// Register preprocessVersion task in subProjects
 			TaskPreprocessVersion versionTask = subProject.getTasks().register("preprocessVersion", TaskPreprocessVersion.class).get();
+			versionTask.setProperty("versionDirectory", subProject.getProjectDir());
 			versionTask.setGroup("discombobulator");
 			versionTask.setDescription("Preprocesses this version back to the base folder and to versions other than this one");
 		}
-		collectBuilds.updateCompileTasks(compileTasks);
 
 		// Register preprocessVersion task in root
 		TaskPreprocessVersionError versionTaskRoot = project.getTasks().register("preprocessVersion", TaskPreprocessVersionError.class).get();
@@ -104,11 +138,12 @@ public void apply(Project project) {
 			PORT_LOCK = config.getPort().getOrElse(8762);
 			DISABLE_ANSI = config.getDisableAnsi().getOrElse(false);
 			DEFAULT_LINE_FEED = config.getDefaultLineFeed().getOrElse(System.lineSeparator());
+			BASE_PROJECT_DIR = _project.getProjectDir().toPath();
+			BUILD_DIR = getBuildDir(_project);
 
 			Map<String, Path> versionPairs = null;
-			Path projectDir = _project.getProjectDir().toPath();
 			try {
-				versionPairs = getVersionPairs(projectDir);
+				versionPairs = getVersionPairs(BASE_PROJECT_DIR);
 			} catch (Exception e) {
 				if (e.getMessage() != null && !e.getMessage().isEmpty()) {
 					printError(e.getMessage());
@@ -137,8 +172,9 @@ public void apply(Project project) {
 
 	public static String getSplash() {
 		return "\n" + (DISABLE_ANSI ? getColorLessSplash() : getColoredSplash()) + "\n\n"
-				+ getCenterText(String.format("%sC%so%sl%so%sr%sf%su%sl%s!%s", RED, RED_BRIGHT, YELLOW, GREEN_BRIGHT, GREEN, CYAN, BLUE, PURPLE, PURPLE_BRIGHT, WHITE), 9) + "\n"
-				+ "		Created by Pancake and Scribble\n" + getCenterText(discoVersion) + "\n\n";
+				+ getCenterText(String.format("Enable configuration cache today!")) + "\n"
+				+ getCenterText("Created by Pancake and Scribble") + "\n"
+				+ getCenterText(discoVersion) + "\n\n";
 
 	}
 
@@ -173,6 +209,14 @@ private static String getCenterText(String text) {
 		return getCenterText(text, length);
 	}
 
+	/**
+	 * @param project The project to use
+	 * @return The build directory from the project
+	 */
+	public static Path getBuildDir(Project project) {
+		return project.getLayout().getBuildDirectory().get().getAsFile().toPath();
+	}
+
 	/**
 	 * Centers any given text
 	 * 
diff --git a/src/main/java/com/minecrafttas/discombobulator/processor/FilePreprocessor.java b/src/main/java/com/minecrafttas/discombobulator/processor/FilePreprocessor.java
@@ -183,15 +183,16 @@ public List<String> preprocessLines(List<String> inLines, Path outFile, String v
 		return lines;
 	}
 
-	///
-	/// 1. Locks the file to stop the filewatcher from detecting it
-	/// 2. Creates any missing directories
-	/// 3. Writes the lines with the line feed specified by the `line.seperator` system property
-	///
-	/// @param inLines
-	/// @param outFile
-	/// @throws Exception
-	///
+	/**
+	 * <ol>
+	 * <li>Locks the file to stop the filewatcher from detecting it</li>
+	 * <li>Creates any missing directories</li>
+	 * <li>Writes the lines with the line feed specified by the `line.seperator` system property</li>
+	 * </ol>
+	 * @param inLines
+	 * @param outFile
+	 * @throws Exception
+	 */
 	private void writeLines(List<String> inLines, Path outFile) throws Exception {
 		// Lock the file
 		Discombobulator.pathLock.scheduleAndLock(outFile);
diff --git a/src/main/java/com/minecrafttas/discombobulator/tasks/TaskCollectBuilds.java b/src/main/java/com/minecrafttas/discombobulator/tasks/TaskCollectBuilds.java
diff --git a/src/main/java/com/minecrafttas/discombobulator/tasks/TaskPreprocessBase.java b/src/main/java/com/minecrafttas/discombobulator/tasks/TaskPreprocessBase.java
diff --git a/src/main/java/com/minecrafttas/discombobulator/tasks/TaskPreprocessVersion.java b/src/main/java/com/minecrafttas/discombobulator/tasks/TaskPreprocessVersion.java
diff --git a/src/main/java/com/minecrafttas/discombobulator/tasks/TaskPreprocessWatch.java b/src/main/java/com/minecrafttas/discombobulator/tasks/TaskPreprocessWatch.java
diff --git a/src/main/java/com/minecrafttas/discombobulator/utils/LineFeedHelper.java b/src/main/java/com/minecrafttas/discombobulator/utils/LineFeedHelper.java

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`plugins {`
`2`		`- id 'fabric-loom' version '1.10-SNAPSHOT'`
	`2`	`+ id 'fabric-loom' version '1.14-SNAPSHOT'`
	`3`	`+ id "legacy-looming" version "1.14-SNAPSHOT"`
`3`	`4`	`}`
`4`	`5`
`5`	`6`	`java {`
`@@ -8,11 +9,11 @@ java {`
`8`	`9`
`9`	`10`	`repositories {`
`10`	`11`	`//mavenLocal()`
`11`		`- maven { url 'https://raw.githubusercontent.com/BleachDev/cursed-mappings/main/' }`
	`12`	`+ maven { url = 'https://raw.githubusercontent.com/BleachDev/cursed-mappings/main/' }`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`dependencies {`
`15`	`16`	`minecraft "com.mojang:minecraft:1.12.2"`
`16`	`17`	`mappings "net.legacyfabric:yarn:1.12.2+build.mcp"`
`17`		`- modImplementation "net.fabricmc:fabric-loader:0.16.9"`
	`18`	`+ modImplementation "net.fabricmc:fabric-loader:0.18.2"`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- id 'fabric-loom' version '1.10-SNAPSHOT'`
	`2`	`+ id 'fabric-loom' version '1.14-SNAPSHOT'`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`java {`
`@@ -9,5 +9,5 @@ java {`
`9`	`9`	`dependencies {`
`10`	`10`	`minecraft "com.mojang:minecraft:1.14.4"`
`11`	`11`	`mappings loom.officialMojangMappings()`
`12`		`- modImplementation "net.fabricmc:fabric-loader:0.16.9"`
	`12`	`+ modImplementation "net.fabricmc:fabric-loader:0.18.2"`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- id 'discombobulator' version '1.3-SNAPSHOT'`
	`2`	`+ id 'discombobulator' version "1.4-SNAPSHOT"`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`discombobulator {`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ pluginManagement {`
`4`	`4`	`mavenCentral()`
`5`	`5`	`maven { url = "https://maven.minecrafttas.com/main" }`
`6`	`6`	`maven { url = "https://maven.fabricmc.net" }`
	`7`	`+ maven { url = "https://maven.legacyfabric.net/" }`
`7`	`8`	`gradlePluginPortal()`
`8`	`9`	`}`
`9`	`10`	`}`