Merge 1.10

Author: Juuxel

bootstrap/.gitignore

@@ -23,7 +23,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
 }
 
 group = "dev.architectury"
-def baseVersion = '1.9'
+def baseVersion = '1.10'
 
 def ENV = System.getenv()
 def runNumber = ENV.GITHUB_RUN_NUMBER ?: "9999"
@@ -60,15 +60,6 @@ repositories {
 	}
 }
 
-configurations {
-	bootstrap {
-		transitive false
-	}
-	compileClasspath.extendsFrom bootstrap
-	runtimeClasspath.extendsFrom bootstrap
-	testRuntimeClasspath.extendsFrom bootstrap
-}
-
 configurations.configureEach {
 	resolutionStrategy {
 		// I am sorry, for now
@@ -108,8 +99,6 @@ sourceSets {
 dependencies {
 	implementation gradleApi()
 
-	bootstrap project(":bootstrap")
-
 	// libraries
 	implementation libs.commons.io
 	implementation libs.gson
@@ -201,7 +190,6 @@ jar {
 		attributes 'Implementation-Version': project.version
 	}
 
-	from configurations.bootstrap.collect { it.isDirectory() ? it : zipTree(it) }
 	from sourceSets.commonDecompiler.output.classesDirs
 	from sourceSets.cfr.output.classesDirs
 	from sourceSets.fernflower.output.classesDirs
@@ -277,7 +265,7 @@ gradlePlugin {
 	plugins {
 		fabricLoom {
 			id = 'dev.architectury.loom'
-			implementationClass = 'net.fabricmc.loom.bootstrap.LoomGradlePluginBootstrap'
+			implementationClass = 'net.fabricmc.loom.LoomGradlePlugin'
 		}
 	}
 }
@@ -298,6 +286,11 @@ test {
 			maxRetries = 3
 		}
 	}
+
+	testLogging {
+		// Log everything to the console
+		setEvents(TestLogEvent.values().toList())
+	}
 }
 
 // Workaround https://github.com/gradle/gradle/issues/25898
@@ -311,7 +304,7 @@ tasks.withType(Test).configureEach {
 }
 
 
-import org.gradle.api.internal.artifacts.configurations.ConfigurationRoles
+import org.gradle.api.tasks.testing.logging.TestLogEvent
 import org.gradle.util.GradleVersion
 import org.w3c.dom.Document
 import org.w3c.dom.Element
@@ -322,18 +315,18 @@ publishing {
 		if (!isSnapshot && !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'
+				groupId = project.group
+				artifactId = project.base.archivesName.get()
+				version = baseVersion + '-SNAPSHOT'
 
 				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'
+				groupId = 'dev.architectury.loom'
+				artifactId = 'dev.architectury.loom.gradle.plugin'
+				version = baseVersion + '-SNAPSHOT'
 
 				pom.withXml({
 					// Based off org.gradle.plugin.devel.plugins.MavenPluginPublishPlugin
@@ -365,21 +358,6 @@ publishing {
 	}
 }
 
-// Need to tweak this file to pretend we are compatible with j8 so the bootstrap will run.
-tasks.withType(GenerateModuleMetadata).configureEach {
-	doLast {
-		def file = outputFile.get().asFile
-
-		def metadata = new groovy.json.JsonSlurper().parseText(file.text)
-
-		metadata.variants.each {
-			it.attributes["org.gradle.jvm.version"] = 8
-		}
-
-		file.text = groovy.json.JsonOutput.toJson(metadata)
-	}
-}
-
 // A task to output a json file with a list of all the test to run
 tasks.register('writeActionsTestMatrix') {
 	doLast {

bootstrap/build.gradle

@@ -1,14 +1,14 @@
 [versions]
-kotlin = "2.0.20"
+kotlin = "2.0.21"
 asm = "9.7.1"
 commons-io = "2.15.1"
 gson = "2.10.1"
 guava = "33.0.0-jre"
 
 stitch = "0.6.2"
-tiny-remapper = "0.10.4"
+tiny-remapper = "0.11.0"
 access-widener = "2.1.0"
-mapping-io = "0.6.1"
+mapping-io = "0.7.1"
 lorenz-tiny = "4.0.2"
 mercury = "0.1.4.17"
 loom-native = "0.2.0"

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

@@ -2,14 +2,15 @@
 # Decompilers
 fernflower = "2.0.0"
 cfr = "0.2.2"
-vineflower = "1.10.1"
+vineflower = "1.11.0"
 
 # Runtime depedencies
 mixin-compile-extensions = "0.6.0"
 dev-launch-injector = "0.2.1+build.8"
 terminal-console-appender = "1.3.0"
 jetbrains-annotations = "25.0.0"
 native-support = "1.0.1"
+fabric-installer = "1.0.1"
 
 # Forge Runtime depedencies
 javax-annotations = "3.0.2"
@@ -33,6 +34,7 @@ dev-launch-injector = { module = "net.fabricmc:dev-launch-injector", version.ref
 terminal-console-appender = { module = "net.minecrell:terminalconsoleappender", version.ref = "terminal-console-appender" }
 jetbrains-annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrains-annotations" }
 native-support = { module = "net.fabricmc:fabric-loom-native-support", version.ref = "native-support" }
+fabric-installer = { module = "net.fabricmc:fabric-installer", version.ref = "fabric-installer" }
 
 # Forge Runtime depedencies
 javax-annotations = { module = "com.google.code.findbugs:jsr305", version.ref = "javax-annotations" }

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

@@ -6,9 +6,8 @@ mockito = "5.14.2"
 java-debug = "0.52.0"
 mixin = "0.15.3+mixin.0.8.7"
 
-gradle-nightly = "8.12-20241110002642+0000"
+gradle-nightly = "8.14-20250208001853+0000"
 fabric-loader = "0.16.9"
-fabric-installer = "1.0.1"
 
 [libraries]
 spock = { module = "org.spockframework:spock-core", version.ref = "spock" }
@@ -19,5 +18,4 @@ mockito = { module = "org.mockito:mockito-core", version.ref = "mockito" }
 java-debug = { module = "com.microsoft.java:com.microsoft.java.debug.core", version.ref = "java-debug" }
 mixin = { module = "net.fabricmc:sponge-mixin", version.ref = "mixin" }
 gradle-nightly = { module = "org.gradle:dummy", version.ref = "gradle-nightly" }
-fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric-loader" }
-fabric-installer = { module = "net.fabricmc:fabric-installer", version.ref = "fabric-installer" }
+fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric-loader" }