Up to groovy 2.5 and latest Gradle

build.gradle

@@ -1,10 +1,12 @@
-apply plugin: 'groovy'
-apply plugin: 'idea'
-apply plugin: 'maven'
-apply plugin: 'signing'
+plugins {
+  id 'groovy'
+  id 'idea'
+  id 'maven'
+  id 'signing'
+}
 
-sourceCompatibility=1.6
-targetCompatibility=1.6
+sourceCompatibility=1.7
+targetCompatibility=1.7
 
 version = '0.7.0'
 
@@ -13,37 +15,39 @@ repositories {
 }
 
 dependencies {
-  compile      'org.codehaus.groovy:groovy-all:2.2.1'
+  compile      'org.codehaus.groovy:groovy-all:2.5.0'
   testCompile  'junit:junit:4.10'
   testCompile( 'org.apache.ant:ant-junit:1.8.4' ) {
       exclude(group: 'junit', module: 'junit')
   }
-  testCompile 'org.spockframework:spock-core:0.7-groovy-2.0'
+  testCompile 'org.spockframework:spock-core:1.1-groovy-2.4'
   testCompile fileTree( dir:'build/libs/', includes:[ "groovy-common-extensions-${version}.jar".toString() ] )
   testRuntime 'net.sourceforge.nekohtml:nekohtml:1.9.14'
 }
 
 group = 'com.bloidonia'
 
-task generateModule << {
-  def extensionFiles = sourceSets.main.groovy.with { g ->
-    g.findAll {
-      it.parentFile.name == 'extensions' && it.name.endsWith( 'groovy' )
-    }.collect {
-      it.toString().replaceAll( '\\' + File.separator, '.' )
-    }.collect {
-      it - ( g.srcDirs as List )[0].toString().replaceAll( '\\' + File.separator, '.' )
-    }.collect {
-      it[ 1..-8 ]
-    }.join( ',' )
-  }
-  new File( "$buildDir/classes/main/META-INF/services" ).with { f ->
-    f.mkdirs()
-    new File( f, 'org.codehaus.groovy.runtime.ExtensionModule' ).withWriter { w ->
-      w.writeLine 'moduleName=groovy-common-extensions'
-      w.writeLine "moduleVersion=$version"
-      w.writeLine "extensionClasses=$extensionFiles"
-      w.writeLine 'staticExtensionClasses='
+task generateModule() {
+  doLast {
+    def extensionFiles = sourceSets.main.groovy.with { g ->
+      g.findAll {
+        it.parentFile.name == 'extensions' && it.name.endsWith( 'groovy' )
+      }.collect {
+        it.toString().replaceAll( '\\' + File.separator, '.' )
+      }.collect {
+        it - ( g.srcDirs as List )[0].toString().replaceAll( '\\' + File.separator, '.' )
+      }.collect {
+        it[ 1..-8 ]
+      }.join( ',' )
+    }
+    new File( "$buildDir/resources/main/META-INF/services" ).with { f ->
+      f.mkdirs()
+      new File( f, 'org.codehaus.groovy.runtime.ExtensionModule' ).withWriter { w ->
+        w.writeLine 'moduleName=groovy-common-extensions'
+        w.writeLine "moduleVersion=$version"
+        w.writeLine "extensionClasses=$extensionFiles"
+        w.writeLine 'staticExtensionClasses='
+      }
     }
   }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Mon Nov 25 10:29:27 GMT 2013
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-bin.zip

gradlew

@@ -1,25 +1,43 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
 ##  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=""
+# 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\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=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.
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@ if $cygwin ; then
     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=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -8,14 +8,14 @@
 @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 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=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows 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.
@@ -60,11 +59,6 @@ set _SKIP=2
 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

src/main/groovy/com/bloidonia/groovy/extensions/NumericExtensionMethods.groovy

@@ -65,8 +65,9 @@ class NumericExtensionMethods {
    * @return       The Range with its upper and lower bounds clamped to those of the clamp range
    */
   static <T extends Comparable> Range<T> clamp( Range<T> self, Range<T> range ) {
-    self.class.newInstance( clamp( self.from, range.from, range.to ),
-                            clamp( self.to, range.from, range.to ),
-                            self.reverse )
+    T from = clamp( self.from, range.from, range.to )
+    T to = clamp( self.to, range.from, range.to )
+    self.class.newInstance( self.reverse ? to : from,
+                            self.reverse ? from : to )
   }
 }

src/test/groovy/tests/ClampTests.groovy

@@ -19,7 +19,7 @@ package tests
 import spock.lang.Specification
 import spock.lang.Unroll
 
-public class ClampTests extends Specification {
+class ClampTests extends Specification {
   @Unroll( 'Clamping #input between #lower and #upper should result in #expected' )
   def 'check clamping'() {
     expect: