fix: fix closure kotlin compatibility

Author: qoomon

README.md

@@ -61,6 +61,7 @@ You can configure the final version format for specific branches and tags separa
 
 ##### Groovy DSL `build.gradle` 
 ```groovy
+version = '0.0.0-SNAPSHOT'
 gitVersioning.apply {
   branch {
     pattern = 'master'
@@ -84,6 +85,10 @@ gitVersioning.apply {
 ```kotlin
 import me.qoomon.gradle.gitversioning.GitVersioningPluginExtension.VersionDescription
 import me.qoomon.gradle.gitversioning.GitVersioningPluginExtension.CommitVersionDescription
+
+//...
+
+version = "0.0.0-SNAPSHOT"
 gitVersioning.apply(closureOf<GitVersioningPluginConfig> {
         branch(closureOf<VersionDescription>{
             pattern = "master"

build.gradle

@@ -12,7 +12,7 @@ plugins {
 }
 
 group 'me.qoomon'
-version '2.1.0'
+version '2.1.1'
 
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8

src/main/java/me/qoomon/gradle/gitversioning/GitVersioningPluginConfig.java

@@ -15,7 +15,7 @@ public class GitVersioningPluginConfig {
 
     public boolean preferTags = false;
 
-    public void commit(Closure<CommitVersionDescription> closure) {
+    public void commit(Closure<?> closure) {
         CommitVersionDescription versionDescription = new CommitVersionDescription();
         configure(closure, versionDescription);
         this.commitVersionDescription = versionDescription;
@@ -25,7 +25,7 @@ public void branch(VersionDescription versionDescription) {
         this.branchVersionDescriptions.add(versionDescription);
     }
 
-    public void branch(Closure<VersionDescription> closure) {
+    public void branch(Closure<?> closure) {
         VersionDescription versionDescription = new VersionDescription();
         configure(closure, versionDescription);
         branch(versionDescription);
@@ -35,7 +35,7 @@ public void tag(VersionDescription versionDescription) {
         this.tagVersionDescriptions.add(versionDescription);
     }
 
-    public void tag(Closure<VersionDescription> closure) {
+    public void tag(Closure<?> closure) {
         VersionDescription versionDescription = new VersionDescription();
         configure(closure, versionDescription);
         tag(versionDescription);
@@ -51,7 +51,7 @@ public void property(PropertyDescription propertyDescription) {
             this.properties.add(propertyDescription);
         }
 
-        public void property(Closure<PropertyDescription> closure) {
+        public void property(Closure<?> closure) {
             PropertyDescription propertyDescription = new PropertyDescription();
             configure(closure, propertyDescription);
             property(propertyDescription);
@@ -67,7 +67,7 @@ public void property(PropertyDescription propertyDescription) {
             this.properties.add(propertyDescription);
         }
 
-        public void property(Closure<PropertyDescription> closure) {
+        public void property(Closure<?> closure) {
             PropertyDescription propertyDescription = new PropertyDescription();
             configure(closure, propertyDescription);
             property(propertyDescription);
@@ -83,7 +83,7 @@ public void value(ValueDescription valueDescription) {
             this.value = valueDescription;
         }
 
-        public void value(Closure<ValueDescription> closure) {
+        public void value(Closure<?> closure) {
             ValueDescription valueDescription = new ValueDescription();
             configure(closure, valueDescription);
             value(valueDescription);

src/main/java/me/qoomon/gradle/gitversioning/GitVersioningPluginExtension.java

@@ -90,7 +90,7 @@ public void apply(GitVersioningPluginConfig config) {
         });
     }
 
-    public void apply(Closure<GitVersioningPluginConfig> closure) {
+    public void apply(Closure<?> closure) {
         GitVersioningPluginConfig config = new GitVersioningPluginConfig();
         configure(closure, config);
         apply(config);

src/test/resources/testProjects/multiModuleProject/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'me.qoomon.git-versioning' version '2.0.0'
+    id 'me.qoomon.git-versioning' version '2.1.1'
 }
 
 group = 'me.qoomon'

src/test/resources/testProjects/standardProject/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'me.qoomon.git-versioning' version '2.0.0'
+    id 'me.qoomon.git-versioning' version '2.1.1'
 }
 
 group 'me.qoomon'

src/test/resources/testProjects/standardProjectKotlinDSL/.gitignore

@@ -0,0 +1,5 @@
+# Ignore Gradle project-specific cache directory
+.gradle
+
+# Ignore Gradle build output directory
+build

src/test/resources/testProjects/standardProjectKotlinDSL/build.gradle.kts

@@ -0,0 +1,14 @@
+import me.qoomon.gradle.gitversioning.GitVersioningPluginConfig
+import me.qoomon.gradle.gitversioning.GitVersioningPluginConfig.*
+
+plugins {
+    id("me.qoomon.git-versioning") version "2.1.1"
+}
+
+version = "0.0.0-SNAPSHOT"
+gitVersioning.apply(closureOf<GitVersioningPluginConfig> {
+    branch(closureOf<VersionDescription> {
+        pattern = "master"
+        versionFormat = "\${version}-matser-XXX"
+    })
+})

src/test/resources/testProjects/standardProjectKotlinDSL/gradle/wrapper/gradle-wrapper.jar

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

src/test/resources/testProjects/standardProjectKotlinDSL/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,183 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# 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='"-Xmx64m" "-Xms64m"'
+
+# 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
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+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" -a "$nonstop" = "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 or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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`
+    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=`expr $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
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+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"
+
+exec "$JAVACMD" "$@"