update to Gradle 2.12

jprante · Mar 25, 2016 · fafef1c · fafef1c
1 parent d34901b
commit fafef1c
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 271 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,15 @@
-/.gradle
-/build
+target
+build
+out
+*~
+.gradle
+*.iml
 *.ipr
 *.iws
-*.iml
+.idea
+*.class
+user.gradle
+.settings
+*.classpath
+*.project
 
diff --git a/README.md b/README.md
@@ -2,6 +2,12 @@
 
 A Gradle plugin for [JFlex](http://jflex.de)
 
+# Versions
+
+1.0.0 - for Gradle < 2.12
+
+1.0.1 - for Gradle >= 2.12
+
 ## Usage
 
     apply plugin: 'java'
@@ -15,7 +21,7 @@ A Gradle plugin for [JFlex](http://jflex.de)
             }
         }
         dependencies {
-            classpath 'org.xbib.gradle.plugins:gradle-plugin-jflex:1.0.0'
+            classpath 'org.xbib.gradle.plugins:gradle-plugin-jflex:1.0.1'
         }
     }
 

diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 
 group = 'org.xbib.gradle.plugin'
-version = '1.0.0'
+version = '1.0.1'
 
 apply plugin: 'java'
 apply plugin: 'maven'
@@ -21,10 +21,11 @@ configurations {
 }
 
 dependencies {
+  compile localGroovy()
   compile gradleApi()
   compile "de.jflex:jflex:1.6.0"
-  testCompile 'junit:junit:4.11'
-  wagon 'org.apache.maven.wagon:wagon-ssh-external:2.6'
+  testCompile 'junit:junit:4.12'
+  wagon 'org.apache.maven.wagon:wagon-ssh-external:2.10'
 }
 
 uploadArchives {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/src/main/java/org/xbib/gradle/plugin/jflex/JFlexPlugin.java b/src/main/java/org/xbib/gradle/plugin/jflex/JFlexPlugin.java
@@ -4,6 +4,7 @@
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.internal.file.FileResolver;
+import org.gradle.api.internal.file.collections.DirectoryFileTreeFactory;
 import org.gradle.api.internal.plugins.DslObject;
 import org.gradle.api.internal.tasks.DefaultSourceSet;
 import org.gradle.api.plugins.JavaPlugin;
@@ -15,9 +16,12 @@
 public final class JFlexPlugin implements Plugin<Project> {
     private final FileResolver fileResolver;
 
+    private final DirectoryFileTreeFactory directoryFileTreeFactory;
+
     @Inject
-    public JFlexPlugin(final FileResolver fileResolver) {
+    public JFlexPlugin(final FileResolver fileResolver, DirectoryFileTreeFactory directoryFileTreeFactory) {
         this.fileResolver = fileResolver;
+        this.directoryFileTreeFactory = directoryFileTreeFactory;
     }
 
     @Override
@@ -38,7 +42,8 @@ private void configureSourceSets(final Project project) {
                 .getPlugin(JavaPluginConvention.class).getSourceSets()
                 .all(sourceSet -> {
                     JFlexVirtualSourceDirectoryImpl jflexSourceSet =
-                            new JFlexVirtualSourceDirectoryImpl(((DefaultSourceSet) sourceSet).getDisplayName(), fileResolver);
+                            new JFlexVirtualSourceDirectoryImpl(((DefaultSourceSet) sourceSet).getDisplayName(),
+                                    fileResolver, directoryFileTreeFactory);
                     new DslObject(sourceSet).getConvention().getPlugins().put("jflex", jflexSourceSet);
                     String srcDir = String.format("src/%s/jflex", sourceSet.getName());
                     jflexSourceSet.getJflex().srcDir(srcDir);

diff --git a/src/main/java/org/xbib/gradle/plugin/jflex/JFlexVirtualSourceDirectoryImpl.java b/src/main/java/org/xbib/gradle/plugin/jflex/JFlexVirtualSourceDirectoryImpl.java
@@ -4,15 +4,17 @@
 import org.gradle.api.file.SourceDirectorySet;
 import org.gradle.api.internal.file.DefaultSourceDirectorySet;
 import org.gradle.api.internal.file.FileResolver;
+import org.gradle.api.internal.file.collections.DirectoryFileTreeFactory;
 import org.gradle.util.ConfigureUtil;
 
 public class JFlexVirtualSourceDirectoryImpl implements JFlexVirtualSourceDirectory {
 
     private final SourceDirectorySet jflex;
 
-    public JFlexVirtualSourceDirectoryImpl(final String parentDisplayName, FileResolver fileResolver) {
+    public JFlexVirtualSourceDirectoryImpl(final String parentDisplayName,
+                                           FileResolver fileResolver, DirectoryFileTreeFactory directoryFileTreeFactory) {
         final String displayName = String.format("%s JFlex source", parentDisplayName);
-        this.jflex = new DefaultSourceDirectorySet(displayName, fileResolver);
+        this.jflex = new DefaultSourceDirectorySet(displayName, fileResolver, directoryFileTreeFactory);
         this.jflex.getFilter().include("**/*.jflex");
     }