diff --git a/.gitignore b/.gitignore index b66ad7e..068863f 100755 --- 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 index cd2c50a..853a1cd 100755 --- 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 index 7e79700..d58c20c 100755 --- 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 deleted file mode 100755 index dc178a1..0000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Tue Jan 13 16:30:45 CET 2015 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip diff --git a/gradlew b/gradlew deleted file mode 100755 index 91a7e26..0000000 --- a/gradlew +++ /dev/null @@ -1,164 +0,0 @@ -#!/usr/bin/env bash - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn ( ) { - echo "$*" -} - -die ( ) { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; -esac - -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100755 index aec9973..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,90 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/src/main/java/org/xbib/gradle/plugin/jflex/JFlexPlugin.java b/src/main/java/org/xbib/gradle/plugin/jflex/JFlexPlugin.java index 7dbb01e..d0d2fe7 100755 --- 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 { 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 index de55645..16b12d8 100755 --- 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"); }