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.

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

Upgraded Gradle and Groovy versions #521

Merged
merged 1 commit into from Sep 14, 2015

Conversation

paplorinc
Copy link
Contributor

Added distributionSha256Sum for verification of downloaded Gradle distributions

In case of wrong checksum the following error will be displayed
Expected checksum: '2ba0aaa11a3e96ec0af31d532d808e1f09cc6dcad0954e637902a1ab544b9e60'
Actual checksum: '<invalid SHA 256 checksum, which can be used for calculation of the next versions also>'

See: https://docs.gradle.org/current/userguide/gradle_wrapper.html#sec:verification

@@ -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-2.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip
Copy link
Member

Choose a reason for hiding this comment

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

While you are at it you can update the wrapper as well, since it supports sha256 based validation as of 2.5.
https://docs.gradle.org/current/userguide/gradle_wrapper.html

Copy link
Member

Choose a reason for hiding this comment

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

Regarding checksum validation and regenerated wrapper there is a known issue in 2,6 that have negative performance impact. It should be already fixed in 2.7-rc-1.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Final 2.7 will be out shortly, will push the rc-2 until then (which has the fix for the performance regression)

Copy link
Member

Choose a reason for hiding this comment

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

I see a change in gradle-wrapper.properties, but to get the new wrapper features (like checksum validation) it is required to regenerate wrapper jar (./gradlew wrapper).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, please see the latest patchset (https://github.com/spockframework/spock/pull/521/files)

Copy link
Member

Choose a reason for hiding this comment

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

You completely are right. I overlooked Binary file not shown on the diff list.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Could someone please retrigger the builds for my PRs, they seemed to have timed out :/

@paplorinc paplorinc changed the title Upgraded Gradle to 2.6 and Groovy to 2.4.4 Upgraded Gradle and Groovy versions Sep 10, 2015
@leonard84
Copy link
Member

@paplorinc Gradle 2.7 final was released today, could you please amend this commit with the new version, and also regenerate the wrapper with 2.7 final. Then, if no one objects and the builds are green, I'll merge it.

@paplorinc
Copy link
Contributor Author

Sure, will do

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-all.zip
Copy link
Member

Choose a reason for hiding this comment

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

I'm not seeing the sha256Sum here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done, please see the new commit message also

@paplorinc paplorinc force-pushed the GradleUpgrade branch 2 times, most recently from 248700a to 2401bb2 Compare September 14, 2015 20:57
Added `distributionSha256Sum` for verification of downloaded Gradle distributions

In case of wrong checksum the following error will be displayed
  Expected checksum: '2ba0aaa11a3e96ec0af31d532d808e1f09cc6dcad0954e637902a1ab544b9e60'
  Actual checksum: '<invalid SHA 256 checksum, which can be used for calculation of the next versions also>'

See: https://docs.gradle.org/current/userguide/gradle_wrapper.html#sec:verification
leonard84 added a commit that referenced this pull request Sep 14, 2015
Upgraded Gradle and Groovy versions
@leonard84 leonard84 merged commit 54484fe into spockframework:master Sep 14, 2015
@leonard84
Copy link
Member

The AppVeyor builds fail due to an unrelated issue, so we'll ignore those results.

@paplorinc paplorinc deleted the GradleUpgrade branch September 15, 2015 06:47
@robfletcher robfletcher modified the milestone: 1.1-rc-1 Aug 24, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants