Skip to content

Commit

Permalink
Update Gradle to 5.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
droberts2013 committed Dec 19, 2019
1 parent 888e938 commit dff64fe
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id "com.github.hierynomus.license" version "0.14.0"
id "com.xebialabs.xldp" version "1.0.5"
id "com.xebialabs.xl.docker" version "1.1.0"
id "nebula.release" version "6.0.0"
id "nebula.release" version "11.0.0"
}

xlDocker {
Expand Down
3 changes: 3 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#Wed May 02 14:39:33 CEST 2018
languageLevel=1.8
xlPluginsPluginVersion=1.3.5
34 changes: 34 additions & 0 deletions gradle/buildViaTravis.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#!/bin/bash
# This script will build the project.

SWITCHES="--info --stacktrace"

GRADLE_VERSION=$(./gradlew -version | grep Gradle | cut -d ' ' -f 2)

if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]"
./gradlew clean build $SWITCHES
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ]; then
echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']'
./gradlew -Prelease.travisci=true clean snapshot $SWITCHES
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then
echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG']'
case "$TRAVIS_TAG" in
*-rc\.*)
./gradlew -Prelease.travisci=true -Prelease.useLastTag=true clean candidate $SWITCHES
;;
*)
./gradlew -Prelease.travisci=true -Prelease.useLastTag=true clean final $SWITCHES
;;
esac
else
echo -e 'WARN: Should not be here => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG'] Pull Request ['$TRAVIS_PULL_REQUEST']'
./gradlew clean build $SWITCHES
fi

EXIT=$?

rm -f "$HOME/.gradle/caches/modules-2/modules-2.lock"
rm -rf "$HOME/.gradle/caches/$GRADLE_VERSION/plugin-resolution"

exit $EXIT
8 changes: 8 additions & 0 deletions gradle/dependencies.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
dependencyManagement {
versions {
docBaseStyleVersion="3.0.3"
xlDeployVersion="9.0.0-alpha.78"
licenseDatabaseVersion="1.2.45"
xlPlatformVersion="2019.2.0-alpha.75"
}
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip

0 comments on commit dff64fe

Please sign in to comment.