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.

Sign up for GitHub

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

Jump to bottom

More Java 13 pre-reqs #767

Merged
merged 4 commits into from
Aug 23, 2019
Merged

More Java 13 pre-reqs #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
411284a
Upgrade spotless to latest
iamdanfox Aug 23, 2019
b010fa9
-Xep:TypeParameterUnusedInFormals:OFF
iamdanfox Aug 23, 2019
a51e4fb
Add generated changelog entries
iamdanfox Aug 23, 2019
2be9e1f
Explicit jgit dep
iamdanfox Aug 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions changelog/@unreleased/pr-767.v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
type: fix
fix:
description: The `TypeParameterUnusedInFormals` errorprone check is disabled when
compiling on Java 13, to workaround an error-prone bug.
links:
- https://github.com/palantir/gradle-baseline/pull/767
1 change: 1 addition & 0 deletions gradle-baseline-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ dependencies {
compile 'net.ltgt.gradle:gradle-errorprone-plugin'
compile 'org.apache.maven.shared:maven-dependency-analyzer'
compile 'org.github.ngbinh.scalastyle:gradle-scalastyle-plugin_2.11'
implementation 'org.eclipse.jgit:org.eclipse.jgit'
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was coming in from spotless before, but looks like they've hidden their implementation details now:


org.eclipse.jgit:org.eclipse.jgit:5.3.2.201906051522-r
\--- com.diffplug.spotless:spotless-lib-extra:1.24.1
     \--- com.diffplug.spotless:spotless-plugin-gradle:3.24.2
          \--- runtimeClasspath (requested com.diffplug.spotless:spotless-plugin-gradle)


testCompile gradleTestKit()
testCompile 'com.github.stefanbirkner:system-rules'
Expand Down
6 changes: 6 additions & 0 deletions gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineErrorProne.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,12 @@ public void apply(Project project) {
errorProneOptions.check("Finally", CheckSeverity.OFF);
}

if (jdkVersion.compareTo(JavaVersion.toVersion("13.0.0")) >= 0) {
// Errorprone isn't officially compatible with Java13 either
// https://github.com/google/error-prone/issues/1106
errorProneOptions.check("TypeParameterUnusedInFormals", CheckSeverity.OFF);
}

if (javaCompile.equals(compileRefaster)) {
// Don't apply refaster to itself...
return;
Expand Down
3 changes: 2 additions & 1 deletion versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
com.diffplug.spotless:spotless-plugin-gradle = 3.14.0
com.diffplug.spotless:spotless-plugin-gradle = 3.24.2
com.google.auto.service:auto-service = 1.0-rc4
com.google.errorprone:error_prone_annotations = 2.3.3
com.google.errorprone:error_prone_core = 2.3.3
Expand All @@ -12,6 +12,7 @@ org.apache.maven.shared:maven-dependency-analyzer = 1.11.1
org.github.ngbinh.scalastyle:gradle-scalastyle-plugin_2.11 = 1.0.1
org.inferred:freebuilder = 1.14.6
org.slf4j:slf4j-api = 1.7.25
org.eclipse.jgit:org.eclipse.jgit = 5.3.2.201906051522-r

# test deps
com.netflix.nebula:nebula-test = 7.2.5
Expand Down