From 210ff2415aeb1f1da72687fd0095c481ffb339a7 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 24 Mar 2017 15:32:40 -0700 Subject: [PATCH] Updated for Kobalt 1.0.x --- build.gradle | 2 +- example/kobalt/src/Build.kt | 5 +- .../kobalt/wrapper/kobalt-wrapper.properties | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 53636 -> 52928 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 51 ++++++++++-------- gradlew.bat | 14 ++--- kobalt/src/Build.kt | 21 ++++---- kobalt/wrapper/kobalt-wrapper.properties | 2 +- version.properties | 4 +- 10 files changed, 54 insertions(+), 51 deletions(-) diff --git a/build.gradle b/build.gradle index b807226..dfba62e 100644 --- a/build.gradle +++ b/build.gradle @@ -60,7 +60,7 @@ repositories { dependencies { compile 'org.apache.velocity:velocity:1.7' - testCompile 'org.testng:testng:6.9.12' + testCompile 'org.testng:testng:6.9.13.6' } bintray { diff --git a/example/kobalt/src/Build.kt b/example/kobalt/src/Build.kt index 47b6356..477634c 100644 --- a/example/kobalt/src/Build.kt +++ b/example/kobalt/src/Build.kt @@ -1,14 +1,11 @@ -import com.beust.kobalt.localMaven import com.beust.kobalt.plugin.application.application import com.beust.kobalt.plugin.apt.apt import com.beust.kobalt.plugin.packaging.assemble import com.beust.kobalt.plugin.packaging.install import com.beust.kobalt.project -import com.beust.kobalt.repos import java.io.FileInputStream import java.util.* -val repos = repos(localMaven()) fun StringBuilder.prepend(s: String): StringBuilder { if (this.length > 0) { @@ -39,7 +36,7 @@ val example = project { version = versionFor() val mainClassName = "net.thauvin.erik.semver.example.Example" - val processorJar = "net.thauvin.erik:semver:0.9.7" + val processorJar = "net.thauvin.erik:semver:" sourceDirectories { path("src/main/java") diff --git a/example/kobalt/wrapper/kobalt-wrapper.properties b/example/kobalt/wrapper/kobalt-wrapper.properties index f314d6a..8d6fc4f 100644 --- a/example/kobalt/wrapper/kobalt-wrapper.properties +++ b/example/kobalt/wrapper/kobalt-wrapper.properties @@ -1 +1 @@ -kobalt.version=0.882 \ No newline at end of file +kobalt.version=1.0.23 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 13372aef5e24af05341d49695ee84e5f9b594659..6ffa237849ef3607e39c3b334a92a65367962071 100644 GIT binary patch delta 13232 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%0DBjI}u&-Na`}PVPI&_ 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 D(4}09 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5b19cb3..726785e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Jan 16 15:10:14 PST 2016 +#Thu Oct 06 11:49:56 PDT 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip diff --git a/gradlew b/gradlew index 9d82f78..9aa616c 100644 --- a/gradlew +++ b/gradlew @@ -6,12 +6,30 @@ ## ############################################################################## -# 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" @@ -30,6 +48,7 @@ die ( ) { cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,26 +59,11 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# 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 - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -85,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 @@ -157,4 +161,9 @@ function splitJvmOpts() { eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +# 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 "$@" diff --git a/gradlew.bat b/gradlew.bat index 8a0b282..f955316 100644 --- a/gradlew.bat +++ b/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 diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index 84e6fe3..3617ef4 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -1,3 +1,4 @@ +import com.beust.kobalt.file import com.beust.kobalt.localMaven import com.beust.kobalt.plugin.application.application import com.beust.kobalt.plugin.apt.apt @@ -11,9 +12,9 @@ import java.io.FileInputStream import java.util.* import net.thauvin.erik.kobalt.plugin.exec.* -//val repos = repos(localMaven()) - -val pl = plugins("net.thauvin.erik:kobalt-exec:0.6.2") +val bs = buildScript { + plugins("net.thauvin.erik:kobalt-exec:") +} fun StringBuilder.prepend(s: String): StringBuilder { if (this.length > 0) { @@ -57,7 +58,7 @@ val semver = project { } dependenciesTest { - compile("org.testng:testng:6.9.12") + compile("org.testng:testng:6.9.13.6") } javaCompiler { @@ -87,9 +88,11 @@ val example = project { name = "example" directory = "example" version = versionFor(directory) - + + val aptVer = versionFor() val mainClassName = "net.thauvin.erik.semver.example.Example" - val processorJar = "net.thauvin.erik:semver:0.9.7" + //val processorJar = "net.thauvin.erik:semver:" + val processorJar = file("deploy/semver-" + versionFor() + ".jar") sourceDirectories { path("src/main/java") @@ -101,7 +104,7 @@ val example = project { dependencies { apt(processorJar) - compile(processorJar) + compile("org.apache.velocity:velocity:1.7", processorJar) } dependenciesTest { @@ -109,7 +112,7 @@ val example = project { } install { - libDir = "deploy" + libDir = "example/deploy" } assemble { @@ -123,4 +126,4 @@ val example = project { application { mainClass = mainClassName } -} \ No newline at end of file +} diff --git a/kobalt/wrapper/kobalt-wrapper.properties b/kobalt/wrapper/kobalt-wrapper.properties index 164fe5e..8d6fc4f 100644 --- a/kobalt/wrapper/kobalt-wrapper.properties +++ b/kobalt/wrapper/kobalt-wrapper.properties @@ -1 +1 @@ -kobalt.version=0.889 \ No newline at end of file +kobalt.version=1.0.23 \ No newline at end of file diff --git a/version.properties b/version.properties index 9128115..0011a7e 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ -#Thu, 28 Jan 2016 17:33:17 -0800 +#Thu, 06 Oct 2016 11:49:46 -0700 version.major=0 version.minor=9 version.patch=7 version.buildmeta= -version.prerelease= \ No newline at end of file +version.prerelease=