build: Bump to a minimum requirement of Java 17

Author: zml2008

.teamcity/settings.kts

@@ -36,8 +36,8 @@ project {
         text("github_repository_name", "ForgeFlower", label = "The github repository name. Used to connect to it in VCS Roots.", description = "This is the repository slug on github. So for example `ForgeFlower` or `MinecraftForge`. It is interpolated into the global VCS Roots.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
         text("env.PUBLISHED_JAVA_ARTIFACT_ID", "forgeflower", label = "Published artifact id", description = "The maven coordinate artifact id that has been published by this build. Can not be empty.", allowEmpty = false)
         text("env.PUBLISHED_JAVA_GROUP", "net.minecraftforge", label = "Published group", description = "The maven coordinate group that has been published by this build. Can not be empty.", allowEmpty = false)
-        text("docker_jdk_version", "8", label = "JDK version", description = "The version of the JDK to use during execution of tasks in a JDK.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("docker_gradle_version", "7.4", label = "Gradle version", description = "The version of Gradle to use during execution of Gradle tasks.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
+        text("docker_jdk_version", "17", label = "JDK version", description = "The version of the JDK to use during execution of tasks in a JDK.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
+        text("docker_gradle_version", "7.4.1", label = "Gradle version", description = "The version of Gradle to use during execution of Gradle tasks.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
         text("env.EMAIL", "ForgeTC@MinecraftForge.net", label = "Git Email", description = "Git email for use in the fake repo", display = ParameterDisplay.HIDDEN, allowEmpty = false) 
         checkbox(
             "should_execute_tests",

FernFlower-Patches/0001-Git-filter-and-setup-backport-to-Java-8.patch

@@ -2442,34 +2442,3 @@ index f9553162f122c71b34635112e717c3e733b5b212..62bd9b9ccefea2b65ae41e5d9a545e20
 
  @rem Find java.exe
  if defined JAVA_HOME goto findJavaFromJavaHome
-diff --git a/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java b/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
-index 3280038cb409ed7f96e99da714dc5127b74fd1ca..1dedf68f53090579fc197d85800b4f7b62d9a1e6 100644
---- a/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
-+++ b/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
-@@ -213,7 +213,12 @@ public class ConstantPool implements NewClassNameBuilder {
-     if (newName != null) {
-       StringBuilder buffer = new StringBuilder();
-       if (vt.arrayDim > 0) {
--        buffer.append("[".repeat(vt.arrayDim)).append('L').append(newName).append(';');
-+        // No functional change, just a revert for J8 compatibility
-+        for (int i = 0; i < vt.arrayDim; i++) {
-+          buffer.append('[');
-+        }
-+
-+        buffer.append('L').append(newName).append(';');
-       }
-       else {
-         buffer.append(newName);
-diff --git a/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java b/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java
-index bb8b4dd9b866ec54491da50310b09b6fcb0bdf3f..7143281598c9273e847cc8aa5d86178c3b2b6bab 100644
---- a/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java
-+++ b/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java
-@@ -342,7 +342,7 @@ public class SFormsFastMapDirect {
-         if (ent != null) {
-           final int key = i == 0 ? ikey : (i == 1 ? ikey + VarExprent.STACK_BASE : -ikey);
- 
--          list.add(new Entry<>() {
-+          list.add(new Entry<Integer, FastSparseSet<Integer>>() {
- 
-             private final Integer var = key;
-             private final FastSparseSet<Integer> val = ent;

FernFlower-Patches/0011-Rework-of-Generics-system-for-better-output.patch

@@ -4,93 +4,6 @@ Date: Fri, 14 Apr 2017 17:09:41 -0700
 Subject: [PATCH] Rework of Generics system for better output
 
 
-diff --git a/java9/org/jetbrains/java/decompiler/util/ClasspathScanner.java b/java9/org/jetbrains/java/decompiler/util/ClasspathScanner.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..ad9f8c22d02565f22720a4fa8819511124598dac
---- /dev/null
-+++ b/java9/org/jetbrains/java/decompiler/util/ClasspathScanner.java
-@@ -0,0 +1,81 @@
-+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-+package org.jetbrains.java.decompiler.util;
-+
-+import java.lang.module.*;
-+import java.lang.reflect.InvocationTargetException;
-+import java.lang.reflect.Method;
-+import java.nio.ByteBuffer;
-+import java.io.File;
-+import java.io.IOException;
-+import java.io.InputStream;
-+import java.util.HashSet;
-+import java.util.Optional;
-+import java.util.Set;
-+import java.util.stream.Stream;
-+
-+import org.jetbrains.java.decompiler.main.DecompilerContext;
-+import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger.Severity;
-+import org.jetbrains.java.decompiler.struct.StructContext;
-+
-+public class ClasspathScanner {
-+
-+    public static void addAllClasspath(StructContext ctx) {
-+      Set<String> found = new HashSet<String>();
-+      String[] props = { System.getProperty("java.class.path"), System.getProperty("sun.boot.class.path") };
-+      for (String prop : props) {
-+        if (prop == null)
-+          continue;
-+
-+        for (final String path : prop.split(File.pathSeparator)) {
-+          File file = new File(path);
-+          if (found.contains(file.getAbsolutePath()))
-+            continue;
-+
-+          if (file.exists() && (file.getName().endsWith(".class") || file.getName().endsWith(".jar"))) {
-+            DecompilerContext.getLogger().writeMessage("Adding File to context from classpath: " + file, Severity.INFO);
-+            ctx.addSpace(file, false);
-+            found.add(file.getAbsolutePath());
-+          }
-+        }
-+      }
-+
-+      addAllModulePath(ctx);
-+    }
-+
-+    private static void addAllModulePath(StructContext ctx) {
-+      for (ModuleReference module : ModuleFinder.ofSystem().findAll()) {
-+        String name = module.descriptor().name();
-+        try {
-+          ModuleReader reader = module.open();
-+          DecompilerContext.getLogger().writeMessage("Reading Module: " + name, Severity.INFO);
-+          reader.list().forEach(cls -> {
-+            if (!cls.endsWith(".class") || cls.contains("module-info.class"))
-+              return;
-+
-+            DecompilerContext.getLogger().writeMessage("  " + cls, Severity.INFO);
-+            try {
-+              Optional<ByteBuffer> bb = reader.read(cls);
-+              if (!bb.isPresent()) {
-+                DecompilerContext.getLogger().writeMessage("    Error Reading Class: " + cls, Severity.ERROR);
-+                return;
-+              }
-+
-+              byte[] data;
-+              if (bb.get().hasArray()) {
-+                data = bb.get().array();
-+              } else {
-+                data = new byte[bb.get().remaining()];
-+                bb.get().get(data);
-+              }
-+              ctx.addData(name, cls, data, false);
-+            } catch (IOException e) {
-+              DecompilerContext.getLogger().writeMessage("    Error Reading Class: " + cls, e);
-+            }
-+          });
-+          reader.close();
-+        } catch (IOException e) {
-+          DecompilerContext.getLogger().writeMessage("Error loading module " + name, e);
-+        }
-+      }
-+    }
-+}
 diff --git a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
 index e082267cf9e2f20df662ff3565d69d0966df1126..425c2e4480f2c57993e3d4a38f66cfdcbb920047 100644
 --- a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
@@ -2496,24 +2409,31 @@ index 8b6105dbbfea358241702acbc691976d51f0d726..4261dce0b37505d22c6e9ee7c3e0bdb7
  }
 diff --git a/src/org/jetbrains/java/decompiler/util/ClasspathScanner.java b/src/org/jetbrains/java/decompiler/util/ClasspathScanner.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..a76571c1359c904bdb1e374bbc1e4969850b8087
+index 0000000000000000000000000000000000000000..ad9f8c22d02565f22720a4fa8819511124598dac
 --- /dev/null
 +++ b/src/org/jetbrains/java/decompiler/util/ClasspathScanner.java
-@@ -0,0 +1,35 @@
+@@ -0,0 +1,81 @@
 +// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 +package org.jetbrains.java.decompiler.util;
 +
++import java.lang.module.*;
++import java.lang.reflect.InvocationTargetException;
++import java.lang.reflect.Method;
++import java.nio.ByteBuffer;
 +import java.io.File;
++import java.io.IOException;
++import java.io.InputStream;
 +import java.util.HashSet;
++import java.util.Optional;
 +import java.util.Set;
++import java.util.stream.Stream;
 +
 +import org.jetbrains.java.decompiler.main.DecompilerContext;
 +import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger.Severity;
 +import org.jetbrains.java.decompiler.struct.StructContext;
 +
 +public class ClasspathScanner {
-+    //TODO: Look into caching the metadata grabbed from the context info?
-+    //J9 destroies the classpath so we need to scan this differently. We take advantage of MultiRelease jars to do this.
++
 +    public static void addAllClasspath(StructContext ctx) {
 +      Set<String> found = new HashSet<String>();
 +      String[] props = { System.getProperty("java.class.path"), System.getProperty("sun.boot.class.path") };
@@ -2533,6 +2453,45 @@ index 0000000000000000000000000000000000000000..a76571c1359c904bdb1e374bbc1e4969
 +          }
 +        }
 +      }
++
++      addAllModulePath(ctx);
++    }
++
++    private static void addAllModulePath(StructContext ctx) {
++      for (ModuleReference module : ModuleFinder.ofSystem().findAll()) {
++        String name = module.descriptor().name();
++        try {
++          ModuleReader reader = module.open();
++          DecompilerContext.getLogger().writeMessage("Reading Module: " + name, Severity.INFO);
++          reader.list().forEach(cls -> {
++            if (!cls.endsWith(".class") || cls.contains("module-info.class"))
++              return;
++
++            DecompilerContext.getLogger().writeMessage("  " + cls, Severity.INFO);
++            try {
++              Optional<ByteBuffer> bb = reader.read(cls);
++              if (!bb.isPresent()) {
++                DecompilerContext.getLogger().writeMessage("    Error Reading Class: " + cls, Severity.ERROR);
++                return;
++              }
++
++              byte[] data;
++              if (bb.get().hasArray()) {
++                data = bb.get().array();
++              } else {
++                data = new byte[bb.get().remaining()];
++                bb.get().get(data);
++              }
++              ctx.addData(name, cls, data, false);
++            } catch (IOException e) {
++              DecompilerContext.getLogger().writeMessage("    Error Reading Class: " + cls, e);
++            }
++          });
++          reader.close();
++        } catch (IOException e) {
++          DecompilerContext.getLogger().writeMessage("Error loading module " + name, e);
++        }
++      }
 +    }
 +}
 diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java

FernFlower-Patches/0016-Add-better-debug-logging.patch

@@ -59,7 +59,7 @@ index 36d1d6c4ae8e3b9f1a64dae514d9efa65722033a..7c91206d1b64b9873fa24d6d3ad38e73
              classes.put(cl.qualifiedName, cl);
              unit.addClass(cl, name);
 diff --git a/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java b/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
-index 1dedf68f53090579fc197d85800b4f7b62d9a1e6..02736cc932eee86708997bbfa919d2041ddfee21 100644
+index 3280038cb409ed7f96e99da714dc5127b74fd1ca..cb772c2f7d1111b8cfde0312951576bd1dc718f1 100644
 --- a/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
 +++ b/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
 @@ -87,6 +87,9 @@ public class ConstantPool implements NewClassNameBuilder {

build.gradle

@@ -36,32 +36,8 @@ project(':ForgeFlower') {
     sourcesJar.dependsOn rootProject.tasks.applyPatches
 }
 
-project(':ForgeFlower9') {
-    apply plugin: 'java'
-    apply plugin: 'eclipse'
-
-    sourceSets {
-        java9.java.srcDirs = ['../ForgeFlower/java9']
-    }
-
-    eclipse {
-        project {
-            name 'FernFlower9'
-            linkedResource name: 'java9', type: '2', location: project(':ForgeFlower').file('java9').getAbsolutePath()
-        }
-    }
-
-    dependencies {
-        implementation project(':ForgeFlower')
-    }
-
-    java.toolchain {
-        languageVersion = JavaLanguageVersion.of(9)
-    }
-}
-
 if (tasks.findByName('eclipse') == null) tasks.create('eclipse')
-tasks.findByName('eclipse').dependsOn('applyPatches', 'ForgeFlower:eclipse', 'ForgeFlower9:eclipse')
+tasks.findByName('eclipse').dependsOn('applyPatches', 'ForgeFlower:eclipse')
 
 changelog {
     fromMergeBase()

fernflower.gradle

@@ -11,7 +11,6 @@ ext {
 sourceSets {
     main.java.srcDirs = ['src']
     test.java.srcDirs = ['test']
-    java9.java.srcDirs = ['java9']
 }
 
 repositories {
@@ -20,48 +19,31 @@ repositories {
 }
 
 dependencies {
-    // The Java9 code depends on (can see) the "main" source set
-    java9Implementation sourceSets.main.output
-
     testImplementation 'junit:junit:4.+'
     testImplementation 'org.hamcrest:hamcrest-core:1.3'
     testImplementation 'org.assertj:assertj-core:3.+'
     testImplementation 'com.google.code.gson:gson:2.8.0'
 }
 
+// Default all standard Java compile tasks to Java 17
 java.toolchain {
-    languageVersion = JavaLanguageVersion.of(8)
+    languageVersion = JavaLanguageVersion.of(17)
 }
 
-// Default all standard Java compile tasks to Java 8
-// We'll specify Java 9 only for the java9 compile task
 tasks.withType(JavaCompile) {
     options.deprecation = true
 }
 
-compileJava9Java {
-    javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(9)
-    }
-}
-
 eclipse {
-    classpath {
-        sourceSets -= [sourceSets.java9]
-    }
     project {
         name 'ForgeFlower'
     }
 }
 
 jar {
-    into('META-INF/versions/9') {
-        from sourceSets.java9.output
-    }
     manifest {
         attributes(
-            'Main-Class' : 'org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler',
-            'Multi-Release': 'true'
+            'Main-Class' : 'org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler'
         )
     }
 }

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -6,6 +6,5 @@ pluginManagement {
 }
 
 include 'ForgeFlower'
-include 'ForgeFlower9'
 
 project(':ForgeFlower').buildFileName = 'TeamCityIsAnnoying'