Remove antlr

MinecraftForge · Dec 12, 2023 · a27d091 · a27d091
1 parent 55786b0
commit a27d091
Show file tree

Hide file tree

Showing 17 changed files with 576 additions and 793 deletions.
diff --git a/at-mlservice/build.gradle b/at-mlservice/build.gradle
@@ -1,8 +1,8 @@
 plugins {
-    id 'org.cadixdev.licenser' version '0.6.1'
     id 'eclipse'
     id 'java-library'
-    id 'net.minecraftforge.gradleutils' version '[2.1.2,)'
+    id 'net.minecraftforge.licenser' version '1.0.1'
+    id 'net.minecraftforge.gradleutils' version '[2.3,2.4)'
 }
 
 repositories {

diff --git a/at-test-jar/build.gradle b/at-test-jar/build.gradle
@@ -1,8 +1,8 @@
 plugins {
-    id 'org.cadixdev.licenser' version '0.6.1'
     id 'eclipse'
     id 'java-library'
-    id 'net.minecraftforge.gradleutils' version '[2.1.2,)'
+    id 'net.minecraftforge.licenser' version '1.0.1'
+    id 'net.minecraftforge.gradleutils' version '[2.3,2.4)'
 }
 
 repositories {

diff --git a/at-test/build.gradle b/at-test/build.gradle
@@ -1,9 +1,8 @@
 plugins {
-    id 'org.cadixdev.licenser' version '0.6.1'
     id 'eclipse'
     id 'java-library'
-    id 'org.gradlex.extra-java-module-info' version '1.4.2'
-    id 'net.minecraftforge.gradleutils' version '[2.1.2,)'
+    id 'net.minecraftforge.licenser'
+    id 'net.minecraftforge.gradleutils'
 }
 
 repositories {
@@ -45,55 +44,27 @@ dependencies {
     testCompileOnly(libs.nulls)
 }
 
-extraJavaModuleInfo {
-    failOnMissingModuleInfo = false
-    automaticModule('jopt-simple-5.0.4.jar', 'jopt.simple')
+tasks.register('testAll', AggregateTest) {
+    input = file('build/test-results/')
+    output = rootProject.file('test_results.html')
 }
 
-// If we are being told a specific vendor then we are probably being run in parallel
-if (project.hasProperty('javaVendor') && project.hasProperty('javaVersion')) {
-    test.javaLauncher.set(javaToolchains.launcherFor {
-        it.vendor.set(JvmVendorSpec."${project.property('javaVendor').toUpperCase(Locale.ROOT)}" as JvmVendorSpec)
-        it.languageVersion.set(JavaLanguageVersion.of(project.property('javaVersion') as int))
-        it.implementation.set(JvmImplementation.VENDOR_SPECIFIC)
-    })
-} else if (!project.hasProperty('disable_bulk_tests')) {
-    configurations {
-        groovyScript
-    }
-
-    dependencies {
-        groovyScript 'org.apache.ivy:ivy:2.4.0'
-        groovyScript 'org.codehaus.groovy:groovy-all:3.0.19'
-    }
-
-    tasks.register('collectTests', JavaExec) {
-        classpath = configurations.groovyScript
-        main = 'groovy.ui.GroovyMain'
-        args '.github/workflows/aggregate-junit-tests.groovy'
-        workingDir rootProject.projectDir
-    }
-
-    VALID_VMS.each { javaVendor, javaVersions ->
-        javaVersions.each { javaVersion ->
-            def task = tasks.register("test${javaVendor}${javaVersion}", Test) {
-                useJUnitPlatform()
-                javaLauncher.set(javaToolchains.launcherFor {
-                    it.vendor.set(JvmVendorSpec."${javaVendor.toUpperCase(Locale.ROOT)}" as JvmVendorSpec)
-                    it.languageVersion.set(JavaLanguageVersion.of(javaVersion))
-                    it.implementation.set(JvmImplementation.VENDOR_SPECIFIC)
-                })
-                reports.html.destination = rootProject.file("build/test_artifacts/test-reports-${javaVendor}-${javaVersion}/")
-                reports.junitXml.destination = rootProject.file("build/test_artifacts/test-results-${javaVendor}-${javaVersion}/")
-            }
-            test.dependsOn(task)
-            collectTests.mustRunAfter(task)
+VALID_VMS.each { javaVendor, javaVersions ->
+    javaVersions.each { javaVersion ->
+        def output = file("build/test-results/${javaVendor}-${javaVersion}/")
+        output.mkdirs()
+        def task = tasks.register("test${javaVendor}${javaVersion}", Test) {
+            useJUnitPlatform()
+            javaLauncher.set(javaToolchains.launcherFor {
+                it.vendor.set(JvmVendorSpec."${javaVendor.toUpperCase(Locale.ROOT)}" as JvmVendorSpec)
+                it.languageVersion.set(JavaLanguageVersion.of(javaVersion))
+                it.implementation.set(JvmImplementation.VENDOR_SPECIFIC)
+            })
+            reports.html.destination = file("build/test-reports/${javaVendor}-${javaVersion}/")
+            reports.junitXml.destination = output
         }
+        testAll.inputs.dir(output)
+        testAll.dependsOn(task)
+        testAll.mustRunAfter(task)
     }
-}
-
-// Hack eclipse into knowing that the gradle deps are modules
-eclipse.classpath {
-    containers 'org.eclipse.buildship.core.gradleclasspathcontainer'
-    file.whenMerged { entries.findAll { it.kind == 'lib' || it.path == 'org.eclipse.buildship.core.gradleclasspathcontainer' }.each { it.entryAttributes['module'] = 'true' } }
 }
diff --git a/at-test/src/test/java/net/minecraftforge/accesstransformer/test/AtTest.java b/at-test/src/test/java/net/minecraftforge/accesstransformer/test/AtTest.java
diff --git a/at-test/src/test/java/net/minecraftforge/accesstransformer/test/BatATParseTest.java b/at-test/src/test/java/net/minecraftforge/accesstransformer/test/BatATParseTest.java
diff --git a/at-test/src/test/java/net/minecraftforge/accesstransformer/test/ForgeATBaseParserTest.java b/at-test/src/test/java/net/minecraftforge/accesstransformer/test/ForgeATBaseParserTest.java