Add userdevCompileOnly configuration and allow JarJar usage in the …

…platform `universalJar` (#60)
neoforged · Dec 1, 2023 · 0c49067 · 0c49067
1 parent d09a284
commit 0c49067
Show file tree

Hide file tree

Showing 16 changed files with 67 additions and 59 deletions.
diff --git a/common/build.gradle b/common/build.gradle
@@ -21,6 +21,8 @@ dependencies {
     api "codechicken:DiffPatch:${project.diffpatch_version}"
     api "commons-codec:commons-codec:${project.commons_codec_version}"
     api "net.neoforged:EclipseLaunchConfigs:${project.eclipse_launch_configs_version}"
+    api "net.neoforged:JarJarMetadata:${project.jarjar_version}"
+    api "net.neoforged:JarJarSelector:${project.jarjar_version}"
 
     // IDE support
     api "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:${project.gradle_idea_extension_version}"

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/...radle/userdev/jarjar/JarJarExtension.java → ...le/common/extensions/JarJarExtension.java b/...radle/userdev/jarjar/JarJarExtension.java → ...le/common/extensions/JarJarExtension.java
@@ -1,8 +1,8 @@
-package net.neoforged.gradle.userdev.jarjar;
+package net.neoforged.gradle.common.extensions;
 
-import net.neoforged.gradle.dsl.userdev.dependency.DependencyFilter;
-import net.neoforged.gradle.dsl.userdev.dependency.DependencyVersionInformationHandler;
-import net.neoforged.gradle.userdev.tasks.JarJar;
+import net.neoforged.gradle.dsl.common.dependency.DependencyFilter;
+import net.neoforged.gradle.dsl.common.dependency.DependencyVersionInformationHandler;
+import net.neoforged.gradle.common.tasks.JarJar;
 import org.gradle.api.Action;
 import org.gradle.api.Project;
 import org.gradle.api.Task;
@@ -14,7 +14,7 @@
 import javax.inject.Inject;
 import java.util.Optional;
 
-public class JarJarExtension implements net.neoforged.gradle.dsl.userdev.extension.JarJar {
+public class JarJarExtension implements net.neoforged.gradle.dsl.common.extensions.JarJar {
 
     private final Attribute<String> fixedJarJarVersionAttribute = Attribute.of("fixedJarJarVersion", String.class);
     private final Attribute<String> jarJarRangeAttribute = Attribute.of("jarJarRange", String.class);

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/...eoforged/gradle/userdev/tasks/JarJar.java → ...neoforged/gradle/common/tasks/JarJar.java b/...eoforged/gradle/userdev/tasks/JarJar.java → ...neoforged/gradle/common/tasks/JarJar.java
@@ -1,13 +1,12 @@
-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.userdev.manifest.DefaultInheritManifest;
-import net.neoforged.gradle.userdev.manifest.InheritManifest;
+package net.neoforged.gradle.common.tasks;
+
+import net.neoforged.jarjar.metadata.*;
+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.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;
@@ -83,7 +82,10 @@ public InheritManifest getManifest() {
     @TaskAction
     protected void copy() {
         this.jarJarCopySpec.from(getIncludedDependencies());
-        this.jarJarCopySpec.from(getMetadata());
+        if (!createMetadata().jars().isEmpty()) {
+            // Only copy metadata if not empty.
+            this.jarJarCopySpec.from(getJarJarMetadataPath().toFile());
+        }
         super.copy();
     }
 
@@ -222,7 +224,7 @@ private String getVersionRangeFrom(final ModuleDependency dependency) {
         if (versionRange.isPresent()) {
             return versionRange.get();
         }
-        final Optional<String> attributeVersion = getProject().getExtensions().getByType(net.neoforged.gradle.dsl.userdev.extension.JarJar.class).getRange(dependency);
+        final Optional<String> attributeVersion = getProject().getExtensions().getByType(net.neoforged.gradle.dsl.common.extensions.JarJar.class).getRange(dependency);
 
         return attributeVersion.orElseGet(() -> Objects.requireNonNull(dependency.getVersion()));
     }
@@ -232,7 +234,7 @@ private String getVersionFrom(final ModuleDependency dependency) {
         if (version.isPresent()) {
             return version.get();
         }
-        final Optional<String> attributeVersion = getProject().getExtensions().getByType(net.neoforged.gradle.dsl.userdev.extension.JarJar.class).getPin(dependency);
+        final Optional<String> attributeVersion = getProject().getExtensions().getByType(net.neoforged.gradle.dsl.common.extensions.JarJar.class).getPin(dependency);
 
         return attributeVersion.orElseGet(() -> Objects.requireNonNull(dependency.getVersion()));
     }

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/...radle/dsl/userdev/extension/JarJar.groovy → ...radle/dsl/common/extensions/JarJar.groovy b/...radle/dsl/userdev/extension/JarJar.groovy → ...radle/dsl/common/extensions/JarJar.groovy
@@ -1,7 +1,7 @@
-package net.neoforged.gradle.dsl.userdev.extension
+package net.neoforged.gradle.dsl.common.extensions
 
-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/gradle.properties b/gradle.properties
@@ -26,7 +26,7 @@ ivy_artifact_version=2.5.1
 httpclient_version=4.5.13
 srgutils_version=0.4.13
 diffpatch_version=1.5.0.29
-jarjar_version=0.3.19
+jarjar_version=0.4.1
 jetbrains_annotations_version=23.0.0
 gradle_idea_extension_version=1.1.6
 groovy_dsl_improver_version=1.0.10