More forwards

shevek · Apr 21, 2015 · d3268eb · d3268eb
1 parent c017ace
commit d3268eb
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/jarjar-gradle/src/main/java/org/anarres/gradle/plugin/jarjar/JarjarController.java b/jarjar-gradle/src/main/java/org/anarres/gradle/plugin/jarjar/JarjarController.java
@@ -28,7 +28,7 @@ public JarjarController(@Nonnull Project project) {
     }
 
     @Nonnull
-    public FileCollection repackage(@Nonnull String name, @Nonnull Closure c) {
+    public FileCollection repackage(@Nonnull String name, @Nonnull Closure<?> c) {
         JarjarTask jarjar = project.getTasks().create(
                 name,
                 JarjarTask.class,
@@ -37,7 +37,7 @@ public FileCollection repackage(@Nonnull String name, @Nonnull Closure c) {
     }
 
     @Nonnull
-    public FileCollection repackage(@Nonnull Closure c) {
+    public FileCollection repackage(@Nonnull Closure<?> c) {
         return repackage("jarjar-" + SEQ.getAndIncrement(), c);
     }
 

diff --git a/jarjar-gradle/src/main/java/org/anarres/gradle/plugin/jarjar/JarjarPlugin.java b/jarjar-gradle/src/main/java/org/anarres/gradle/plugin/jarjar/JarjarPlugin.java
@@ -5,8 +5,13 @@
  */
 package org.anarres.gradle.plugin.jarjar;
 
+import groovy.lang.Closure;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
+import org.gradle.api.file.FileCollection;
+import org.gradle.api.internal.ClosureBackedAction;
+import static org.bouncycastle.asn1.x500.style.RFC4519Style.c;
+import static org.gradle.internal.Transformers.name;
 
 /**
  *
@@ -15,9 +20,21 @@
 public class JarjarPlugin implements Plugin<Project> {
 
     @Override
-    public void apply(Project project) {
+    public void apply(final Project project) {
         project.getLogger().info("Applying " + this);
         // project.getExtensions().getExtraProperties().set("Jarjar", JarjarTask.class);
+        /*
+         project.getExtensions().getExtraProperties().set("jarjarDependency", new Closure<FileCollection>(JarjarPlugin.this) {
+         @Override
+         public FileCollection call(Object... args) {
+         JarjarTask jarjar = project.getTasks().create(
+         name,
+         JarjarTask.class,
+         new ClosureBackedAction<JarjarTask>(c));
+         return jarjar.getOutputs().getFiles();
+         }
+         });
+         */
         project.getExtensions().create("jarjar", JarjarController.class, project);
     }