Startup Experiments

.github/workflows/test-jvms.yml

@@ -0,0 +1,54 @@
+name: Test Java Versions and Vendors
+
+on:
+  push:
+    branches:
+      - main
+      - 7.x
+  workflow_dispatch:
+  pull_request:
+    types: [opened, synchronize]
+
+jobs:
+  testjdks:
+    name: Test Java ${{ matrix.jdk }} ${{ matrix.jvm_version }}
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 10
+      fail-fast: false
+      matrix:
+        # We use the latest LTS available by Microsoft since that is used in Minecraft
+        # We also test J9 and the latest versions of Graal and Adoptium, since users have
+        # to explicitly download these, we do not check the LTS versions.
+        include:
+          - jdk: Adoptium
+            jvm_version: 23
+          - jdk: Graal_VM
+            jvm_version: 23
+          - jdk: IBM # J9
+            jvm_version: 21 # IBM only has 21
+          - jdk: Microsoft
+            jvm_version: 21 # MS OpenJDK only has LTS versions (21)
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@main
+        with:
+          fetch-depth: 0
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 21
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          cache-disabled: true
+          add-job-summary: never
+      - name: Run Tests
+        run: ./gradlew test -Pjava_vendor=${{ matrix.jdk }} -Pjava_version=${{ matrix.jvm_version }}
+      - uses: actions/upload-artifact@v4
+        name: Upload Test Results
+        if: always()
+        with:
+          name: test_${{ matrix.jdk }}-${{ matrix.jvm_version }}
+          path: "**/build/reports/tests/**/*"

build.gradle

@@ -4,6 +4,7 @@ plugins {
     id 'com.diffplug.spotless' version '6.25.0' apply false
     id 'net.neoforged.gradleutils' version "${gradleutils_version}"
     id 'net.neoforged.gradleutils.spotless' version "${gradleutils_version}" apply false
+    id 'org.jetbrains.gradle.plugin.idea-ext'
 }
 
 changelog {
@@ -22,6 +23,10 @@ gradleutils.version {
 
 println "Version: ${project.version = gradleutils.version}"
 
+tasks.named('updateDaemonJvm') {
+    jvmVersion = JavaVersion.VERSION_21
+}
+
 allprojects {
     apply plugin: 'java-library'
     apply plugin: 'jacoco'
@@ -51,7 +56,12 @@ allprojects {
     java {
         withSourcesJar()
         toolchain {
-            languageVersion = JavaLanguageVersion.of(21)
+            languageVersion = JavaLanguageVersion.of(Integer.valueOf(java_version))
+            if (java_vendor) {
+                final actualVendor = java_vendor.endsWith('-J9') ? java_vendor.substring(0, java_vendor.length() - 3) : java_vendor
+                vendor = JvmVendorSpec."${actualVendor.toUpperCase(Locale.ROOT)}" as JvmVendorSpec
+                implementation = java_vendor.endsWith('-J9') ? JvmImplementation.J9 : JvmImplementation.VENDOR_SPECIFIC
+            }
         }
     }
 
@@ -63,17 +73,19 @@ allprojects {
 subprojects { subProject ->
     subProject.version = rootProject.version
 
+    apply plugin: fmlbuild.InDevModulePlugin
+
     jar {
         manifest.attributes(
-                'Git-Commit'  : gradleutils.gitInfo.abbreviatedId,
+                'Git-Commit': gradleutils.gitInfo.abbreviatedId,
                 'Build-Number': "${subProject.version}",
-                'Automatic-Module-Name' : "fml_${subProject.name.replace("-", "_")}",
-                'Specification-Title'   : "FML${subProject.name}",
-                'Specification-Vendor'  : 'NeoForged',
-                'Specification-Version' : "${subProject.version.toString().split('\\.')[0]}",
-                'Implementation-Title'  : "FML $subProject.name",
+                'Automatic-Module-Name': "fml_${subProject.name.replace("-", "_")}",
+                'Specification-Title': "FML${subProject.name}",
+                'Specification-Vendor': 'NeoForged',
+                'Specification-Version': "${subProject.version.toString().split('\\.')[0]}",
+                'Implementation-Title': "FML $subProject.name",
                 'Implementation-Version': "${subProject.version.toString().split('\\.')[0]}.${subProject.version.toString().split('\\.')[1]}",
-                'Implementation-Vendor' : 'NeoForged'
+                'Implementation-Vendor': 'NeoForged'
         )
 
         if (subProject.name != 'junit') {
@@ -109,3 +121,23 @@ subprojects { subProject ->
         }
     }
 }
+
+configurations {
+    testJavaAgents {
+        description = "Used to resolve java agents attached to all JUnit configurations in IntelliJ"
+    }
+}
+dependencies {
+    // This should actually match the bytebuddy version used by Mockito, but the Mockito BOM sadly does not specify
+    testJavaAgents files("loader/devagent.jar")
+    testJavaAgents "net.bytebuddy:byte-buddy-agent:1.15.11"
+}
+
+// Make every JUnit test in IntelliJ load the devagent
+idea.project.settings {
+    runConfigurations {
+        defaults(org.jetbrains.gradle.ext.JUnit) {
+            vmParameters = configurations.testJavaAgents.collect { "-javaagent:" + it.absolutePath }.join(" ")
+        }
+    }
+}

buildSrc/build.gradle

@@ -9,6 +9,7 @@ java {
 }
 
 dependencies {
+    implementation "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:1.1.8"
     implementation "com.google.code.gson:gson:2.10.1"
 }
 

buildSrc/src/main/java/fmlbuild/InDevModulePlugin.java

@@ -0,0 +1,20 @@
+package fmlbuild;
+
+import org.gradle.api.Plugin;
+import org.gradle.api.Project;
+import org.gradle.api.tasks.SourceSet;
+import org.gradle.api.tasks.SourceSetContainer;
+
+public class InDevModulePlugin implements Plugin<Project> {
+    @Override
+    public void apply(Project project) {
+        var sourceSets = project.getExtensions().getByType(SourceSetContainer.class);
+        var mainSourceSet = sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME);
+        var generatedVersionDir = project.getLayout().getBuildDirectory().dir("generated/version");
+        var createVersionProperties = project.getTasks().register("createVersionProperties", WriteVersionPropertiesTask.class, task -> {
+            task.setDescription("Generates a Module version properties file for use during development and containing more information for production as well.");
+            task.getOutputDirectory().set(generatedVersionDir);
+        });
+        mainSourceSet.getResources().srcDir(createVersionProperties.flatMap(WriteVersionPropertiesTask::getOutputDirectory));
+    }
+}