Skip to content

Commit

Permalink
Use plugins from toml, remove palantir's hack for errorprone.
Browse files Browse the repository at this point in the history
  • Loading branch information
dweiss committed Jun 12, 2024
1 parent a689fb3 commit e434dfe
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 13 deletions.
9 changes: 4 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,10 @@ plugins {
alias(deps.plugins.forbiddenapis) apply false
alias(deps.plugins.versionCatalogUpdate) apply false
alias(deps.plugins.randomizedtesting) apply false

id "org.owasp.dependencycheck" version "7.2.0"
id "de.undercouch.download" version "5.2.0" apply false
id "net.ltgt.errorprone" version "3.1.0" apply false
id 'org.barfuin.gradle.jacocolog' version "3.1.0" apply false
alias(deps.plugins.owasp.dependencycheck)
alias(deps.plugins.undercouch.download) apply false
alias(deps.plugins.errorprone) apply false
alias(deps.plugins.jacocolog) apply false
}

apply from: file('gradle/globals.gradle')
Expand Down
8 changes: 0 additions & 8 deletions gradle/validation/error-prone.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,8 @@ allprojects { prj ->
// LUCENE-9650: Errorprone on master/gradle does not work when running as plugin
// inside a forked Javac process. Javac running inside Gradle works, because we have
// additional module system opens in place.
// This is a hack to keep the dependency (so that palantir's version check doesn't complain)
// but don't include the plugin (which fails on JDK16+).
if (skipReason) {
tasks.withType(JavaCompile) { task -> task.dependsOn ":errorProneSkipped" }
configurations {
errorprone
}
dependencies {
errorprone("com.google.errorprone:error_prone_core")
}
} else {
prj.apply plugin: 'net.ltgt.errorprone'

Expand Down
4 changes: 4 additions & 0 deletions versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,7 @@ dependencychecks = "com.carrotsearch.gradle.dependencychecks:0.0.9"
randomizedtesting = "com.carrotsearch.gradle.randomizedtesting:0.0.6"
spotless = "com.diffplug.spotless:6.5.2"
versionCatalogUpdate = "nl.littlerobots.version-catalog-update:0.8.4"
owasp-dependencycheck = "org.owasp.dependencycheck:7.2.0"
undercouch-download = "de.undercouch.download:5.2.0"
errorprone = "net.ltgt.errorprone:3.1.0"
jacocolog = "org.barfuin.gradle.jacocolog:3.1.0"

0 comments on commit e434dfe

Please sign in to comment.