remove cfr, update gson, update junit

ix0rai · Jul 17, 2024 · f1b314b · f1b314b · github-actions · Jul 17, 2024
1 parent 71fe7aa
commit f1b314b
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 246 deletions.
diff --git a/build.gradle b/build.gradle
@@ -87,7 +87,6 @@ dependencies {
 	javadocClasspath(libs.quilt.loader)
 	javadocClasspath(libs.jetbrains.annotations)
 	javadocClasspath(libs.jsr305) // for some other jsr annotations
-	decompileClasspath(libs.cfr)
 	unpick(libs.unpick.cli)
 	hashed "org.quiltmc:hashed:${minecraft_version}${USE_SNAPSHOT_HASHES ? "-SNAPSHOT" : ""}"
 	intermediary "net.fabricmc:intermediary:${minecraft_version}:v2"
@@ -283,17 +282,6 @@ task genFakeSource(type: DecompileTask, dependsOn: [mergeTinyV2, eraseBytecode])
 	}
 }
 
-task decompileCFR(type: DecompileTask, dependsOn: [mapNamedJar]) {
-	input.set mappings.fileConstants.namedJar
-	output.set file("namedSrc")
-	decompiler = Decompilers.CFR
-	libraries = files(configurations.decompileClasspath)
-
-	doFirst {
-		file("namedSrc").deleteDir()
-	}
-}
-
 task decompileVineflower(type: DecompileTask, dependsOn: [mapNamedJar]) {
 	input.set mappings.fileConstants.namedJar
 	output.set file("namedSrc")

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -47,7 +47,6 @@ dependencies {
 	implementation(libs.javadoc.draftsman)
 
 	// Decompilers
-	implementation(libs.cfr)
 	implementation(libs.vineflower)
 
 	// Testing

diff --git a/buildSrc/src/main/java/quilt/internal/decompile/Decompilers.java b/buildSrc/src/main/java/quilt/internal/decompile/Decompilers.java
@@ -1,10 +1,8 @@
 package quilt.internal.decompile;
 
-import quilt.internal.decompile.cfr.CfrDecompiler;
 import quilt.internal.decompile.vineflower.VineflowerDecompiler;
 
 public enum Decompilers {
-    CFR(CfrDecompiler::new),
     VINEFLOWER(VineflowerDecompiler::new);
 
     private final DecompilerProvider provider;

diff --git a/buildSrc/src/main/java/quilt/internal/decompile/cfr/CfrDecompiler.java b/buildSrc/src/main/java/quilt/internal/decompile/cfr/CfrDecompiler.java
diff --git a/buildSrc/src/main/java/quilt/internal/decompile/cfr/CfrObfuscationMapping.java b/buildSrc/src/main/java/quilt/internal/decompile/cfr/CfrObfuscationMapping.java
diff --git a/buildSrc/src/main/java/quilt/internal/decompile/cfr/CfrSinkFactory.java b/buildSrc/src/main/java/quilt/internal/decompile/cfr/CfrSinkFactory.java
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -15,13 +15,12 @@ javadoc_draftsman = "1.2.3"
 quilt_loader = "0.26.1"
 jetbrains_annotations = "23.0.0"
 jsr305 = "3.0.2"
-gson = "2.9.1"
+gson = "2.10.1"
 netty = "4.1"
 
 vineflower = "1.10.1"
-cfr = "0.2.2"
 
-junit = "5.9.1"
+junit = "5.9.3"
 proguard = "7.5.0"
 
 [libraries]
@@ -48,7 +47,6 @@ jetbrains_annotations = { module = "org.jetbrains:annotations", version.ref = "j
 jsr305 = { module = "com.google.code.findbugs:jsr305", version.ref = "jsr305" }
 
 # Decompilers
-cfr = { module = "net.fabricmc:cfr", version.ref = "cfr" }
 vineflower = { module = "org.vineflower:vineflower", version.ref = "vineflower" }
 
 # Testing