From bd7d83accf2a382c6e5cced19adc44e1652089b1 Mon Sep 17 00:00:00 2001 From: Pitt Date: Thu, 27 Sep 2018 20:45:10 +0200 Subject: [PATCH] Travis+gradle: add openjdk8/9; use travis (build+commit) to change kSAR version (#157) * update gradle to 4.10.2 * add openjdk8/9; adjust kSAR Version with build_commit version (first try) * adjust - sed extended regex; show gradle.properties before and after change --- .travis.yml | 10 ++++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 04c99929..fbeddaee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,17 +15,19 @@ cache: - $HOME/.gradle/wrapper before_install: -- echo "[INFO] BUILD_COMMIT> $BUILD_COMMIT" + - cat gradle.properties + - echo "[INFO] BUILD_COMMIT> $BUILD_COMMIT" + - sed -i -r "/version/s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)/\1-$BUILD_COMMIT/g" gradle.properties + - cat gradle.properties script: ./gradlew check shadowJar -after_success: -- ls -lR build/ - matrix: include: - jdk: oraclejdk8 - jdk: oraclejdk9 + - jdk: openjdk8 + - jdk: openjdk9 if: tag IS blank deploy: diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 82194214..eea6f1e9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip