Skip to content

Commit

Permalink
Updating gradle to 4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
fastier-li committed Jun 26, 2017
1 parent 208356f commit 558e67a
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 12 deletions.
1 change: 0 additions & 1 deletion build-scripts/integration-test.gradle
Expand Up @@ -41,7 +41,6 @@ configurations {
}

task integTest(type: Test) {
testClassesDir = sourceSets.integTest.output.classesDir
classpath = sourceSets.integTest.runtimeClasspath
// force always rerunning tests
outputs.upToDateWhen { false }
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Expand Up @@ -30,7 +30,7 @@ buildscript {
classpath 'com.commercehub.gradle.plugin:gradle-avro-plugin:0.7.0'
classpath 'org.github.ngbinh.scalastyle:gradle-scalastyle-plugin_2.10:0.8.2'
// shadow allows us to build fat/shadow jars. See doc at: http://imperceptiblethoughts.com/shadow/.
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.0'
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.1'
}
}

Expand Down Expand Up @@ -186,5 +186,5 @@ subprojects {

// Task to generate the Gradle wrapper scripts
task wrapper(type: Wrapper) {
gradleVersion = '3.4'
gradleVersion = '4.0'
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Sat Apr 08 09:40:39 PDT 2017
#Mon Jun 26 10:23:29 PDT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip
6 changes: 3 additions & 3 deletions gradlew
Expand Up @@ -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
Expand Down Expand Up @@ -155,7 +155,7 @@ if $cygwin ; then
fi

# Escape application args
save ( ) {
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
Expand Down
4 changes: 0 additions & 4 deletions settings.gradle
Expand Up @@ -14,10 +14,6 @@
*/
apply plugin: 'scala-cross-build'

/**
* 2.10.4 compiles with gradle 3.4
* 2.11.8 compiles with gradle 3.4
*/
scalaCrossBuild {

defaultScalaVersion '2.10.4'
Expand Down

0 comments on commit 558e67a

Please sign in to comment.