Updated for Kobalt 1.0.x

This commit is contained in:
Erik C. Thauvin 2017-03-24 15:32:40 -07:00
parent c4baf11bcd
commit 210ff2415a
10 changed files with 54 additions and 51 deletions

View file

@ -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 {

View file

@ -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")

View file

@ -1 +1 @@
kobalt.version=0.882
kobalt.version=1.0.23

Binary file not shown.

View file

@ -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

51
gradlew vendored
View file

@ -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 "$@"

14
gradlew.bat vendored
View file

@ -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

View file

@ -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
}
}
}

View file

@ -1 +1 @@
kobalt.version=0.889
kobalt.version=1.0.23

View file

@ -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=
version.prerelease=