Fix extending the client/datagen compile/runtime classpath from main (#…

…967)
FabricMC · Oct 22, 2023 · 7106441 · 7106441
1 parent 39841d8
commit 7106441
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/main/java/net/fabricmc/loom/configuration/FabricApiExtension.java b/src/main/java/net/fabricmc/loom/configuration/FabricApiExtension.java
@@ -36,6 +36,7 @@
 
 import org.gradle.api.Action;
 import org.gradle.api.Project;
+import org.gradle.api.artifacts.ConfigurationContainer;
 import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.plugins.JavaPlugin;
@@ -142,15 +143,16 @@ public void configureDataGeneration(Action<DataGenerationSettings> action) {
 			sourceSets.create(DATAGEN_SOURCESET_NAME, sourceSet -> {
 				sourceSet.setCompileClasspath(
 							sourceSet.getCompileClasspath()
-								.plus(mainSourceSet.getCompileClasspath())
 								.plus(mainSourceSet.getOutput())
 				);
 
 				sourceSet.setRuntimeClasspath(
 							sourceSet.getRuntimeClasspath()
-									.plus(mainSourceSet.getRuntimeClasspath())
 									.plus(mainSourceSet.getOutput())
 				);
+
+				extendsFrom(getProject(), sourceSet.getCompileClasspathConfigurationName(), mainSourceSet.getCompileClasspathConfigurationName());
+				extendsFrom(getProject(), sourceSet.getRuntimeClasspathConfigurationName(), mainSourceSet.getRuntimeClasspathConfigurationName());
 			});
 
 			extension.getMods().create(settings.getModId().get(), mod -> {
@@ -298,4 +300,12 @@ private static class PomNotFoundException extends Exception {
 			super(cause);
 		}
 	}
+
+	private static void extendsFrom(Project project, String name, String extendsFrom) {
+		final ConfigurationContainer configurations = project.getConfigurations();
+
+		configurations.named(name, configuration -> {
+			configuration.extendsFrom(configurations.getByName(extendsFrom));
+		});
+	}
 }
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftSourceSets.java b/src/main/java/net/fabricmc/loom/configuration/providers/minecraft/MinecraftSourceSets.java
@@ -195,15 +195,16 @@ private void evaluate(Project project) {
 
 			clientOnlySourceSet.setCompileClasspath(
 					clientOnlySourceSet.getCompileClasspath()
-							.plus(mainSourceSet.getCompileClasspath())
 							.plus(mainSourceSet.getOutput())
 			);
 			clientOnlySourceSet.setRuntimeClasspath(
 					clientOnlySourceSet.getRuntimeClasspath()
-							.plus(mainSourceSet.getRuntimeClasspath())
 							.plus(mainSourceSet.getOutput())
 			);
 
+			extendsFrom(project, clientOnlySourceSet.getCompileClasspathConfigurationName(), mainSourceSet.getCompileClasspathConfigurationName());
+			extendsFrom(project, clientOnlySourceSet.getRuntimeClasspathConfigurationName(), mainSourceSet.getRuntimeClasspathConfigurationName());
+
 			RemapConfigurations.configureClientConfigurations(project, clientOnlySourceSet);
 
 			// Include the client only output in the jars