Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.10.0

# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java
#	src/test/groovy/net/fabricmc/loom/test/integration/FabricAPITest.groovy

4 files changed, 19 insertions, 27 deletions

diff --git a/src/test/resources/patches/fabric_api.patch b/src/test/resources/patches/fabric_api.patch
deleted file mode 100644
index cce2c1a8..00000000
--- a/src/test/resources/patches/fabric_api.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/build.gradle b/build.gradle
---- a/build.gradle	(revision fc40aa9d88e9457957bdf3f8cec9698846828cd3)
-+++ b/build.gradle	(date 1631009569915)
-@@ -257,6 +257,9 @@
- 		setupRepositories(repositories)
- 	}
-
-+	// Required as moduleDependencies modifies the pom
-+	loom.disableDeprecatedPomGeneration(publishing.publications.mavenJava)
-+
- 	javadoc.enabled = false
- }
-
-@@ -296,6 +299,8 @@
- 	setupRepositories(repositories)
- }
-
-+loom.disableDeprecatedPomGeneration(publishing.publications.mavenJava)
-+
- void setupRepositories(RepositoryHandler repositories) {
- 	//repositories.mavenLocal() // uncomment for testing
- 	def ENV = System.getenv()
diff --git a/src/test/resources/projects/java16/gradle.properties b/src/test/resources/projects/java16/gradle.properties
index 753673c4..cdc647ce 100644
--- a/src/test/resources/projects/java16/gradle.properties
+++ b/src/test/resources/projects/java16/gradle.properties
@@ -1,9 +1,9 @@
 org.gradle.jvmargs=-Xmx1G
 
-minecraft_version=21w39a
-yarn_mappings=21w39a+build.1
-loader_version=0.11.7
-fabric_version=0.40.4+1.18
+minecraft_version=1.18-pre1
+yarn_mappings=1.18-pre1+build.2
+loader_version=0.12.5
+fabric_version=0.42.1+1.18
 
 mod_version = 1.0.0
 maven_group = com.example
diff --git a/src/test/resources/projects/multiproject/core/build.gradle b/src/test/resources/projects/multiproject/core/build.gradle
index 8a09f64b..652eb359 100644
--- a/src/test/resources/projects/multiproject/core/build.gradle
+++ b/src/test/resources/projects/multiproject/core/build.gradle
@@ -1 +1,6 @@
-archivesBaseName = "core"
\ No newline at end of file
+archivesBaseName = "core"
+
+dependencies {
+	// An example api dep to be used by the other sub project.
+	modApi "TechReborn:TechReborn-1.16:3.8.4+build.236"
+}
\ No newline at end of file
diff --git a/src/test/resources/projects/multiproject/example/src/main/java/net/fabricmc/example/ExampleMod.java b/src/test/resources/projects/multiproject/example/src/main/java/net/fabricmc/example/ExampleMod.java
index e5ed082e..2afebd00 100644
--- a/src/test/resources/projects/multiproject/example/src/main/java/net/fabricmc/example/ExampleMod.java
+++ b/src/test/resources/projects/multiproject/example/src/main/java/net/fabricmc/example/ExampleMod.java
@@ -1,6 +1,9 @@
 package net.fabricmc.example;
 
 import net.fabricmc.api.ModInitializer;
+import net.minecraft.block.BlockState;
+import techreborn.blocks.cable.CableShapeUtil;
+import net.minecraft.util.shape.VoxelShape;
 
 public class ExampleMod implements ModInitializer {
 	@Override
@@ -10,5 +13,11 @@ public class ExampleMod implements ModInitializer {
 		// Proceed with mild caution.
 
 		System.out.println("Hello Fabric world!");
+
+		if (false) {
+			// Just here to make sure it compiles as named, not to test it runs
+			BlockState state = null;
+			VoxelShape shape = new CableShapeUtil(null).getShape(state);
+		}
 	}
 }