Architectury Loom 1.7

.github/workflows/publish-exp.yml

@@ -0,0 +1,32 @@
+name: Publish
+on:
+  push:
+    branches:
+      - 'exp/**'
+
+jobs:
+  build:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: setup jdk
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: 'temurin'
+      - uses: actions/checkout@v4
+      - uses: gradle/wrapper-validation-action@v2
+
+      # Generate the build number based on tags to allow per branch build numbers, not something github provides by default.
+      - name: Generate build number
+        id: buildnumber
+        uses: onyxmueller/build-tag-number@v1
+        with:
+          token: ${{ secrets.github_token }}
+          prefix: "build/exp/${{ github.ref }}"
+
+      - run: ./gradlew build publish -x test --stacktrace
+        env:
+          MAVEN_URL: ${{ secrets.MAVEN_URL }}
+          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+          EXPERIMENTAL: true

.github/workflows/publish.yml

@@ -20,10 +20,13 @@ on:
 
 jobs:
   build:
-
-    runs-on: ubuntu-latest
-
+    runs-on: ubuntu-24.04
     steps:
+      - name: setup jdk
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: 'temurin'
       - uses: actions/checkout@v4
       - uses: gradle/wrapper-validation-action@v2
       - name: Set up JDK 17

.github/workflows/test-push.yml

@@ -7,18 +7,16 @@ concurrency:
 
 jobs:
   build:
-    strategy:
-      fail-fast: false
-      matrix:
-        version: [8.6.0-jdk17]
-    runs-on: ubuntu-22.04
-    container:
-      image: gradle:${{ matrix.version }}
-      options: --user root
+    runs-on: ubuntu-24.04
     steps:
+      - name: setup jdk
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: 'temurin'
       - uses: actions/checkout@v4
       - uses: gradle/wrapper-validation-action@v2
-      - run: gradle build check -x test --stacktrace --warning-mode fail
+      - run: ./gradlew build check -x test --stacktrace --warning-mode fail
       - uses: Juuxel/publish-checkstyle-report@v1
         if: ${{ failure() }}
         with:
@@ -32,7 +30,7 @@ jobs:
       - name: setup jdk
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
       - uses: gradle/wrapper-validation-action@v2
       - run: ./gradlew build check -x test --stacktrace --warning-mode fail
@@ -42,14 +40,16 @@ jobs:
     # Lets wait to ensure it builds before going running tests
     needs: build
 
-    runs-on: ubuntu-22.04
-    container:
-      image: gradle:8.6.0-jdk17
-      options: --user root
+    runs-on: ubuntu-24.04
 
     steps:
+      - name: setup jdk
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: 'temurin'
       - uses: actions/checkout@v4
-      - run: gradle writeActionsTestMatrix --stacktrace --warning-mode fail
+      - run: ./gradlew writeActionsTestMatrix --stacktrace --warning-mode fail
       -
         id: set-matrix
         run: echo "matrix=$(cat build/test_matrix.json)" >> $GITHUB_OUTPUT
@@ -63,17 +63,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [8.6.0-jdk17]
         test: ${{ fromJson(needs.prepare_test_matrix.outputs.matrix) }}
 
-    runs-on: ubuntu-22.04
-    container:
-      image: gradle:${{ matrix.version }}
-      options: --user root
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v4
-      - run: gradle printActionsTestName --name="${{ matrix.test }}" test --tests ${{ matrix.test }} --stacktrace --warning-mode fail
+      - name: setup jdk
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: 'temurin'
+      - run: ./gradlew printActionsTestName --name="${{ matrix.test }}" test --tests ${{ matrix.test }} --stacktrace --warning-mode fail
         env:
           TEST_WARNING_MODE: fail
         id: test
@@ -95,17 +96,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [17]
         test: ${{ fromJson(needs.prepare_test_matrix.outputs.matrix) }}
 
     runs-on: windows-2022
 
     steps:
       - uses: actions/checkout@v4
-      - name: setup jdk ${{ matrix.java }}
+      - name: setup jdk
         uses: actions/setup-java@v4
         with:
-          java-version: ${{ matrix.java }}
+          java-version: 21
           distribution: 'temurin'
       - run: ./gradlew printActionsTestName --name="${{ matrix.test }}" test --tests ${{ matrix.test }} --stacktrace --warning-mode fail
         env:
