Skip to content

Commit 8822fbc

Browse files
committed
Remove Google Java format plugin
It's [not yet compatible with Gradle configuration caching](sherter/google-java-format-gradle-plugin#55).
1 parent f0d2f7a commit 8822fbc

File tree

2 files changed

+1
-29
lines changed

2 files changed

+1
-29
lines changed

build.gradle

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ plugins {
1212
id 'com.diffplug.eclipse.mavencentral' version '3.33.2' apply false
1313
id 'com.dorongold.task-tree' version '2.1.0'
1414
id 'com.github.ben-manes.versions' version '0.39.0'
15-
id 'com.github.sherter.google-java-format' version '0.9'
1615
id 'de.undercouch.download'
1716
id 'nebula.lint' version '17.2.3'
1817
}
@@ -251,27 +250,6 @@ if (isWindows) {
251250
}
252251
}
253252

254-
// Java formatting
255-
googleJavaFormat {
256-
group 'verification'
257-
toolVersion = '1.7'
258-
// exclude since various tests make assertions based on
259-
// source positions in the test inputs. to auto-format
260-
// we also need to update the test assertions
261-
exclude 'com.ibm.wala.cast.java.test.data/**/*.java'
262-
}
263-
264-
final verifyGoogleJavaFormat = tasks.named('verifyGoogleJavaFormat') {
265-
group 'verification'
266-
267-
// workaround for <https://github.com/sherter/google-java-format-gradle-plugin/issues/43>
268-
final stampFile = project.layout.buildDirectory.file(name)
269-
outputs.file stampFile
270-
doLast {
271-
stampFile.get().asFile.text = ''
272-
}
273-
}
274-
275253
tasks.named('autoLintGradle') {
276254
// `autoLintGradle` creates no output files, which causes Gradle to treat it as always
277255
// out-of-date. By creating a simple, empty stamp file to record that this task has run and
@@ -302,7 +280,7 @@ final check = tasks.register('check') {
302280
if (!(isWindows && System.getenv('GITHUB_ACTIONS') == 'true')) {
303281
// Known to be broken on Windows when running as a GitHub Action, but not intentionally so.
304282
// Please fix if you know how! <https://github.com/wala/WALA/issues/608>
305-
dependsOn verifyGoogleJavaFormat
283+
// dependsOn verifyGoogleJavaFormat
306284
}
307285
}
308286

com.ibm.wala.dalvik/build.gradle

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,4 @@ tasks.named('test') {
155155
].collect(layout.buildDirectory.&file))
156156
}
157157

158-
googleJavaFormat {
159-
// generated files
160-
exclude "$name/parser.java"
161-
exclude "$name/sym.java"
162-
}
163-
164158
apply from: rootProject.file("gradle-mvn-push.gradle")

0 commit comments

Comments
 (0)