Remove ARM checks to fix old Java tests

Foojay Disco API supports aarch64 builds of Java 9 and 10 for Linux, and Gradle supports x86_64 builds on macOS

Author: sschr15

build.gradle

@@ -22,7 +22,6 @@ apply plugin: 'signing'
 allprojects {
   apply plugin: 'com.gradleup.shadow'
   apply plugin: 'java'
-  ext.isArm = System.getProperty('os.arch') == 'aarch64'
 
   group = 'org.vineflower'
 
@@ -119,17 +118,8 @@ void createJavaTestDataSet(int version, String suffix = "", List<String> compile
   }
   tasks.getByName("compileTestDataJava${version}${suffix}Java") {
     destinationDirectory = file("testData/classes/java${version}${suffix.toLowerCase()}")
-    if (project.isArm && version > 8 && version < 11) {
-      // On ARM systems, a more limited set of JVM versions are available
-      // We'll accept the `--release` flag so development is at least somewhat possible
-      javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(11)
-      }
-      options.release = version
-    } else {
-      javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(version)
-      }
+    javaCompiler = javaToolchains.compilerFor {
+      languageVersion = JavaLanguageVersion.of(version)
     }
 
     options.compilerArgs = compilerArgs
@@ -140,10 +130,9 @@ void createJavaTestDataSet(int version, String suffix = "", List<String> compile
 def testJavaRuntimes = [:]
 
 [8, 9, 11, 16, 17, 21, 25].forEach { version ->
-    def runtimeVersion = isArm && version > 8 && version < 11 ? 11 : version
     createJavaTestDataSet(version)
     testJavaRuntimes[version] = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(runtimeVersion)
+        languageVersion = JavaLanguageVersion.of(version)
     }
 }
 [16, 17, 21].forEach { version -> createJavaTestDataSet(version, "Preview", ["--enable-preview"]) }

plugins/variable-renaming/build.gradle

@@ -18,17 +18,8 @@ void createJavaTestDataSet(int version, String suffix = "", List<String> compile
   }
   tasks.getByName("compileTestDataJava${version}${suffix}Java") {
     destinationDirectory = file("testData/classes/java${version}${suffix.toLowerCase()}")
-    if (project.isArm && version > 8 && version < 11) {
-      // On ARM systems, a more limited set of JVM versions are available
-      // We'll accept the `--release` flag so development is at least somewhat possible
-      javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(11)
-      }
-      options.release = version
-    } else {
-      javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(version)
-      }
+    javaCompiler = javaToolchains.compilerFor {
+      languageVersion = JavaLanguageVersion.of(version)
     }
 
     options.compilerArgs = compilerArgs
@@ -39,10 +30,9 @@ void createJavaTestDataSet(int version, String suffix = "", List<String> compile
 def testJavaRuntimes = [:]
 
 [8].forEach { version ->
-  def runtimeVersion = isArm && version > 8 && version < 11 ? 11 : version
   createJavaTestDataSet(version)
   testJavaRuntimes[version] = javaToolchains.launcherFor {
-    languageVersion = JavaLanguageVersion.of(runtimeVersion)
+    languageVersion = JavaLanguageVersion.of(version)
   }
 }