@@ -131,7 +131,7 @@ jobs:
       fail-fast: false
       matrix:
         java: [ 17, 21 ]
-        os: [ windows-2022, ubuntu-22.04, macos-14 ]
+        os: [ windows-2022, ubuntu-24.04, macos-14 ]
 
     runs-on: ${{ matrix.os }}
     steps:

bootstrap/src/main/java/net/fabricmc/loom/bootstrap/LoomGradlePluginBootstrap.java

@@ -14,7 +14,7 @@
  */
 @SuppressWarnings("unused")
 public class LoomGradlePluginBootstrap implements Plugin<PluginAware> {
-	private static final String MIN_SUPPORTED_GRADLE_VERSION = "8.6";
+	private static final String MIN_SUPPORTED_GRADLE_VERSION = "8.8";
 	private static final int MIN_SUPPORTED_MAJOR_JAVA_VERSION = 17;
 	private static final int MIN_SUPPORTED_MAJOR_IDEA_VERSION = 2021;
 

build.gradle

@@ -6,7 +6,6 @@ plugins {
 	id 'eclipse'
 	id 'groovy'
 	id 'checkstyle'
-	id 'jacoco'
 	id 'codenarc'
 	alias(libs.plugins.kotlin) apply false // Delay this so we can perform magic 🪄 first.
 	alias(libs.plugins.spotless)
@@ -50,15 +49,19 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
 }
 
 group = "dev.architectury"
-def baseVersion = '1.6'
+def baseVersion = '1.7'
 
 def ENV = System.getenv()
 def runNumber = ENV.GITHUB_RUN_NUMBER ?: "9999"
 
 def isSnapshot = ENV.PR_NUM != null
 
 if (!isSnapshot) {
-	version = baseVersion + "." + runNumber
+	if (ENV.EXPERIMENTAL) {
+		version = baseVersion + '.0-alpha.' + runNumber
+	} else {
+		version = baseVersion + '.' + runNumber
+	}
 } else {
 	version = baseVersion + "-PR." + ENV.PR_NUM + "." + runNumber
 }
@@ -92,11 +95,17 @@ configurations {
 	testRuntimeClasspath.extendsFrom bootstrap
 }
 
-configurations.all {
+configurations.configureEach {
 	resolutionStrategy {
 		// I am sorry, for now
 		// failOnNonReproducibleResolution()
 	}
+
+	if (canBeConsumed)  {
+		attributes {
+			attribute(GradlePluginApiVersion.GRADLE_PLUGIN_API_VERSION_ATTRIBUTE, objects.named(GradlePluginApiVersion, GradleVersion.current().getVersion()))
+		}
+	}
 }
 
 sourceSets {
@@ -299,20 +308,6 @@ gradlePlugin {
 	}
 }
 
-jacoco {
-	toolVersion = libs.versions.jacoco.get()
-}
-
-// Run to get test coverage.
-jacocoTestReport {
-	dependsOn test
-	reports {
-		xml.required = false
-		csv.required = false
-		html.outputLocation = file("${layout.buildDirectory.get().asFile}/jacocoHtml")
-	}
-}
-
 test {
 	maxHeapSize = "2560m"
 	jvmArgs "-XX:+HeapDumpOnOutOfMemoryError"
@@ -331,6 +326,16 @@ test {
 	}
 }
 
+// Workaround https://github.com/gradle/gradle/issues/25898
+tasks.withType(Test).configureEach {
+	jvmArgs = [
+		'--add-opens=java.base/java.lang=ALL-UNNAMED',
+		'--add-opens=java.base/java.util=ALL-UNNAMED',
+		'--add-opens=java.base/java.lang.invoke=ALL-UNNAMED',
+		'--add-opens=java.base/java.net=ALL-UNNAMED'
+	]
+}
+
 
 import org.gradle.api.internal.artifacts.configurations.ConfigurationRoles
 import org.gradle.launcher.cli.KotlinDslVersion
@@ -342,36 +347,38 @@ import org.w3c.dom.Node
 publishing {
 	publications {
 		if (isSnapshot) return
+			if (!ENV.EXPERIMENTAL) {
 
-			// Also publish a snapshot so people can use the latest version if they wish
-			snapshot(MavenPublication) { publication ->
-				groupId project.group
-				artifactId project.base.archivesName.get()
-				version baseVersion + '-SNAPSHOT'
+				// Also publish a snapshot so people can use the latest version if they wish
+				snapshot(MavenPublication) { publication ->
+					groupId project.group
+					artifactId project.base.archivesName.get()
+					version baseVersion + '-SNAPSHOT'
 
-				from components.java
-			}
+					from components.java
+				}
 
-		// Manually crate the plugin marker for snapshot versions
-		snapshotPlugin(MavenPublication) {
-			groupId 'dev.architectury.loom'
-			artifactId 'dev.architectury.loom.gradle.plugin'
-			version baseVersion + '-SNAPSHOT'
-
-			pom.withXml {
-				// Based off org.gradle.plugin.devel.plugins.MavenPluginPublishPlugin
-				Element root = asElement()
-				Document document = root.getOwnerDocument()
-				Node dependencies = root.appendChild(document.createElement('dependencies'))
-				Node dependency = dependencies.appendChild(document.createElement('dependency'))
-				Node groupId = dependency.appendChild(document.createElement('groupId'))
-				groupId.setTextContent(project.group)
-				Node artifactId = dependency.appendChild(document.createElement('artifactId'))
-				artifactId.setTextContent(project.archivesBaseName)
-				Node version = dependency.appendChild(document.createElement('version'))
-				version.setTextContent(baseVersion + '-SNAPSHOT')
+				// Manually crate the plugin marker for snapshot versions
+				snapshotPlugin(MavenPublication) {
+					groupId 'dev.architectury.loom'
+					artifactId 'dev.architectury.loom.gradle.plugin'
+					version baseVersion + '-SNAPSHOT'
+
+					pom.withXml {
+						// Based off org.gradle.plugin.devel.plugins.MavenPluginPublishPlugin
+						Element root = asElement()
+						Document document = root.getOwnerDocument()
+						Node dependencies = root.appendChild(document.createElement('dependencies'))
+						Node dependency = dependencies.appendChild(document.createElement('dependency'))
+						Node groupId = dependency.appendChild(document.createElement('groupId'))
+						groupId.setTextContent(project.group)
+						Node artifactId = dependency.appendChild(document.createElement('artifactId'))
+						artifactId.setTextContent(project.archivesBaseName)
+						Node version = dependency.appendChild(document.createElement('version'))
+						version.setTextContent(baseVersion + '-SNAPSHOT')
+					}
+				}
 			}
-		}
 	}
 
 	repositories {
@@ -388,7 +395,7 @@ publishing {
 }
 
 // Need to tweak this file to pretend we are compatible with j8 so the bootstrap will run.
-tasks.withType(GenerateModuleMetadata) {
+tasks.withType(GenerateModuleMetadata).configureEach {
 	doLast {
 		def file = outputFile.get().asFile
 
@@ -403,7 +410,7 @@ tasks.withType(GenerateModuleMetadata) {
 }
 
 // A task to output a json file with a list of all the test to run
-task writeActionsTestMatrix() {
+tasks.register('writeActionsTestMatrix') {
 	doLast {
 		def testMatrix = []
 		file('src/test/groovy/net/fabricmc/loom/test/integration').traverse {
@@ -450,7 +457,7 @@ tasks.named('wrapper') {
 /**
  * Run this task to download the gradle sources next to the api jar, you may need to manually attach the sources jar
  */
-task downloadGradleSources() {
+tasks.register('downloadGradleSources') {
 	doLast {
 		// Awful hack to find the gradle api location
 		def gradleApiFile = project.configurations.detachedConfiguration(dependencies.gradleApi()).files.stream()
@@ -472,13 +479,13 @@ tasks.withType(GenerateModuleMetadata) {
 	enabled = false
 }
 
-task printActionsTestName(type: PrintActionsTestName) {
+tasks.register('printActionsTestName', PrintActionsTestName) {
 }
 
 /**
  * Replaces invalid characters in test names for GitHub Actions artifacts.
  */
-class PrintActionsTestName extends DefaultTask {
+abstract class PrintActionsTestName extends DefaultTask {
 	@Input
 	@Option(option = "name", description = "The test name")
 	String testName