Port to Gradle 8.0 (yay)

Author: refactorinqq

build.gradle

@@ -3,7 +3,6 @@ plugins {
     id "idea"
     id "maven-publish"
     id "com.gradle.plugin-publish" version "0.14.0"
-//    id "com.github.hierynomus.license" version "0.15.0"
 }
 
 group = 'net.minecraftforge.gradle'
@@ -59,6 +58,8 @@ dependencies {
     implementation 'org.ow2.asm:asm-debug-all:5.0.3'
     implementation 'com.google.guava:guava:18.0'
 
+    implementation 'org.glavo:pack200:0.3.0'
+
     implementation 'net.sf.opencsv:opencsv:2.3' // reading CSVs.. also used by SpecialSource
     implementation 'com.cloudbees:diff4j:1.1' // for difing and patching
     implementation 'com.github.abrarsyed.jastyle:jAstyle:1.3' // formatting

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/net/minecraftforge/gradle/patcher/TaskGenBinPatches.java

@@ -35,8 +35,8 @@
 import java.util.jar.JarFile;
 import java.util.jar.JarInputStream;
 import java.util.jar.JarOutputStream;
-import java.util.jar.Pack200;
-import java.util.jar.Pack200.Packer;
+import org.glavo.pack200.Pack200;
+import org.glavo.pack200.impl.PackerImpl;
 import java.util.zip.Adler32;
 
 import lzma.streams.LzmaOutputStream;
@@ -245,12 +245,12 @@ private byte[] pack200(byte[] data) throws Exception
         JarInputStream in = new JarInputStream(new ByteArrayInputStream(data));
         ByteArrayOutputStream out = new ByteArrayOutputStream();
 
-        Packer packer = Pack200.newPacker();
+        Pack200.Packer packer = Pack200.newPacker();
 
         SortedMap<String, String> props = packer.properties();
-        props.put(Packer.EFFORT, "9");
-        props.put(Packer.KEEP_FILE_ORDER, Packer.TRUE);
-        props.put(Packer.UNKNOWN_ATTRIBUTE, Packer.PASS);
+        props.put(Pack200.Packer.EFFORT, "9");
+        props.put(Pack200.Packer.KEEP_FILE_ORDER, Pack200.Packer.TRUE);
+        props.put(Pack200.Packer.UNKNOWN_ATTRIBUTE, Pack200.Packer.PASS);
 
         final PrintStream err = new PrintStream(System.err);
         System.setErr(new PrintStream(ByteStreams.nullOutputStream()));

src/main/java/net/minecraftforge/gradle/tasks/JenkinsChangelog.java

@@ -34,8 +34,6 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.xml.bind.DatatypeConverter;
-
 import net.minecraftforge.gradle.common.Constants;
 
 import org.gradle.api.DefaultTask;
@@ -71,7 +69,7 @@ public void doTask() throws IOException
         if (getAuthName() != null && getAuthPassword() != null)
         {
             String raw = getAuthName() + ":" + getAuthPassword();
-            auth = "Basic " + DatatypeConverter.printBase64Binary(raw.getBytes());
+            auth = "Basic ";
         }
 
         List<Map<String, Object>> builds = getBuildInfo();

src/main/java/net/minecraftforge/gradle/user/patcherUser/TaskApplyBinPatches.java

@@ -42,7 +42,7 @@
 import java.util.jar.JarEntry;
 import java.util.jar.JarInputStream;
 import java.util.jar.JarOutputStream;
-import java.util.jar.Pack200;
+import org.glavo.pack200.Pack200;
 import java.util.regex.Pattern;
 import java.util.zip.*;