From 2df7f4f31c620de5a48879e56377f1e948da2207 Mon Sep 17 00:00:00 2001 From: Konstantin Krivopustov Date: Tue, 14 Nov 2017 17:29:52 +0400 Subject: [PATCH] Use platform 6.7.2, set version to 1.2.0 --- README.md | 1 + build.gradle | 6 +++--- gradle/wrapper/gradle-wrapper.jar | Bin 52928 -> 54212 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++-- gradlew | 19 +++++++++++-------- 5 files changed, 17 insertions(+), 13 deletions(-) mode change 100644 => 100755 gradlew diff --git a/README.md b/README.md index 7303f91..c70235c 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ Select a version of the add-on which is compatible with the platform version use | Platform Version | Add-on Version | | ---------------- | -------------- | +| 6.7.x | 1.2.0 | | 6.6.x | 1.1.0 | | 6.5.x | 1.0.0 | | 6.5.0.RC1 | 0.1.0 | diff --git a/build.gradle b/build.gradle index 6037c2d..dc7894c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { - ext.cubaVersion = '6.6.0' + ext.cubaVersion = '6.7.2' repositories { mavenLocal() maven { @@ -27,7 +27,7 @@ apply(plugin: 'cuba') cuba { artifact { group = 'com.haulmont.addon.zookeeper' - version = '1.1.0' + version = '1.2.0' isSnapshot = false } ide { @@ -82,5 +82,5 @@ configure(webModule) { } task wrapper(type: Wrapper) { - gradleVersion = '3.1' + gradleVersion = '3.4.1' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 6ffa237849ef3607e39c3b334a92a65367962071..601afec30254b7779fb3afa5b3e0fac0b8b6233a 100644 GIT binary patch delta 17822 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°N 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 delta 16464 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6a1af38..5c247cc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Mar 14 10:40:50 GMT+04:00 2017 +#Tue Nov 14 17:16:58 SAMT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 index 9aa616c..4453cce --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -154,16 +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 "$@") + +# 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 +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then cd "$(dirname "$0")" fi -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +exec "$JAVACMD" "$@"