Merge remote-tracking branch 'FabricMC/dev/0.9' into dev/0.9

# Conflicts:
#	build.gradle
#	src/main/java/net/fabricmc/loom/LoomGradleExtension.java
#	src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
#	src/main/java/net/fabricmc/loom/build/JarRemapper.java
#	src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
#	src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/GradleMappingContext.java
#	src/main/java/net/fabricmc/loom/extension/LoomGradleExtensionApiImpl.java
#	src/main/java/net/fabricmc/loom/task/AbstractLoomTask.java
#	src/main/java/net/fabricmc/loom/task/AbstractRunTask.java
#	src/main/java/net/fabricmc/loom/task/LoomTasks.java
#	src/main/java/net/fabricmc/loom/util/Constants.java
#	src/main/java/net/fabricmc/loom/util/SourceRemapper.java
#	src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy
#	src/test/resources/projects/kotlin/build.gradle.kts

12 files changed, 37 insertions, 15 deletions

diff --git a/src/test/resources/projects/accesswidener/build.gradle b/src/test/resources/projects/accesswidener/build.gradle
index b339c241..1398322d 100644
--- a/src/test/resources/projects/accesswidener/build.gradle
+++ b/src/test/resources/projects/accesswidener/build.gradle
@@ -19,7 +19,7 @@ repositories {
 }
 
 loom {
-	accessWidener = file("src/main/resources/modid.accesswidener")
+	accessWidenerPath = file("src/main/resources/modid.accesswidener")
 }
 
 dependencies {
diff --git a/src/test/resources/projects/dependencyResolutionManagement/projmap/build.gradle b/src/test/resources/projects/dependencyResolutionManagement/projmap/build.gradle
index 4944fa86..d0c17c62 100644
--- a/src/test/resources/projects/dependencyResolutionManagement/projmap/build.gradle
+++ b/src/test/resources/projects/dependencyResolutionManagement/projmap/build.gradle
@@ -68,8 +68,8 @@ jar {
 	}
 }
 
