Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to Gradle 5.2 #218

Merged
merged 2 commits into from
Feb 7, 2019
Merged

Upgrade to Gradle 5.2 #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0eaf5bc
Upgrade to Gradle 5.2
tovbinm Feb 7, 2019
25a0203
Merge branch 'master' into mt/gradle-5.2
Jauntbox Feb 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=b49c6da1b2cb67a0caf6c7480630b51c70a11ca2016ff2f555eaeda863143a29
distributionUrl=https\:https://services.gradle.org/distributions/gradle-4.10.2-bin.zip
distributionSha256Sum=ff322863250159595e93b5a4d17a6f0d21c59a1a0497c1e1cf1d53826485503f
distributionUrl=https\:https://services.gradle.org/distributions/gradle-5.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions helloworld/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions helloworld/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=b49c6da1b2cb67a0caf6c7480630b51c70a11ca2016ff2f555eaeda863143a29
distributionUrl=https\:https://services.gradle.org/distributions/gradle-4.10.2-bin.zip
distributionSha256Sum=ff322863250159595e93b5a4d17a6f0d21c59a1a0497c1e1cf1d53826485503f
distributionUrl=https\:https://services.gradle.org/distributions/gradle-5.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
3 changes: 2 additions & 1 deletion helloworld/gradlew
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
enableFeaturePreview('STABLE_PUBLISHING')

rootProject.name='transmogrifai'

include 'utils', 'features', 'readers', 'core', 'models', 'testkit', 'cli', 'templates:simple', 'local'
4 changes: 2 additions & 2 deletions templates/simple/build.gradle.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ task repl(type: JavaExec) {
}

wrapper {
gradleVersion = '4.10.2'
gradleVersion = '5.2'
distributionType = Wrapper.DistributionType.BIN
distributionSha256Sum = 'b49c6da1b2cb67a0caf6c7480630b51c70a11ca2016ff2f555eaeda863143a29'
distributionSha256Sum = 'ff322863250159595e93b5a4d17a6f0d21c59a1a0497c1e1cf1d53826485503f'
}
4 changes: 2 additions & 2 deletions templates/simple/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=b49c6da1b2cb67a0caf6c7480630b51c70a11ca2016ff2f555eaeda863143a29
distributionUrl=https\:https://services.gradle.org/distributions/gradle-4.10.2-bin.zip
distributionSha256Sum=ff322863250159595e93b5a4d17a6f0d21c59a1a0497c1e1cf1d53826485503f
distributionUrl=https\:https://services.gradle.org/distributions/gradle-5.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
3 changes: 2 additions & 1 deletion templates/simple/gradlew
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down