build: avoid the use of deprecated Gradle constructs #1934
Merged
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
The `buildDir` property has been deprecated in Gradle 8.3 in favor of `layout.buildDirectory` [1][2], so use that instead. [1]: https://docs.gradle.org/8.3/release-notes.html [2]: gradle/gradle#20210 Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
This avoids the use of several deprecated Gradle APIs, see [1]. [1]: https://github.com/johnrengelman/shadow/releases/tag/8.1.1 Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
Gradle 8.5 [1] started to nag about deprecated BasePluginExtension members, so stop using them. [1]: https://docs.gradle.org/8.5/release-notes.html Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
sschuberth
reviewed
Jan 17, 2024
| @@ -32,7 +32,7 @@ sonarqube { | |||
| property "sonar.dependencyCheck.reportPath", "build/reports/owasp-dependency-check/dependency-check-report.xml" | |||
| property "sonar.dependencyCheck.htmlReportPath", "build/reports/owasp-dependency-check/dependency-check-report.html" | |||
| property "sonar.exclusions", "**/build/generated-sources/**" | |||
| property "sonar.coverage.jacoco.xmlReportPaths", "${rootProject.layout.buildDirectory}/reports/jacoco/jacocoAggregatedReport/jacocoAggregatedReport.xml" | |||
| property "sonar.coverage.jacoco.xmlReportPaths", "${rootProject.layout.buildDirectory.get().asFile}/reports/jacoco/jacocoAggregatedReport/jacocoAggregatedReport.xml" | |||
There was a problem hiding this comment.
Shouldn't this then also rather be
rootProject.layout.buildDirectory.dir('reports/jacoco/jacocoAggregatedReport/jacocoAggregatedReport.xml').get().asFile
to avoid string interpolation where not needed? Similar in more places below.
There was a problem hiding this comment.
I agree, that it could be more consistent and we should set code style rules for gradle scripts. But that would be bigger change and I wouldn't wan't to incorporate it into this PR.
| @@ -21,7 +21,7 @@ jar { | |||
|
|
|||
| tasks.register('copyGpg', Copy) { | |||
| from 'src/test/gpg' | |||
| into "${layout.buildDirectory}/gpg" | |||
| into layout.buildDirectory.dir("gpg") | |||
There was a problem hiding this comment.
Nit: Now that no string interpolation is needed anymore, the string should use single-quotes instead of double-quotes. Similar in more places below.
|
andresrosenthal
approved these changes
Jan 18, 2024
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.
No description provided.