diff --git a/build.gradle b/build.gradle index c9ec55e..e541eaa 100644 --- a/build.gradle +++ b/build.gradle @@ -6,13 +6,13 @@ buildscript { } dependencies { - classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.6.3' + classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.7.1' classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.2' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' classpath 'org.ajoberstar:gradle-git:1.3.2' classpath 'org.kordamp.gradle:stats-gradle-plugin:0.2.0' classpath 'com.github.ben-manes:gradle-versions-plugin:0.13.0' - classpath 'net.nemerosa:versioning:2.5.0' + classpath 'net.nemerosa:versioning:2.5.1' } } diff --git a/gradle.properties b/gradle.properties index ff07b55..4da3c19 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=0.3.0-SNAPSHOT +version=0.2.1 group=org.kordamp.bootstrapfx sourceCompatibility=1.8 targetCompatibility=1.8 diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle index f372ec6..acf4f4c 100644 --- a/gradle/publishing.gradle +++ b/gradle/publishing.gradle @@ -15,9 +15,15 @@ jar { 'Implementation-Version': project.version, ) } + metaInf { + from(rootProject.files('.')) { + include 'LICENSE*' + } + } } def pomConfig = { + packaging 'jar' name project.name description project.project_description url project.project_url @@ -56,6 +62,7 @@ publishing { pom.withXml { asNode().children().last() + pomConfig + asNode().appendNode('description', project.project_description) } } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d3b8398..51288f9 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 bee6562..b9404db 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jul 01 14:10:28 CEST 2016 +#Thu Dec 29 00:27:21 CET 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip diff --git a/gradlew b/gradlew index 27309d9..4453cce 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -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 "$@") -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# 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" "$@" diff --git a/gradlew.bat b/gradlew.bat index 832fdb6..f955316 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -49,7 +49,6 @@ goto fail @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/subprojects/bootstrapfx-core/bootstrapfx-core.gradle b/subprojects/bootstrapfx-core/bootstrapfx-core.gradle index e462d28..92fcdd7 100644 --- a/subprojects/bootstrapfx-core/bootstrapfx-core.gradle +++ b/subprojects/bootstrapfx-core/bootstrapfx-core.gradle @@ -22,8 +22,8 @@ task sourcesJar(type: Jar) { dependencies { // upgraded dependencies for compass-gradle - jrubyExec 'org.bouncycastle:bcprov-jdk15on:1.55' - jrubyExec 'org.jruby:jruby-complete:9.1.5.0' + jrubyExec 'org.bouncycastle:bcprov-jdk15on:1.56' + jrubyExec 'org.jruby:jruby-complete:9.1.6.0' } javadoc { diff --git a/subprojects/sampler/sampler.gradle b/subprojects/sampler/sampler.gradle index 73ae942..753fae0 100644 --- a/subprojects/sampler/sampler.gradle +++ b/subprojects/sampler/sampler.gradle @@ -4,5 +4,5 @@ mainClassName = 'org.kordamp.bootstrapfx.Sampler' dependencies { compile project(':bootstrapfx-core') - compile 'org.fxmisc.richtext:richtextfx:0.7-M2' + compile 'org.fxmisc.richtext:richtextfx:0.7-M3' } \ No newline at end of file