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

7 files changed, 17 insertions, 9 deletions

diff --git a/src/test/groovy/net/fabricmc/loom/test/integration/CustomManifestTest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/CustomManifestTest.groovy
index aa849c1b..f6ee1f00 100644
--- a/src/test/groovy/net/fabricmc/loom/test/integration/CustomManifestTest.groovy
+++ b/src/test/groovy/net/fabricmc/loom/test/integration/CustomManifestTest.groovy
@@ -40,7 +40,7 @@ class CustomManifestTest extends Specification implements ProjectTestTrait {
     def filesReady() {
         buildGradle() << '''
             loom {
-                customManifest = "https://maven.fabricmc.net/net/minecraft/1_18_experimental-snapshot-1.json"
+                customMinecraftManifest = "https://maven.fabricmc.net/net/minecraft/1_18_experimental-snapshot-1.json"
             }
 
             dependencies {
diff --git a/src/test/groovy/net/fabricmc/loom/test/integration/Java16ProjectTest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/Java16ProjectTest.groovy
index 3bb70f13..90922f51 100644
--- a/src/test/groovy/net/fabricmc/loom/test/integration/Java16ProjectTest.groovy
+++ b/src/test/groovy/net/fabricmc/loom/test/integration/Java16ProjectTest.groovy
@@ -45,5 +45,6 @@ class Java16ProjectTest extends Specification implements ProjectTestTrait {
 		where:
 			gradle              | _
 			DEFAULT_GRADLE      | _
+			PRE_RELEASE_GRADLE  | _
 	}
 }
diff --git a/src/test/groovy/net/fabricmc/loom/test/integration/KotlinTest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/KotlinTest.groovy
index 6ad664c4..2d0e7adb 100644
--- a/src/test/groovy/net/fabricmc/loom/test/integration/KotlinTest.groovy
+++ b/src/test/groovy/net/fabricmc/loom/test/integration/KotlinTest.groovy
@@ -31,7 +31,6 @@ import spock.lang.Unroll
 
 import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
 
-@IgnoreIf({ jvm.java16Compatible }) // Fails on J16 > due to https://youtrack.jetbrains.com/issue/KT-45566
 class KotlinTest extends Specification implements ProjectTestTrait {
 	@Override
 	String name() {
diff --git a/src/test/groovy/net/fabricmc/loom/test/integration/MixinApAutoRefmapTest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/MixinApAutoRefmapTest.groovy
index 80ed7c86..acd16c5b 100644
--- a/src/test/groovy/net/fabricmc/loom/test/integration/MixinApAutoRefmapTest.groovy
+++ b/src/test/groovy/net/fabricmc/loom/test/integration/MixinApAutoRefmapTest.groovy
@@ -56,7 +56,7 @@ class MixinApAutoRefmapTest extends Specification implements ProjectTestTrait {
         def j1 = JsonParser.parseReader(new InputStreamReader(jar.getInputStream(jar.getEntry("main.mixins.json"))))
         j1.asJsonObject.getAsJsonPrimitive("refmap").getAsString() == "refmap0001.json"
 
-        def j2 = JsonParser.parseReader(new InputStreamReader(jar.getInputStream(jar.getEntry("m0.mixins.json"))))
+        def j2 = JsonParser.parseReader(new InputStreamReader(jar.getInputStream(jar.getEntry("blabla.json"))))
         j2.asJsonObject.getAsJsonPrimitive("refmap").getAsString() == "refmap0002.json"
 
         def j3 = JsonParser.parseReader(new InputStreamReader(jar.getInputStream(jar.getEntry("m1_1.mixins.json"))))
@@ -65,6 +65,9 @@ class MixinApAutoRefmapTest extends Specification implements ProjectTestTrait {
         def j4 = JsonParser.parseReader(new InputStreamReader(jar.getInputStream(jar.getEntry("m1_2.mixins.json"))))
         !j4.asJsonObject.has("refmap")
 
+        def j5 = JsonParser.parseReader(new InputStreamReader(jar.getInputStream(jar.getEntry("irrelevant.mixins.json"))))
+        !j5.asJsonObject.has("refmap")
+
         where:
         gradle              | _
         DEFAULT_GRADLE      | _
diff --git a/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy b/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy
index e013170a..4484dfe6 100644
--- a/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy
+++ b/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingSpecBuilderTest.groovy
@@ -33,7 +33,7 @@ import org.gradle.api.Action
 import org.gradle.util.ConfigureUtil
 import spock.lang.Specification
 
-class LayeredMappingSpecBuilderTest extends Specification {
+class LayeredMappingSpecBuilderTest extends LayeredMappingsSpecification {
     def "simple mojmap" () {
         when:
             def spec = layered() {
@@ -41,7 +41,7 @@ class LayeredMappingSpecBuilderTest extends Specification {
             }
             def layers = spec.layers()
         then:
-            spec.version == "layered+hash.2198"
+            spec.getVersion(mappingContext) == "layered+hash.2198.minecraft.null"
             layers.size() == 2
             layers[0].class == IntermediaryMappingsSpec
             layers[1].class == MojangMappingsSpec
@@ -56,7 +56,7 @@ class LayeredMappingSpecBuilderTest extends Specification {
             def layers = spec.layers()
             def parchment = layers[2] as ParchmentMappingsSpec
         then:
-            spec.version == "layered+hash.863752751"
+            spec.getVersion(mappingContext) == "layered+hash.863752751.minecraft.null"
             layers.size() == 3
             layers[0].class == IntermediaryMappingsSpec
             layers[1].class == MojangMappingsSpec
@@ -76,7 +76,7 @@ class LayeredMappingSpecBuilderTest extends Specification {
             def layers = spec.layers()
             def parchment = layers[2] as ParchmentMappingsSpec
         then:
-            spec.version == "layered+hash.863752757"
+            spec.getVersion(mappingContext) == "layered+hash.863752757.minecraft.null"
             layers.size() == 3
             layers[0].class == IntermediaryMappingsSpec
             layers[1].class == MojangMappingsSpec
@@ -96,7 +96,7 @@ class LayeredMappingSpecBuilderTest extends Specification {
             def layers = spec.layers()
             def parchment = layers[2] as ParchmentMappingsSpec
         then:
-            spec.version == "layered+hash.1144427140"
+            spec.getVersion(mappingContext) == "layered+hash.1144427140.minecraft.null"
             layers.size() == 3
             layers[0].class == IntermediaryMappingsSpec
             layers[1].class == MojangMappingsSpec
diff --git a/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingsSpecification.groovy b/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingsSpecification.groovy
index 64a37b5f..5c087a9d 100644
--- a/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingsSpecification.groovy
+++ b/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/LayeredMappingsSpecification.groovy
@@ -109,6 +109,11 @@ abstract class LayeredMappingsSpecification extends Specification implements Lay
         }
 
         @Override
+        File workingDirectory() {
+            return tempDir
+        }
+
+        @Override
         File workingDirectory(String name) {
             return new File(tempDir, name)
         }
diff --git a/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy b/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy
index fb576009..f1893edc 100644
--- a/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy
+++ b/src/test/groovy/net/fabricmc/loom/test/util/ProjectTestTrait.groovy
@@ -29,7 +29,7 @@ import org.gradle.testkit.runner.GradleRunner
 
 trait ProjectTestTrait {
 	final static String DEFAULT_GRADLE = "7.0.1"
-	final static String PRE_RELEASE_GRADLE = "7.2-20210719222438+0000"
+	final static String PRE_RELEASE_GRADLE = "7.3-20210807021145+0000"
 
 	static File gradleHome = File.createTempDir()
 	File testProjectDir = File.createTempDir()