Merge branch 'NG_7.0' into fix/parchment-enabled-detection

neoforged · Aug 13, 2024 · 3e2cc7b · 3e2cc7b
2 parents ed05f07 + 714f31d
commit 3e2cc7b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 18 deletions.
diff --git a/...a/net/neoforged/gradle/common/extensions/sourcesets/SourceSetDependencyExtensionImpl.java b/...a/net/neoforged/gradle/common/extensions/sourcesets/SourceSetDependencyExtensionImpl.java
@@ -43,15 +43,9 @@ public void on(SourceSet sourceSet) {
         final SourceSetInheritanceExtension sourceSetInheritanceExtension = target.getExtensions().getByType(SourceSetInheritanceExtension.class);
         sourceSetInheritanceExtension.from(sourceSet);
 
-        target.setCompileClasspath(
-                target.getCompileClasspath().plus(
-                        sourceSet.getOutput()
-                )
-        );
-        target.setRuntimeClasspath(
-                target.getRuntimeClasspath().plus(
-                        sourceSet.getOutput()
-                )
+        project.getDependencies().add(
+                target.getImplementationConfigurationName(),
+                sourceSet.getOutput()
         );
     }
 }
diff --git a/.../net/neoforged/gradle/common/extensions/sourcesets/SourceSetInheritanceExtensionImpl.java b/.../net/neoforged/gradle/common/extensions/sourcesets/SourceSetInheritanceExtensionImpl.java
@@ -39,15 +39,11 @@ public void from(SourceSet sourceSet) {
             );
         }
 
-        target.setCompileClasspath(
-                target.getCompileClasspath().plus(
-                        sourceSet.getCompileClasspath()
-                )
+        project.getConfigurations().getByName(target.getCompileClasspathConfigurationName()).extendsFrom(
+                project.getConfigurations().getByName(sourceSet.getCompileClasspathConfigurationName())
         );
-        target.setRuntimeClasspath(
-                target.getRuntimeClasspath().plus(
-                        sourceSet.getRuntimeClasspath()
-                )
+        project.getConfigurations().getByName(target.getRuntimeClasspathConfigurationName()).extendsFrom(
+                project.getConfigurations().getByName(sourceSet.getRuntimeClasspathConfigurationName())
         );
     }
 }
diff --git a/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/SourceSetTests.groovy b/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/SourceSetTests.groovy
@@ -102,7 +102,6 @@ class SourceSetTests  extends BuilderBasedTestSpecification {
 
         then:
         run.getOutput().contains("com.google.code.gson/gson/2.11.0") || run.getOutput().contains("com.google.code.gson\\gson\\2.11.0")
-        run.getOutput().contains("inheriting_sourcesets_runtime/build/classes/java/main") || run.getOutput().contains("inheriting_sourcesets_runtime\\build\\classes\\java\\main")
     }
 
     def "depending on a sourceset adds the compile dependencies"() {