[gradle-jflex-plugin] 04/14: Drop gradle-2.12.patch. Fixed upstream.

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch experimental
in repository gradle-jflex-plugin.

commit 0ef2c90af99dcacebd2212aa1d2bbbe0e9d9b5e6
Author: Markus Koschany <apo at debian.org>
Date:   Tue Jul 19 19:24:44 2016 +0200

    Drop gradle-2.12.patch. Fixed upstream.
---
 debian/patches/gradle-2.12.patch | 133 ---------------------------------------
 debian/patches/series            |   1 -
 2 files changed, 134 deletions(-)

diff --git a/debian/patches/gradle-2.12.patch b/debian/patches/gradle-2.12.patch
deleted file mode 100644
index 1a1be98..0000000
--- a/debian/patches/gradle-2.12.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Thu, 26 May 2016 19:01:31 +0200
-Subject: gradle 2.12
-
-Debian-Bug: https://bugs.debian.org/825368
-Origin: https://github.com/thomaslee/gradle-jflex-plugin/commit/1bbdf2d6dbf702944d11e24a859e0fe4f957032f
----
- gradle/wrapper/gradle-wrapper.properties            |  2 +-
- .../co/tomlee/gradle/plugins/jflex/JFlexPlugin.java | 10 ++++++++--
- .../co/tomlee/gradle/plugins/jflex/JFlexTask.java   | 21 ++++++++++++++++++++-
- .../jflex/JFlexVirtualSourceDirectoryImpl.java      |  8 ++++++--
- 4 files changed, 35 insertions(+), 6 deletions(-)
-
-diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
-index a6aec3e..714444b 100644
---- a/gradle/wrapper/gradle-wrapper.properties
-+++ b/gradle/wrapper/gradle-wrapper.properties
-@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
- distributionPath=wrapper/dists
- zipStoreBase=GRADLE_USER_HOME
- zipStorePath=wrapper/dists
--distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
-+distributionUrl=http\://services.gradle.org/distributions/gradle-2.12-bin.zip
-diff --git a/src/main/java/co/tomlee/gradle/plugins/jflex/JFlexPlugin.java b/src/main/java/co/tomlee/gradle/plugins/jflex/JFlexPlugin.java
-index 6a443d5..be24ba2 100644
---- a/src/main/java/co/tomlee/gradle/plugins/jflex/JFlexPlugin.java
-+++ b/src/main/java/co/tomlee/gradle/plugins/jflex/JFlexPlugin.java
-@@ -7,6 +7,7 @@ import org.gradle.api.artifacts.Configuration;
- import org.gradle.api.internal.file.FileResolver;
- import org.gradle.api.internal.plugins.DslObject;
- import org.gradle.api.internal.tasks.DefaultSourceSet;
-+import org.gradle.api.internal.file.collections.DirectoryFileTreeFactory;
- import org.gradle.api.plugins.JavaPlugin;
- import org.gradle.api.plugins.JavaPluginConvention;
- import org.gradle.api.tasks.SourceSet;
-@@ -17,10 +18,12 @@ import java.util.concurrent.Callable;
- 
- 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, final DirectoryFileTreeFactory directoryFileTreeFactory) {
-         this.fileResolver = fileResolver;
-+        this.directoryFileTreeFactory = directoryFileTreeFactory;
-     }
- 
-     @Override
-@@ -44,7 +47,10 @@ public final class JFlexPlugin implements Plugin<Project> {
-                 // 1. Add a new 'jflex' virtual directory mapping
-                 //
-                 final JFlexVirtualSourceDirectoryImpl jflexSourceSet =
--                    new JFlexVirtualSourceDirectoryImpl(((DefaultSourceSet) sourceSet).getDisplayName(), fileResolver);
-+                    new JFlexVirtualSourceDirectoryImpl(
-+                            ((DefaultSourceSet) sourceSet).getDisplayName(),
-+                            fileResolver,
-+                            directoryFileTreeFactory);
-                 new DslObject(sourceSet).getConvention().getPlugins().put("jflex", jflexSourceSet);
-                 final String srcDir = String.format("src/%s/jflex", sourceSet.getName());
-                 jflexSourceSet.getJflex().srcDir(srcDir);
-diff --git a/src/main/java/co/tomlee/gradle/plugins/jflex/JFlexTask.java b/src/main/java/co/tomlee/gradle/plugins/jflex/JFlexTask.java
-index f64d2be..0cf0d32 100644
---- a/src/main/java/co/tomlee/gradle/plugins/jflex/JFlexTask.java
-+++ b/src/main/java/co/tomlee/gradle/plugins/jflex/JFlexTask.java
-@@ -3,22 +3,41 @@ package co.tomlee.gradle.plugins.jflex;
- import groovy.lang.Closure;
- import org.gradle.api.file.FileCollection;
- import org.gradle.api.tasks.InputFiles;
-+import org.gradle.api.tasks.Input;
- import org.gradle.api.tasks.OutputDirectory;
- import org.gradle.api.tasks.SourceTask;
- import org.gradle.api.tasks.TaskAction;
-+import org.gradle.api.artifacts.ResolvedConfiguration;
-+import org.gradle.api.artifacts.ResolvedArtifact;
- import org.gradle.process.JavaExecSpec;
- 
- import java.io.File;
-+import java.util.Set;
- 
- public class JFlexTask extends SourceTask {
-     private FileCollection jflexClasspath;
-     private File outputDirectory;
- 
-+     private String mainClass = "JFlex.Main";
-+     public void setMainClass(final String mainClass) {
-+         this.mainClass = mainClass;
-+     }
-+
-+     public void mainClass(final String mainClass) {
-+         this.mainClass = mainClass;
-+     }
-+
-+     @Input
-+     public String getMainClass() {
-+         return mainClass;
-+     }
-+
-+
-     @TaskAction
-     public void generate() throws Exception {
-         getProject().javaexec(new Closure(this) {
-             public void doCall(JavaExecSpec javaExecSpec) {
--                javaExecSpec.setMain("JFlex.Main")
-+                javaExecSpec.setMain(mainClass)
-                         .setClasspath(getProject().getConfigurations().getByName("jflex"))
-                         .args("-d")
-                         .args(getOutputDirectory())
-diff --git a/src/main/java/co/tomlee/gradle/plugins/jflex/JFlexVirtualSourceDirectoryImpl.java b/src/main/java/co/tomlee/gradle/plugins/jflex/JFlexVirtualSourceDirectoryImpl.java
-index ff82a21..df15049 100644
---- a/src/main/java/co/tomlee/gradle/plugins/jflex/JFlexVirtualSourceDirectoryImpl.java
-+++ b/src/main/java/co/tomlee/gradle/plugins/jflex/JFlexVirtualSourceDirectoryImpl.java
-@@ -4,14 +4,18 @@ import groovy.lang.Closure;
- 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,
-+            final FileResolver fileResolver,
-+            final DirectoryFileTreeFactory directoryFileTreeFactory) {
-         final String displayName = String.format("%s JFle source", parentDisplayName);
--        this.jflex = new DefaultSourceDirectorySet(displayName, fileResolver);
-+        this.jflex = new DefaultSourceDirectorySet(displayName, fileResolver, directoryFileTreeFactory);
-         this.jflex.getFilter().include("**/*.l", "**/*.jflex");
-     }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 2e79cb9..5879227 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 build.patch
-gradle-2.12.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-jflex-plugin.git