Excavator: Update to Gradle 7 #1875
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
svc-excavator-bot
force-pushed
the
roomba/gradle7
branch
from
8d4dd8e to
35f037e
Compare
fawind
reviewed
Aug 16, 2021
| @@ -199,7 +198,7 @@ private static void configureSourceSet( | |||
| checkUnusedDependencies.configure(task -> task.dependsOn(sourceSetUnusedDependencies)); | |||
| TaskProvider<CheckImplicitDependenciesTask> sourceSetCheckImplicitDependencies = project.getTasks() | |||
| .register( | |||
| GUtil.toLowerCamelCase("checkImplicitDependencies " + sourceSet.getName()), | |||
There was a problem hiding this comment.
GUtil is deprecated but usually source sets should already use camel case so this should be equivalent.
fawind
reviewed
Aug 16, 2021
| @@ -232,14 +231,10 @@ private static String getCompileConfigurationName(SourceSet sourceSet) { | |||
| } | |||
|
|
|||
| private static Map<String, String> excludeRuleAsMap(ExcludeRule rule) { | |||
| Builder<String, String> excludeRule = ImmutableMap.builder(); | |||
| if (rule.getGroup() != null) { | |||
There was a problem hiding this comment.
Intellij flags this with Method 'getGroup' inherits annotation from package org.gradle.api.artifacts, thus 'non-null'
fawind
reviewed
Aug 16, 2021
| Method getRawSourceCompatibility = | ||
| org.gradle.api.plugins.internal.DefaultJavaPluginConvention.class.getMethod( | ||
| "getRawSourceCompatibility"); | ||
| return (JavaVersion) getRawSourceCompatibility.invoke(convention); |
There was a problem hiding this comment.
Flipping the reflection call as we now build with Gradle 7
carterkozak
reviewed
Aug 16, 2021
Comment on lines
+131
to
+133
| tasks.named('processResources').configure { | ||
| duplicatesStrategy 'include' | ||
| } |
There was a problem hiding this comment.
I imagine this is due to gradle 7 failing on duplicate plugin resource files
This was referenced Aug 18, 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.
excavator is a bot for automating changes across repositories.
Changes produced by the roomba/gradle7 check.
To enable or disable this check, please contact the maintainers of Excavator.