-minecraft {
-	accessWidener = file("src/main/resources/modid.accesswidener")
+loom {
+	accessWidenerPath = file("src/main/resources/modid.accesswidener")
 }
 
 // configure the maven publication
diff --git a/src/test/resources/projects/java16/build.gradle b/src/test/resources/projects/java16/build.gradle
index e1125546..e8abd6f4 100644
--- a/src/test/resources/projects/java16/build.gradle
+++ b/src/test/resources/projects/java16/build.gradle
@@ -15,6 +15,7 @@ dependencies {
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 }
 
 tasks.withType(JavaCompile).configureEach {
diff --git a/src/test/resources/projects/java16/gradle.properties b/src/test/resources/projects/java16/gradle.properties
index 0d8b3c77..52d27567 100644
--- a/src/test/resources/projects/java16/gradle.properties
+++ b/src/test/resources/projects/java16/gradle.properties
@@ -1,8 +1,9 @@
 org.gradle.jvmargs=-Xmx1G
 
-minecraft_version=21w19a
-yarn_mappings=21w19a+build.1
-loader_version=0.11.2
+minecraft_version=1.17.1
+yarn_mappings=1.17.1+build.29
+loader_version=0.11.6
+fabric_version=0.37.1+1.17
 
 mod_version = 1.0.0
 maven_group = com.example
diff --git a/src/test/resources/projects/kotlin/build.gradle.kts b/src/test/resources/projects/kotlin/build.gradle.kts
index 3a72942e..b248cb06 100644
--- a/src/test/resources/projects/kotlin/build.gradle.kts
+++ b/src/test/resources/projects/kotlin/build.gradle.kts
@@ -1,8 +1,8 @@
 import java.util.Properties
 
 plugins {
-	kotlin("jvm") version "1.4.31"
-	id("dev.architectury.loom")
+	kotlin("jvm") version "1.5.21"
+    id("dev.architectury.loom")
 }
 
 java {
@@ -16,5 +16,5 @@ dependencies {
 	minecraft(group = "com.mojang", name = "minecraft", version = "1.16.5")
 	mappings(group = "net.fabricmc", name = "yarn", version = "1.16.5+build.5", classifier = "v2")
 	modImplementation("net.fabricmc:fabric-loader:0.11.2")
-	modImplementation(group = "net.fabricmc", name = "fabric-language-kotlin", version = "1.5.0+kotlin.1.4.31")
+	modImplementation(group = "net.fabricmc", name = "fabric-language-kotlin", version = "1.6.3+kotlin.1.5.21")
 }
\ No newline at end of file
diff --git a/src/test/resources/projects/mixinApAutoRefmap/build.gradle b/src/test/resources/projects/mixinApAutoRefmap/build.gradle
index 93b05071..c5199d0c 100644
--- a/src/test/resources/projects/mixinApAutoRefmap/build.gradle
+++ b/src/test/resources/projects/mixinApAutoRefmap/build.gradle
@@ -68,9 +68,8 @@ java {
 }
 
 loom {
-	refmapName = "refmap0000.json"
-
 	mixin {
+		defaultRefmapName = "refmap0000.json"
 		add(sourceSets["main"], "refmap0001.json")
 		add(sourceSets["mixin"], "refmap0002.json")
 		add(sourceSets["mixin1"], "refmap0003.json") {
diff --git a/src/test/resources/projects/mixinApAutoRefmap/src/main/resources/fabric.mod.json b/src/test/resources/projects/mixinApAutoRefmap/src/main/resources/fabric.mod.json
index c8aeaefe..62efe822 100644
--- a/src/test/resources/projects/mixinApAutoRefmap/src/main/resources/fabric.mod.json
+++ b/src/test/resources/projects/mixinApAutoRefmap/src/main/resources/fabric.mod.json
@@ -23,6 +23,13 @@
     ]
   },
   "mixins": [
+    "main.mixins.json",
+    {
+      "config": "blabla.json",
+      "environment": "client"
+    },
+    "m1_1.mixins.json",
+    "m1_2.mixins.json"
   ],
 
   "depends": {
diff --git a/src/test/resources/projects/mixinApAutoRefmap/src/mixin/resources/m0.mixins.json b/src/test/resources/projects/mixinApAutoRefmap/src/mixin/resources/blabla.json
index e2c41484..e2c41484 100644
--- a/src/test/resources/projects/mixinApAutoRefmap/src/mixin/resources/m0.mixins.json
+++ b/src/test/resources/projects/mixinApAutoRefmap/src/mixin/resources/blabla.json
diff --git a/src/test/resources/projects/mixinApAutoRefmap/src/mixin/resources/irrelevant.mixins.json b/src/test/resources/projects/mixinApAutoRefmap/src/mixin/resources/irrelevant.mixins.json
new file mode 100644
index 00000000..e2c41484
--- /dev/null
+++ b/src/test/resources/projects/mixinApAutoRefmap/src/mixin/resources/irrelevant.mixins.json
@@ -0,0 +1,14 @@
+{
+  "required": true,
+  "minVersion": "0.8",
+  "package": "net.fabricmc.example.mixin",
+  "compatibilityLevel": "JAVA_16",
+  "mixins": [
+  ],
+  "client": [
+      "ExampleMixin0"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}
diff --git a/src/test/resources/projects/mixinApSimple/build.gradle b/src/test/resources/projects/mixinApSimple/build.gradle
index bf2d09f0..2090d7fa 100644
--- a/src/test/resources/projects/mixinApSimple/build.gradle
+++ b/src/test/resources/projects/mixinApSimple/build.gradle
@@ -67,8 +67,8 @@ java {
 }
 
 loom {
-	refmapName = "default-refmap0000.json"
 	mixin {
+		defaultRefmapName = "default-refmap0000.json"
 		add(sourceSets["main"], "main-refmap0000.json")
 		add(sourceSets["mixin"])
 	}
diff --git a/src/test/resources/projects/multiproject/build.gradle b/src/test/resources/projects/multiproject/build.gradle
index 0d389a0e..4ee9f268 100644
--- a/src/test/resources/projects/multiproject/build.gradle
+++ b/src/test/resources/projects/multiproject/build.gradle
@@ -40,7 +40,7 @@ allprojects {
 	}
 
 	loom {
-		shareCaches = true
+		shareCaches()
 	}
 
 	java {
diff --git a/src/test/resources/projects/parchment/build.gradle b/src/test/resources/projects/parchment/build.gradle
index 8fa50c43..12d72f75 100644
--- a/src/test/resources/projects/parchment/build.gradle
+++ b/src/test/resources/projects/parchment/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 repositories {
 	maven {
-		name = "ldtteam"
+		name = "ParchmentMC"
 		url = "https://maven.parchmentmc.net/"
 	}
 }
@@ -13,7 +13,7 @@ dependencies {
 	minecraft "com.mojang:minecraft:1.16.5"
 	mappings loom.layered() {
 		officialMojangMappings()
-		parchment("org.parchmentmc.data:parchment-1.16.5:20210608-SNAPSHOT@zip")
+		parchment("org.parchmentmc.data:parchment-1.16.5:2021.08.08@zip")
 	}
 
 	modImplementation "net.fabricmc:fabric-loader:0.11.3"