Upgrade to Gradle 5.2 (#218)

salesforce · Feb 7, 2019 · b8328db · b8328db
1 parent a63559b
commit b8328db
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
 
 plugins {
     id 'com.commercehub.gradle.plugin.avro' version '0.8.0'
-    id 'org.scoverage' version '2.3.0'
+    id 'org.scoverage' version '2.5.0'
     id 'net.minecrell.licenser' version '0.4.1'
     id 'com.github.jk1.dependency-license-report' version '0.5.0'
     id 'com.github.johnrengelman.shadow' version '2.0.4'
@@ -270,9 +270,9 @@ configure(allProjs) {
 }
 
 wrapper {
-    gradleVersion = '4.10.2'
+    gradleVersion = '5.2'
     distributionType = Wrapper.DistributionType.BIN
-    distributionSha256Sum = 'b49c6da1b2cb67a0caf6c7480630b51c70a11ca2016ff2f555eaeda863143a29'
+    distributionSha256Sum = 'ff322863250159595e93b5a4d17a6f0d21c59a1a0497c1e1cf1d53826485503f'
 }
 
 task aggregateScoverage(type: org.scoverage.ScoverageAggregate) {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=b49c6da1b2cb67a0caf6c7480630b51c70a11ca2016ff2f555eaeda863143a29
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+distributionSha256Sum=ff322863250159595e93b5a4d17a6f0d21c59a1a0497c1e1cf1d53826485503f
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/helloworld/build.gradle b/helloworld/build.gradle
@@ -10,7 +10,7 @@ buildscript {
 plugins {
     id 'com.github.johnrengelman.shadow' version '2.0.4'
     id 'com.commercehub.gradle.plugin.avro' version '0.8.0'
-    id 'org.scoverage' version '2.3.0'
+    id 'org.scoverage' version '2.5.0'
 }
 repositories {
     jcenter()
@@ -150,9 +150,9 @@ sourceSets {
 }
 
 wrapper {
-    gradleVersion = '4.10.2'
+    gradleVersion = '5.2'
     distributionType = Wrapper.DistributionType.BIN
-    distributionSha256Sum = 'b49c6da1b2cb67a0caf6c7480630b51c70a11ca2016ff2f555eaeda863143a29'
+    distributionSha256Sum = 'ff322863250159595e93b5a4d17a6f0d21c59a1a0497c1e1cf1d53826485503f'
 }
 
 task runMain(type: JavaExec) {

diff --git a/helloworld/gradle/wrapper/gradle-wrapper.properties b/helloworld/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=b49c6da1b2cb67a0caf6c7480630b51c70a11ca2016ff2f555eaeda863143a29
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+distributionSha256Sum=ff322863250159595e93b5a4d17a6f0d21c59a1a0497c1e1cf1d53826485503f
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/helloworld/gradlew b/helloworld/gradlew
@@ -28,7 +28,8 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# the one below is good for using with newer Java versions that don't have the options gradle tries to pass.
+DEFAULT_JVM_OPTS="-XX:+IgnoreUnrecognizedVMOptions"
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

diff --git a/settings.gradle b/settings.gradle
@@ -1,5 +1,3 @@
-enableFeaturePreview('STABLE_PUBLISHING')
-
 rootProject.name='transmogrifai'
 
 include 'utils', 'features', 'readers', 'core', 'models', 'testkit', 'cli', 'templates:simple', 'local'
diff --git a/templates/simple/build.gradle.template b/templates/simple/build.gradle.template
@@ -142,7 +142,7 @@ task repl(type: JavaExec) {
 }
 
 wrapper {
-    gradleVersion = '4.10.2'
+    gradleVersion = '5.2'
     distributionType = Wrapper.DistributionType.BIN
-    distributionSha256Sum = 'b49c6da1b2cb67a0caf6c7480630b51c70a11ca2016ff2f555eaeda863143a29'
+    distributionSha256Sum = 'ff322863250159595e93b5a4d17a6f0d21c59a1a0497c1e1cf1d53826485503f'
 }
diff --git a/templates/simple/gradle/wrapper/gradle-wrapper.properties b/templates/simple/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=b49c6da1b2cb67a0caf6c7480630b51c70a11ca2016ff2f555eaeda863143a29
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+distributionSha256Sum=ff322863250159595e93b5a4d17a6f0d21c59a1a0497c1e1cf1d53826485503f
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/templates/simple/gradlew b/templates/simple/gradlew
@@ -28,7 +28,8 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# the one below is good for using with newer Java versions that don't have the options gradle tries to pass.
+DEFAULT_JVM_OPTS="-XX:+IgnoreUnrecognizedVMOptions"
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"