Update Gradle wrapper to 7.1 #73941
Merged
Update Gradle wrapper to 7.1 #73941
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
breskeby
added
:Delivery/Build
breskeby
force-pushed
the
update-gradle-7-1
branch
from
a7373f5 to
1636971
Compare
breskeby
force-pushed
the
update-gradle-7-1
branch
from
54966c5 to
02c1202
Compare
breskeby
commented
Jun 17, 2021
| @@ -48,7 +48,7 @@ public void apply(Project project) { | |||
| File heapdumpDir = new File(project.getBuildDir(), "heapdump"); | |||
|
|
|||
| project.getTasks().withType(Test.class).configureEach(test -> { | |||
| File testOutputDir = new File(test.getReports().getJunitXml().getDestination(), "output"); | |||
| File testOutputDir = new File(test.getReports().getJunitXml().getOutputLocation().getAsFile().get(), "output"); | |||
There was a problem hiding this comment.
getDestination has been deprecated
breskeby
commented
Jun 17, 2021
| @@ -94,7 +94,7 @@ public void execute(Task task) { | |||
|
|
|||
| project.getTasks().withType(Checkstyle.class).configureEach(t -> { | |||
| t.dependsOn(copyCheckstyleConf); | |||
| t.reports(r -> r.getHtml().setEnabled(false)); | |||
| t.reports(r -> r.getHtml().getRequired().set(false)); | |||
There was a problem hiding this comment.
setEnabled has been deprecated
breskeby
commented
Jun 17, 2021
| @@ -62,8 +63,7 @@ public void setClasspath(FileCollection classpath) { | |||
| @PathSensitive(PathSensitivity.RELATIVE) | |||
| @SkipWhenEmpty | |||
| public FileCollection getClassDirectories() { | |||
| return getProject().getConvention() | |||
| .getPlugin(JavaPluginConvention.class) | |||
| return getProject().getExtensions().getByType(JavaPluginExtension.class) | |||
There was a problem hiding this comment.
access to convention api has been deprecated
breskeby
commented
Jun 17, 2021
| @@ -334,7 +334,7 @@ private String runForbiddenAPIsCli() throws IOException { | |||
| getProject().getConfigurations().getByName(CompileOnlyResolvePlugin.RESOLVEABLE_COMPILE_ONLY_CONFIGURATION_NAME) | |||
| ); | |||
| spec.jvmArgs("-Xmx1g"); | |||
| spec.setMain("de.thetaphi.forbiddenapis.cli.CliMain"); | |||
| spec.getMainClass().set("de.thetaphi.forbiddenapis.cli.CliMain"); | |||
There was a problem hiding this comment.
getMain has been deprecated
breskeby
commented
Jun 17, 2021
| @@ -55,7 +55,8 @@ public LoggedExec(FileSystemOperations fileSystemOperations) { | |||
| doLast(new Action<Task>() { | |||
| @Override | |||
| public void execute(Task task) { | |||
| if (LoggedExec.this.getExecResult().getExitValue() != 0) { | |||
There was a problem hiding this comment.
getExitValue() has been deprecated
breskeby
commented
Jun 17, 2021
| @@ -48,7 +48,7 @@ buildscript { | |||
| maven { url 'https://jitpack.io' } | |||
| } | |||
| dependencies { | |||
| classpath "com.github.breskeby:gradle-ospackage-plugin:ddb72a9922b934033827d48d296f7f3d470ac422" | |||
| classpath "com.github.breskeby:gradle-ospackage-plugin:98455c1" | |||
There was a problem hiding this comment.
This is a snaspshot reference to the ospackage plugin containing the changes of this provided PR nebula-plugins/gradle-ospackage-plugin#400
breskeby
commented
Jun 17, 2021
| // SystemPackagingTask overrides default archive task convention mappings, but doesn't provide a setter so we have to override the convention mapping itself | ||
| conventionMapping.archiveFile = { objects.fileProperty().fileValue(file("${destinationDirectory.get()}/${packageName}-${project.version}-${jdkString}${archString}.${type}")) } | ||
|
|
||
| archiveFileName.value(project.provider({ "${packageName}-${project.version}-${jdkString}${archString}.${type}" } )) |
There was a problem hiding this comment.
conventionMapping access has been deprecated
|
Pinging @elastic/es-delivery (Team:Delivery) |
breskeby
added a commit
to breskeby/elasticsearch
that referenced
this pull request
Jun 17, 2021
- Fix new introduced deprecated usages - Update to newer ospackage snapshot to include provided PR for fixing deprecated usage This gradle release comes with improvements on incremental compilation which we should benefit from
breskeby
added a commit
that referenced
this pull request
Jun 17, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This gradle release comes with improvements on incremental compilation which we should benefit from