Skip to content

Commit

Permalink
fix compilation on Windows machines
Browse files Browse the repository at this point in the history
The excludePaths option for ErrorProne is used to ignore warnings in
generated code. That supplied the path using `buildDir`, but in fact
this is documented as a regular expression. On Windows the separator /
is an invalid regex character if not escaped. By instead using a more
generic pattern, rather than a file path, the build is cross-platform.

google/error-prone#2394
  • Loading branch information
ben-manes committed Jun 13, 2021
1 parent ff3bc33 commit ff7dbe1
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion gradle/codeQuality.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ tasks.withType(JavaCompile).configureEach {
disable('EmptyCatch')
disable('MissingSummary')
error('NullAway')
excludedPaths = "${buildDir}/generated-sources/.*"
excludedPaths = '.*/generated-sources/.*'

nullaway {
annotatedPackages.add('com.github.benmanes.caffeine')
Expand Down
8 changes: 4 additions & 4 deletions gradle/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
*/
ext {
versions = [
akka: '2.6.14',
akka: '2.6.15',
cache2k: '2.1.2.Alpha',
checkerFramework: '3.14.0',
coherence: '20.06',
Expand Down Expand Up @@ -63,7 +63,7 @@ ext {
univocityParsers: '2.9.1',
ycsb: '0.17.0',
xz: '1.9',
zstd: '1.5.0-1',
zstd: '1.5.0-2',
]
testVersions = [
awaitility: '4.1.0',
Expand All @@ -72,7 +72,7 @@ ext {
jcacheTck: '1.1.1',
jctools: '3.3.0',
junit: '4.13.2',
mockito: '3.11.0',
mockito: '3.11.1',
paxExam: '4.13.4',
testng: '7.4.0',
truth: '1.1.3',
Expand All @@ -94,7 +94,7 @@ ext {
pmd: '6.35.0',
semanticVersioning: '1.1.0',
shadow: '7.0.0',
sonarqube: '3.2.0',
sonarqube: '3.3',
spotbugs: '4.2.3',
spotbugsPlugin: '4.7.1',
stats: '0.2.2',
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-rc-1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-rc-2-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Expand Down

0 comments on commit ff7dbe1

Please sign in to comment.