Skip to content
Permalink
Browse files

Upgrade build to Gradle 4.4

  • Loading branch information...
aalmiray committed Jan 18, 2018
1 parent 4c0d126 commit cc31ecc275ebc4957b03e80dd3096d5bd1a20ce8
Showing with 26 additions and 28 deletions.
  1. +11 −15 build.gradle
  2. +1 −1 gradle.properties
  3. BIN gradle/wrapper/gradle-wrapper.jar
  4. +1 −2 gradle/wrapper/gradle-wrapper.properties
  5. +13 −10 gradlew
@@ -22,25 +22,25 @@ buildscript {
}

dependencies {
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.6.3'
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.2'
classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0'
classpath 'org.kordamp.gradle:stats-gradle-plugin:0.2.0'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.13.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.1'
classpath 'net.nemerosa:versioning:2.4.0'
classpath 'org.kordamp.gradle:stats-gradle-plugin:0.2.2'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
classpath 'net.nemerosa:versioning:2.6.1'
classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1'
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.1'
}
}

plugins {
id "org.sonarqube" version "2.2"
}

if (project.hasProperty('sonarToken')) {
System.setProperty("sonar.login", project.getProperty("sonarToken"))
}

apply plugin: 'net.nemerosa.versioning'
apply plugin: 'org.sonarqube'
apply plugin: 'jacoco'
apply plugin: 'com.github.kt3k.coveralls'

Date buildTimeAndDate = new Date()
ext {
@@ -52,7 +52,6 @@ ext {
infoFilePatterns = '**/build.properties'
}


allprojects {
apply plugin: 'base'
apply plugin: 'idea'
@@ -67,9 +66,6 @@ allprojects {
}
}

apply plugin: 'jacoco'
apply plugin: 'com.github.kt3k.coveralls'

jacoco {
toolVersion = jacocoVersion
}
@@ -209,7 +205,7 @@ task jacocoRootMergeReport(dependsOn: jacocoRootMerge, type: JacocoReport) {
html.enabled = true
xml.enabled = true
csv.enabled = false
html.destination = "${buildDir}/reports/jacoco/test/html"
xml.destination = "${buildDir}/reports/jacoco/test/jacocoTestReport.xml"
html.destination = file("${buildDir}/reports/jacoco/test/html")
xml.destination = file("${buildDir}/reports/jacoco/test/jacocoTestReport.xml")
}
}
@@ -14,7 +14,7 @@ project_scm=https://github.com/canoo/dolphin-platform.git
deltaSpikeVersion=1.8.0
gsonVersion=2.8.2
guavaVersion=23.2-jre
jacocoVersion=0.7.9
jacocoVersion=0.8.0
jmockitVersion=1.35
kumulzeeVersion=2.0.0
rxjavaVersion=1.3.2
BIN +1.48 KB (100%) gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
@@ -1,6 +1,5 @@
#Fri Jan 13 12:59:18 CET 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip
23 gradlew
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/env sh

##############################################################################
##
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn ( ) {
warn () {
echo "$*"
}

die ( ) {
die () {
echo
echo "$*"
echo
@@ -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 cc31ecc

Please sign in to comment.
You can’t perform that action at this time.