Move dependency handling to common

neoforged · Nov 28, 2023 · 701af21 · 701af21
1 parent 827d309
commit 701af21
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 24 deletions.
diff --git a/...y/AbstractDependencyManagementObject.java → ...y/AbstractDependencyManagementObject.java b/...y/AbstractDependencyManagementObject.java → ...y/AbstractDependencyManagementObject.java
@@ -1,7 +1,7 @@
-package net.neoforged.gradle.userdev.dependency;
+package net.neoforged.gradle.common.dependency;
 
 import groovy.lang.Closure;
-import net.neoforged.gradle.dsl.userdev.dependency.DependencyManagementObject;
+import net.neoforged.gradle.dsl.common.dependency.DependencyManagementObject;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.artifacts.ModuleDependency;

diff --git a/...v/dependency/DefaultDependencyFilter.java → ...n/dependency/DefaultDependencyFilter.java b/...v/dependency/DefaultDependencyFilter.java → ...n/dependency/DefaultDependencyFilter.java
@@ -1,7 +1,6 @@
-package net.neoforged.gradle.userdev.dependency;
+package net.neoforged.gradle.common.dependency;
 
-import net.neoforged.gradle.dsl.userdev.dependency.DependencyFilter;
-import net.neoforged.gradle.dsl.userdev.dependency.DependencyManagementObject;
+import net.neoforged.gradle.dsl.common.dependency.DependencyFilter;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.ModuleDependency;
 import org.gradle.api.artifacts.ResolvedDependency;

diff --git a/...tDependencyVersionInformationHandler.java → ...tDependencyVersionInformationHandler.java b/...tDependencyVersionInformationHandler.java → ...tDependencyVersionInformationHandler.java
@@ -1,8 +1,7 @@
-package net.neoforged.gradle.userdev.dependency;
+package net.neoforged.gradle.common.dependency;
 
 import com.google.common.collect.Maps;
-import net.neoforged.gradle.dsl.userdev.dependency.DependencyManagementObject;
-import net.neoforged.gradle.dsl.userdev.dependency.DependencyVersionInformationHandler;
+import net.neoforged.gradle.dsl.common.dependency.DependencyVersionInformationHandler;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.VersionRange;
 import org.gradle.api.Project;

diff --git a/...serdev/dependency/DependencyFilter.groovy → ...common/dependency/DependencyFilter.groovy b/...serdev/dependency/DependencyFilter.groovy → ...common/dependency/DependencyFilter.groovy
@@ -1,4 +1,4 @@
-package net.neoforged.gradle.dsl.userdev.dependency
+package net.neoforged.gradle.dsl.common.dependency
 
 import groovy.transform.CompileStatic
 import org.gradle.api.artifacts.ModuleDependency
@@ -49,4 +49,4 @@ interface DependencyFilter extends DependencyManagementObject {
      * @return The result of the filter.
      */
     boolean isIncluded(ArtifactIdentifier identifier);
-}
+}
diff --git a/...endency/DependencyManagementObject.groovy → ...endency/DependencyManagementObject.groovy b/...endency/DependencyManagementObject.groovy → ...endency/DependencyManagementObject.groovy
@@ -1,4 +1,4 @@
-package net.neoforged.gradle.dsl.userdev.dependency
+package net.neoforged.gradle.dsl.common.dependency
 
 import groovy.transform.CompileStatic
 import org.gradle.api.artifacts.Dependency
@@ -80,4 +80,4 @@ interface DependencyManagementObject {
             return version;
         }
     }
-}
+}
diff --git a/...ependencyVersionInformationHandler.groovy → ...ependencyVersionInformationHandler.groovy b/...ependencyVersionInformationHandler.groovy → ...ependencyVersionInformationHandler.groovy
@@ -1,4 +1,4 @@
-package net.neoforged.gradle.dsl.userdev.dependency
+package net.neoforged.gradle.dsl.common.dependency
 
 import groovy.transform.CompileStatic
 import org.apache.maven.artifact.versioning.ArtifactVersion
@@ -64,4 +64,4 @@ interface DependencyVersionInformationHandler extends DependencyManagementObject
      * @return The version, if any.
      */
     Optional<String> getVersion(ModuleDependency dependency);
-}
+}
diff --git a/dsl/userdev/src/main/groovy/net/neoforged/gradle/dsl/userdev/extension/JarJar.groovy b/dsl/userdev/src/main/groovy/net/neoforged/gradle/dsl/userdev/extension/JarJar.groovy
@@ -1,7 +1,7 @@
 package net.neoforged.gradle.dsl.userdev.extension
 
-import net.neoforged.gradle.dsl.userdev.dependency.DependencyFilter
-import net.neoforged.gradle.dsl.userdev.dependency.DependencyVersionInformationHandler
+import net.neoforged.gradle.dsl.common.dependency.DependencyFilter
+import net.neoforged.gradle.dsl.common.dependency.DependencyVersionInformationHandler
 import org.gradle.api.Action
 import org.gradle.api.artifacts.Dependency
 import org.gradle.api.publish.maven.MavenPublication
@@ -38,4 +38,4 @@ interface JarJar {
 
     MavenPublication component(MavenPublication mavenPublication);
 
-}
+}
diff --git a/userdev/src/main/java/net/neoforged/gradle/userdev/jarjar/JarJarExtension.java b/userdev/src/main/java/net/neoforged/gradle/userdev/jarjar/JarJarExtension.java
@@ -1,7 +1,7 @@
 package net.neoforged.gradle.userdev.jarjar;
 
-import net.neoforged.gradle.dsl.userdev.dependency.DependencyFilter;
-import net.neoforged.gradle.dsl.userdev.dependency.DependencyVersionInformationHandler;
+import net.neoforged.gradle.dsl.common.dependency.DependencyFilter;
+import net.neoforged.gradle.dsl.common.dependency.DependencyVersionInformationHandler;
 import net.neoforged.gradle.userdev.tasks.JarJar;
 import org.gradle.api.Action;
 import org.gradle.api.Project;

diff --git a/userdev/src/main/java/net/neoforged/gradle/userdev/tasks/JarJar.java b/userdev/src/main/java/net/neoforged/gradle/userdev/tasks/JarJar.java
@@ -1,11 +1,10 @@
 package net.neoforged.gradle.userdev.tasks;
 
 import net.minecraftforge.jarjar.metadata.*;
-import net.neoforged.gradle.dsl.userdev.dependency.DependencyFilter;
-import net.neoforged.gradle.dsl.userdev.dependency.DependencyVersionInformationHandler;
-import net.neoforged.gradle.userdev.dependency.DefaultDependencyFilter;
-import net.neoforged.gradle.userdev.dependency.DefaultDependencyVersionInformationHandler;
-import net.neoforged.gradle.userdev.jarjar.JarJarExtension;
+import net.neoforged.gradle.dsl.common.dependency.DependencyFilter;
+import net.neoforged.gradle.dsl.common.dependency.DependencyVersionInformationHandler;
+import net.neoforged.gradle.common.dependency.DefaultDependencyFilter;
+import net.neoforged.gradle.common.dependency.DefaultDependencyVersionInformationHandler;
 import net.neoforged.gradle.userdev.manifest.DefaultInheritManifest;
 import net.neoforged.gradle.userdev.manifest.InheritManifest;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;