From 701af21977e6450060669a422cff14ef3c3a5d15 Mon Sep 17 00:00:00 2001 From: Technici4n <13494793+Technici4n@users.noreply.github.com> Date: Tue, 28 Nov 2023 18:17:47 +0100 Subject: [PATCH] Move dependency handling to common --- .../dependency/AbstractDependencyManagementObject.java | 4 ++-- .../common}/dependency/DefaultDependencyFilter.java | 5 ++--- .../DefaultDependencyVersionInformationHandler.java | 5 ++--- .../dsl/common}/dependency/DependencyFilter.groovy | 4 ++-- .../common}/dependency/DependencyManagementObject.groovy | 4 ++-- .../DependencyVersionInformationHandler.groovy | 4 ++-- .../neoforged/gradle/dsl/userdev/extension/JarJar.groovy | 6 +++--- .../neoforged/gradle/userdev/jarjar/JarJarExtension.java | 4 ++-- .../java/net/neoforged/gradle/userdev/tasks/JarJar.java | 9 ++++----- 9 files changed, 21 insertions(+), 24 deletions(-) rename {userdev/src/main/java/net/neoforged/gradle/userdev => common/src/main/java/net/neoforged/gradle/common}/dependency/AbstractDependencyManagementObject.java (94%) rename {userdev/src/main/java/net/neoforged/gradle/userdev => common/src/main/java/net/neoforged/gradle/common}/dependency/DefaultDependencyFilter.java (88%) rename {userdev/src/main/java/net/neoforged/gradle/userdev => common/src/main/java/net/neoforged/gradle/common}/dependency/DefaultDependencyVersionInformationHandler.java (91%) rename dsl/{userdev/src/main/groovy/net/neoforged/gradle/dsl/userdev => common/src/main/groovy/net/neoforged/gradle/dsl/common}/dependency/DependencyFilter.groovy (96%) rename dsl/{userdev/src/main/groovy/net/neoforged/gradle/dsl/userdev => common/src/main/groovy/net/neoforged/gradle/dsl/common}/dependency/DependencyManagementObject.groovy (97%) rename dsl/{userdev/src/main/groovy/net/neoforged/gradle/dsl/userdev => common/src/main/groovy/net/neoforged/gradle/dsl/common}/dependency/DependencyVersionInformationHandler.groovy (97%) diff --git a/userdev/src/main/java/net/neoforged/gradle/userdev/dependency/AbstractDependencyManagementObject.java b/common/src/main/java/net/neoforged/gradle/common/dependency/AbstractDependencyManagementObject.java similarity index 94% rename from userdev/src/main/java/net/neoforged/gradle/userdev/dependency/AbstractDependencyManagementObject.java rename to common/src/main/java/net/neoforged/gradle/common/dependency/AbstractDependencyManagementObject.java index 3ea682508..79bb79be7 100644 --- a/userdev/src/main/java/net/neoforged/gradle/userdev/dependency/AbstractDependencyManagementObject.java +++ b/common/src/main/java/net/neoforged/gradle/common/dependency/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/userdev/src/main/java/net/neoforged/gradle/userdev/dependency/DefaultDependencyFilter.java b/common/src/main/java/net/neoforged/gradle/common/dependency/DefaultDependencyFilter.java similarity index 88% rename from userdev/src/main/java/net/neoforged/gradle/userdev/dependency/DefaultDependencyFilter.java rename to common/src/main/java/net/neoforged/gradle/common/dependency/DefaultDependencyFilter.java index 6c889363e..169573a6a 100644 --- a/userdev/src/main/java/net/neoforged/gradle/userdev/dependency/DefaultDependencyFilter.java +++ b/common/src/main/java/net/neoforged/gradle/common/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/userdev/src/main/java/net/neoforged/gradle/userdev/dependency/DefaultDependencyVersionInformationHandler.java b/common/src/main/java/net/neoforged/gradle/common/dependency/DefaultDependencyVersionInformationHandler.java similarity index 91% rename from userdev/src/main/java/net/neoforged/gradle/userdev/dependency/DefaultDependencyVersionInformationHandler.java rename to common/src/main/java/net/neoforged/gradle/common/dependency/DefaultDependencyVersionInformationHandler.java index c518c4d9c..168e5f7ba 100644 --- a/userdev/src/main/java/net/neoforged/gradle/userdev/dependency/DefaultDependencyVersionInformationHandler.java +++ b/common/src/main/java/net/neoforged/gradle/common/dependency/DefaultDependencyVersionInformationHandler.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/dsl/userdev/src/main/groovy/net/neoforged/gradle/dsl/userdev/dependency/DependencyFilter.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/dependency/DependencyFilter.groovy similarity index 96% rename from dsl/userdev/src/main/groovy/net/neoforged/gradle/dsl/userdev/dependency/DependencyFilter.groovy rename to dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/dependency/DependencyFilter.groovy index d599c2754..5571387a5 100644 --- a/dsl/userdev/src/main/groovy/net/neoforged/gradle/dsl/userdev/dependency/DependencyFilter.groovy +++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/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); -} \ No newline at end of file +} diff --git a/dsl/userdev/src/main/groovy/net/neoforged/gradle/dsl/userdev/dependency/DependencyManagementObject.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/dependency/DependencyManagementObject.groovy similarity index 97% rename from dsl/userdev/src/main/groovy/net/neoforged/gradle/dsl/userdev/dependency/DependencyManagementObject.groovy rename to dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/dependency/DependencyManagementObject.groovy index e2bd26b4b..33e356d42 100644 --- a/dsl/userdev/src/main/groovy/net/neoforged/gradle/dsl/userdev/dependency/DependencyManagementObject.groovy +++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/dependency/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; } } -} \ No newline at end of file +} diff --git a/dsl/userdev/src/main/groovy/net/neoforged/gradle/dsl/userdev/dependency/DependencyVersionInformationHandler.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/dependency/DependencyVersionInformationHandler.groovy similarity index 97% rename from dsl/userdev/src/main/groovy/net/neoforged/gradle/dsl/userdev/dependency/DependencyVersionInformationHandler.groovy rename to dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/dependency/DependencyVersionInformationHandler.groovy index f4c410f94..c5cdd9909 100644 --- a/dsl/userdev/src/main/groovy/net/neoforged/gradle/dsl/userdev/dependency/DependencyVersionInformationHandler.groovy +++ b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/dependency/DependencyVersionInformationHandler.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 getVersion(ModuleDependency dependency); -} \ No newline at end of file +} 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 index 86ca43a3f..f0f668111 100644 --- 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); -} \ No newline at end of file +} 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 index 435f12340..fbd08dc74 100644 --- 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 index 69aa81ae7..5d18fd654 100644 --- 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;