A temporary(tm) fix for eclipse run UoW validation

SpongePowered · May 17, 2021 · 7a0676c · 7a0676c
1 parent 89d4027
commit 7a0676c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/main/java/org/spongepowered/gradle/vanilla/ProvideMinecraftPlugin.java b/src/main/java/org/spongepowered/gradle/vanilla/ProvideMinecraftPlugin.java
@@ -125,7 +125,8 @@ public void apply(final Project target) {
         final org.spongepowered.gradle.vanilla.runs.RunConfigurationContainer runs = minecraft.getRuns();
         final File projectDir = target.getProjectDir();
         final String projectName = target.getName();
-        target.getTasks().register("genEclipseRuns", GenEclipseRuns.class, task -> {
+        target.getTasks().register(Constants.Tasks.GEN_ECLIPSE_RUNS, GenEclipseRuns.class, task -> {
+            task.dependsOn(assets);
             task.getRunConfigurations().set(runs);
             task.getProjectDirectory().set(projectDir);
             task.getProjectName().set(projectName);

diff --git a/src/main/java/org/spongepowered/gradle/vanilla/runs/RunConfiguration.java b/src/main/java/org/spongepowered/gradle/vanilla/runs/RunConfiguration.java
@@ -35,6 +35,7 @@
 import org.gradle.api.provider.Property;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.Internal;
+import org.gradle.api.tasks.Nested;
 import org.gradle.api.tasks.Optional;
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.jvm.toolchain.JavaLanguageVersion;
@@ -114,7 +115,7 @@ public void displayName(final String displyName) {
      * @return a map of launcher meta tokens
      * @see ClientRunParameterTokens for known token names
      */
-    @Internal
+    @Nested
     public MapProperty<String, String> getParameterTokens() {
         return this.parameterTokens;
     }
@@ -162,7 +163,7 @@ public Property<SourceSet> getIdeaRunSourceSet() {
         return this.ideaSourceSet;
     }
 
-    @Internal
+    @Nested
     public List<CommandLineArgumentProvider> getAllArgumentProviders() {
         return this.allArgs;
     }
@@ -186,7 +187,7 @@ public List<String> allArguments() {
         return values;
     }
 
-    @Internal
+    @Nested
     public List<CommandLineArgumentProvider> getAllJvmArgumentProviders() {
         return this.allJvmArgs;
     }
@@ -238,6 +239,7 @@ public void mainModule(final String mainModule) {
         this.mainModule.set(mainModule);
     }
 
+    @Input
     public Property<JavaLanguageVersion> getTargetVersion() {
         return this.targetVersion;
     }
@@ -263,6 +265,12 @@ static final class ConstantListProvider implements CommandLineArgumentProvider {
             this.contents = contents;
         }
 
+        @Input
+        @Optional
+        public List<String> getContents() {
+            return this.contents;
+        }
+
         @Override
         public Iterable<String> asArguments() {
             return this.contents == null ? Collections.emptyList() : this.contents;