diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
new file mode 100644
index 0000000..f1ac387
--- /dev/null
+++ b/.github/workflows/gradle.yml
@@ -0,0 +1,19 @@
+name: Java CI with Gradle
+
+on: [push, pull_request, workflow_dispatch]
+
+jobs:
+ build:
+
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v2
+ - name: Set up JDK 1.8
+ uses: actions/setup-java@v1
+ with:
+ java-version: 1.8
+ - name: Grant execute permission for gradlew
+ run: chmod +x gradlew
+ - name: Test with Gradle
+ run: ./gradlew check
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index a4f170c..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..4c5218b
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 49fa5a9..5d51035 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,18 +5,18 @@ plugins {
`maven-publish`
jacoco
kotlin("jvm") version "1.3.72"
- id("com.github.ben-manes.versions") version "0.29.0"
+ id("com.github.ben-manes.versions") version "0.36.0"
id("com.gradle.plugin-publish") version "0.12.0"
- id("io.gitlab.arturbosch.detekt") version "1.10.0"
+ id("io.gitlab.arturbosch.detekt") version "1.14.2"
id("org.gradle.kotlin.kotlin-dsl") version "1.3.6"
id("org.sonarqube") version "3.0"
}
-version = "1.0.4"
+version = "1.0.5-beta"
group = "net.thauvin.erik.gradle"
object VersionInfo {
- const val spek = "2.0.12"
+ const val spek = "2.0.13"
}
val versions: VersionInfo by extra { VersionInfo }
diff --git a/examples/java/build.gradle b/examples/java/build.gradle
index 2c2a467..e841b08 100644
--- a/examples/java/build.gradle
+++ b/examples/java/build.gradle
@@ -2,7 +2,7 @@ plugins {
id 'java'
id 'application'
id 'net.thauvin.erik.gradle.semver' version '1.0.4'
- id 'com.github.ben-manes.versions' version '0.28.0'
+ id 'com.github.ben-manes.versions' version '0.36.0'
}
// ./gradlew
@@ -10,14 +10,14 @@ plugins {
// ./gradlew incrementMinor run
// ./gradlew incrementMajor run
// ./gradlew incrementBuildMeta run
+// ./gradlew echoVersion
-mainClassName = 'App'
defaultTasks 'run'
dependencies {
- testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0'
- testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.6.0'
+ testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
+ testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
}
repositories {
@@ -28,6 +28,13 @@ test {
useJUnitPlatform()
}
+application {
+ mainClassName = 'App'
+// project.afterEvaluate {
+// println "Version: $version"
+// }
+}
+
semver {
// properties = "example.properties"
// keysPrefix = "example."
@@ -44,9 +51,14 @@ incrementBuildMeta {
run {
doFirst {
+// println "Version: ${-> version}"
println "Version: $version"
}
// args = ['example.properties']
args = ['version.properties']
}
+
+task echoVersion(type:Exec) {
+ commandLine 'echo', "${-> project.version}"
+}
diff --git a/examples/java/gradle/wrapper/gradle-wrapper.jar b/examples/java/gradle/wrapper/gradle-wrapper.jar
index f3d88b1..e708b1c 100644
Binary files a/examples/java/gradle/wrapper/gradle-wrapper.jar and b/examples/java/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/examples/java/gradle/wrapper/gradle-wrapper.properties b/examples/java/gradle/wrapper/gradle-wrapper.properties
index a2bf131..be52383 100644
--- a/examples/java/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/java/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/examples/java/gradlew b/examples/java/gradlew
index 2fe81a7..4f906e0 100755
--- a/examples/java/gradlew
+++ b/examples/java/gradlew
@@ -82,6 +82,7 @@ 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
@@ -129,6 +130,7 @@ fi
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
diff --git a/examples/java/gradlew.bat b/examples/java/gradlew.bat
index 62bd9b9..107acd3 100644
--- a/examples/java/gradlew.bat
+++ b/examples/java/gradlew.bat
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,28 +64,14 @@ echo location of your Java installation.
goto fail
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_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=%*
-
: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%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
diff --git a/examples/java/version.properties b/examples/java/version.properties
index 946ba36..f5bf6aa 100644
--- a/examples/java/version.properties
+++ b/examples/java/version.properties
@@ -1,8 +1,8 @@
#Generated by the Semver Plugin for Gradle
-#Wed Jul 24 21:04:08 PDT 2019
-version.buildmeta=20190724210408
+#Fri Sep 25 17:38:33 PDT 2020
+version.buildmeta=20200925173833
version.major=1
version.minor=0
version.patch=0
version.prerelease=
-version.semver=1.0.0+20190724210408
+version.semver=1.0.0+20200925173833
diff --git a/examples/kotlin/build.gradle.kts b/examples/kotlin/build.gradle.kts
index 574699d..d54e882 100644
--- a/examples/kotlin/build.gradle.kts
+++ b/examples/kotlin/build.gradle.kts
@@ -4,10 +4,10 @@ import java.time.LocalDateTime
import java.time.format.DateTimeFormatter
plugins {
- kotlin("jvm").version("1.3.61")
+ kotlin("jvm").version("1.4.10")
application
id("net.thauvin.erik.gradle.semver").version("1.0.4")
- id("com.github.ben-manes.versions").version("0.28.0")
+ id("com.github.ben-manes.versions").version("0.36.0")
}
// ./gradlew
@@ -20,7 +20,7 @@ defaultTasks(ApplicationPlugin.TASK_RUN_NAME)
dependencies {
implementation(kotlin("stdlib"))
- testImplementation("org.testng:testng:7.2.0")
+ testImplementation("org.testng:testng:7.3.0")
}
repositories {
@@ -29,6 +29,9 @@ repositories {
application {
mainClassName = "com.example.MainKt"
+// project.afterEvaluate {
+// println("Version: $version")
+// }
}
semver {
diff --git a/examples/kotlin/gradle/wrapper/gradle-wrapper.jar b/examples/kotlin/gradle/wrapper/gradle-wrapper.jar
index f3d88b1..e708b1c 100644
Binary files a/examples/kotlin/gradle/wrapper/gradle-wrapper.jar and b/examples/kotlin/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/examples/kotlin/gradle/wrapper/gradle-wrapper.properties b/examples/kotlin/gradle/wrapper/gradle-wrapper.properties
index a2bf131..be52383 100644
--- a/examples/kotlin/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/kotlin/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/examples/kotlin/gradlew b/examples/kotlin/gradlew
index 2fe81a7..4f906e0 100755
--- a/examples/kotlin/gradlew
+++ b/examples/kotlin/gradlew
@@ -82,6 +82,7 @@ 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
@@ -129,6 +130,7 @@ fi
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
diff --git a/examples/kotlin/gradlew.bat b/examples/kotlin/gradlew.bat
index 62bd9b9..107acd3 100644
--- a/examples/kotlin/gradlew.bat
+++ b/examples/kotlin/gradlew.bat
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,28 +64,14 @@ echo location of your Java installation.
goto fail
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_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=%*
-
: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%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
diff --git a/examples/kotlin/version.properties b/examples/kotlin/version.properties
index 568c94e..98e937a 100644
--- a/examples/kotlin/version.properties
+++ b/examples/kotlin/version.properties
@@ -1,8 +1,8 @@
#Generated by the Semver Plugin for Gradle
-#Wed Jul 24 21:05:40 PDT 2019
-version.buildmeta=20190724210540
+#Mon Nov 09 21:24:16 PST 2020
+version.buildmeta=20201109212416
version.major=1
version.minor=2
version.patch=4
version.prerelease=beta
-version.semver=1.2.4-beta+20190724210540
+version.semver=1.2.4-beta+20201109212416
diff --git a/examples/test/build.gradle b/examples/test/build.gradle
index 59a6637..9813e76 100644
--- a/examples/test/build.gradle
+++ b/examples/test/build.gradle
@@ -4,7 +4,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath "net.thauvin.erik.gradle:semver:1.0.4"
+ classpath "net.thauvin.erik.gradle:semver:1.0.5-beta"
}
}
@@ -14,7 +14,7 @@ apply plugin: 'net.thauvin.erik.gradle.semver'
mainClassName = 'App'
-version = 1.0
+//version = 1.0
def f = new File("version.properties")
@@ -30,6 +30,13 @@ repositories {
jcenter()
}
+application {
+ println(project.version)
+ project.afterEvaluate {
+ println(project.version)
+ }
+}
+
incrementBuildMeta {
doFirst {
@@ -45,6 +52,10 @@ run {
}
}
+task echoVersion(type:Exec) {
+ commandLine "echo", "${-> version}"
+}
+
semver {
properties = "${f.name}"
keysPrefix = f.name.substring(0, f.name.indexOf(".") + 1)
diff --git a/examples/test/src/test/java/AppTest.java b/examples/test/src/test/java/AppTest.java
deleted file mode 100644
index 7bd2702..0000000
--- a/examples/test/src/test/java/AppTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * This Java source file was generated by the Gradle 'init' task.
- */
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class AppTest {
- @Test
- public void testAppHasAGreeting() {
- App classUnderTest = new App();
- assertNotNull("app should have a greeting", classUnderTest.getGreeting());
- }
-}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 62d4c05..e708b1c 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bb8b2fc..be52383 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index fbd7c51..4f906e0 100755
--- a/gradlew
+++ b/gradlew
@@ -130,7 +130,7 @@ fi
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
diff --git a/gradlew.bat b/gradlew.bat
index 5093609..107acd3 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,21 +64,6 @@ echo location of your Java installation.
goto fail
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_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=%*
-
:execute
@rem Setup the command line
@@ -86,7 +71,7 @@ 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%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell