Skip to content

Commit

Permalink
Use platform 6.7.2, set version to 1.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
knstvk committed Nov 14, 2017
1 parent d5946e8 commit 2df7f4f
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 13 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

buildscript {
ext.cubaVersion = '6.6.0'
ext.cubaVersion = '6.7.2'
repositories {
mavenLocal()
maven {
Expand All @@ -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 {
Expand Down Expand Up @@ -82,5 +82,5 @@ configure(webModule) {
}

task wrapper(type: Wrapper) {
gradleVersion = '3.1'
gradleVersion = '3.4.1'
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
19 changes: 11 additions & 8 deletions gradlew
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/env sh

##############################################################################
##
Expand Down Expand Up @@ -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" "$@"

0 comments on commit 2df7f4f

Please sign in to comment.