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

no longer checks for build receipt resource, skips Install and Download #4

Merged
merged 7 commits into from
May 31, 2020

Conversation

keturn
Copy link
Member

@keturn keturn commented May 17, 2020

This will no longer update the gradle distribution when gradle.properties changes. But it also invokes less code to possibly break with gradle changes.

Fixes #3.

and breaks #2

That is, it no longer tries to put commons-io on the bootstrap classpath, because it's not in the current gradle distribution.

set off by a NPE warning and then kind of kept going.
also removes the need to check for that resource file that no longer exists after 2018.
@keturn keturn marked this pull request as draft May 17, 2020 22:07
It's no longer included in the current gradle distribution.

Breaks support for issue MovingBlocks#2.
@keturn keturn marked this pull request as ready for review May 17, 2020 22:37
keturn added a commit to keturn/Terasology that referenced this pull request May 18, 2020
makes groovy work with post-2018 gradle.
MovingBlocks/groovy-wrapper#4
keturn added a commit to MovingBlocks/Terasology that referenced this pull request May 19, 2020
makes groovy work with post-2018 gradle.
MovingBlocks/groovy-wrapper#4
keturn added a commit to MovingBlocks/Terasology that referenced this pull request May 23, 2020
makes groovy work with post-2018 gradle.
MovingBlocks/groovy-wrapper#4
keturn added a commit to keturn/Terasology that referenced this pull request May 24, 2020
makes groovy work with post-2018 gradle.
MovingBlocks/groovy-wrapper#4
Comment on lines -60 to -63
WrapperExecutor wrapperExecutor = WrapperExecutor.forWrapperPropertiesFile(propertiesFile);
wrapperExecutor.execute(
args,
new Install(logger, new Download(logger, "gradlew", wrapperVersion()), new PathAssembler(gradleUserHome)),
Copy link
Member Author

Choose a reason for hiding this comment

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

I axed all this Install and Download invocation, but if you want to keep the download-and-install functionality, you leave this in and just replace that wrapperVersion() with org.gradle.wrapper.Download.UNKNOWN_VERSION: https://github.com/gradle/gradle/blob/00862b8160a09051e8226736314afd16e7f418f7/subprojects/wrapper/src/main/java/org/gradle/wrapper/Download.java#L24

aka "0"

Comment on lines +64 to +65
static File getAndVerifyDistributionRoot(File distDir) {
// Extracted from org.gradle.wrapper.Install.getAndVerifyDistributionRoot
Copy link
Member Author

Choose a reason for hiding this comment

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

and then if you keep that Install invocation, there's no reason to have this duplicate copy of this method brought over from the Install class.

Cervator added a commit that referenced this pull request May 31, 2020
Re-adds the ability to rely on an already downloaded Gradle via `gradlew` execution, on top of #4 for better convenience even if breaking backwards compatibility
@Cervator Cervator merged commit d8e2f02 into MovingBlocks:master May 31, 2020
@Cervator
Copy link
Member

Thanks @keturn :-)

Added back in that one piece, added details to the readme, did a version bump, and updated the target Gradle version for this repo as well via d51500f

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.

"could not determine wrapper version" after upgrading gradle
2 participants