Skip to content

Commit

Permalink
Remove Google Java format plugin
Browse files Browse the repository at this point in the history
It's [not yet compatible with Gradle configuration
caching](sherter/google-java-format-gradle-plugin#55).
  • Loading branch information
liblit committed Nov 27, 2021
1 parent f0d2f7a commit 8822fbc
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 29 deletions.
24 changes: 1 addition & 23 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ plugins {
id 'com.diffplug.eclipse.mavencentral' version '3.33.2' apply false
id 'com.dorongold.task-tree' version '2.1.0'
id 'com.github.ben-manes.versions' version '0.39.0'
id 'com.github.sherter.google-java-format' version '0.9'
id 'de.undercouch.download'
id 'nebula.lint' version '17.2.3'
}
Expand Down Expand Up @@ -251,27 +250,6 @@ if (isWindows) {
}
}

// Java formatting
googleJavaFormat {
group 'verification'
toolVersion = '1.7'
// exclude since various tests make assertions based on
// source positions in the test inputs. to auto-format
// we also need to update the test assertions
exclude 'com.ibm.wala.cast.java.test.data/**/*.java'
}

final verifyGoogleJavaFormat = tasks.named('verifyGoogleJavaFormat') {
group 'verification'

// workaround for <https://github.com/sherter/google-java-format-gradle-plugin/issues/43>
final stampFile = project.layout.buildDirectory.file(name)
outputs.file stampFile
doLast {
stampFile.get().asFile.text = ''
}
}

tasks.named('autoLintGradle') {
// `autoLintGradle` creates no output files, which causes Gradle to treat it as always
// out-of-date. By creating a simple, empty stamp file to record that this task has run and
Expand Down Expand Up @@ -302,7 +280,7 @@ final check = tasks.register('check') {
if (!(isWindows && System.getenv('GITHUB_ACTIONS') == 'true')) {
// Known to be broken on Windows when running as a GitHub Action, but not intentionally so.
// Please fix if you know how! <https://github.com/wala/WALA/issues/608>
dependsOn verifyGoogleJavaFormat
// dependsOn verifyGoogleJavaFormat
}
}

Expand Down
6 changes: 0 additions & 6 deletions com.ibm.wala.dalvik/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,4 @@ tasks.named('test') {
].collect(layout.buildDirectory.&file))
}

googleJavaFormat {
// generated files
exclude "$name/parser.java"
exclude "$name/sym.java"
}

apply from: rootProject.file("gradle-mvn-push.gradle")

0 comments on commit 8822fbc

Please sign in to comment.