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

Upgrade to gradle 5.4.1 #6007

Merged
merged 4 commits into from
Jun 27, 2019
Merged

Upgrade to gradle 5.4.1 #6007

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5c6c165
Upgrade to gradle 5.4.1
droazen May 9, 2019
3e71ca7
Fix dockertest.gradle
tomwhite Jun 24, 2019
9849163
fix warning and update wrapper itself
lbergelson Jun 25, 2019
9549e14
fix for uploading archives in 5.1+
lbergelson Jun 27, 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 @@ -14,7 +14,7 @@ plugins {
id 'signing'
id "jacoco"
id "de.undercouch.download" version "2.1.0" //used for downloading GSA lib
id "com.github.johnrengelman.shadow" version "1.2.3" //used to build the shadow and sparkJars
id "com.github.johnrengelman.shadow" version "5.0.0" //used to build the shadow and sparkJars
id "com.github.ben-manes.versions" version "0.12.0" //used for identifying dependencies that need updating
id 'com.palantir.git-version' version '0.5.1' //version helper
}
Expand Down Expand Up @@ -391,8 +391,8 @@ tasks.withType(Jar) {
}
}

task wrapper(type: Wrapper) {
gradleVersion = '3.1'
wrapper {
gradleVersion = '5.4.1'
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tomwhite You need to update dockertest.gradle as well. The needed change is in my PR here: https://github.com/broadinstitute/gatk/pull/5928/files#diff-20d46fff5956131a01d67961f7ec15c0

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @droazen, that fixes it. All the tests now pass. Are there any other changes needed before merging?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lbergelson suggested that we test the maven artifact uploading, as he suspects it might break in this PR. We'll test that soon and get back to you on the results.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I fixed a deprecation warning and rebuild the wrapper itself. Haven't changed the publishing over yet.


tasks.withType(ShadowJar) {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-3.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
2 changes: 1 addition & 1 deletion scripts/docker/dockertest.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ task testOnPackagedReleaseJar(type: Test){
}

classpath = files( gatkJar, testDependencyJar, testClassesJar)
testClassesDir = file(testClassesUnpacked)
testClassesDirs = files(testClassesUnpacked)
}

// Task intended to collect coverage data from testOnPackagedReleaseJar executed inside the docker image
Expand Down