Move InheritManifest to common

neoforged · Nov 28, 2023 · 4236d08 · 4236d08
1 parent 701af21
commit 4236d08
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/...rdev/manifest/DefaultInheritManifest.java → ...mmon/manifest/DefaultInheritManifest.java b/...rdev/manifest/DefaultInheritManifest.java → ...mmon/manifest/DefaultInheritManifest.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.neoforged.gradle.userdev.manifest;
+package net.neoforged.gradle.common.manifest;
 
 import groovy.lang.Closure;
 import org.gradle.api.Action;
@@ -21,7 +21,7 @@
 
 public class DefaultInheritManifest implements InheritManifest {
 
-    private List<DefaultManifestMergeSpec> inheritMergeSpecs = new ArrayList<>();
+    private final List<DefaultManifestMergeSpec> inheritMergeSpecs = new ArrayList<>();
     private final FileResolver fileResolver;
     private final Manifest internalManifest;
 

diff --git a/...dle/userdev/manifest/InheritManifest.java → ...adle/common/manifest/InheritManifest.java b/...dle/userdev/manifest/InheritManifest.java → ...adle/common/manifest/InheritManifest.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-2.1-only
  */
 
-package net.neoforged.gradle.userdev.manifest;
+package net.neoforged.gradle.common.manifest;
 
 import org.gradle.api.Action;
 import org.gradle.api.java.archives.Manifest;

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
@@ -5,8 +5,8 @@
 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 net.neoforged.gradle.common.manifest.DefaultInheritManifest;
+import net.neoforged.gradle.common.manifest.InheritManifest;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
 import org.apache.maven.artifact.versioning.VersionRange;