Skip to content

Commit cdd24ba

Browse files
dansanduleacbulldozer-bot[bot]
authored andcommitted
Use baseline to format ourselves (#25)
Use baseline to format ourselves (using [baseline#936](palantir/gradle-baseline#936)) rather than direct configuration.
1 parent fcf43ee commit cdd24ba

2 files changed

Lines changed: 4 additions & 13 deletions

File tree

‎build.gradle‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@ buildscript {
1111
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
1212
classpath 'com.netflix.nebula:nebula-publishing-plugin:14.0.0'
1313
classpath 'com.netflix.nebula:gradle-info-plugin:5.1.1'
14-
classpath 'com.palantir.baseline:gradle-baseline-java:2.13.0'
14+
classpath 'com.palantir.baseline:gradle-baseline-java:2.21.0'
1515
classpath 'gradle.plugin.org.inferred:gradle-processors:3.1.0'
1616
classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.2'
1717
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.12.4'
18-
classpath 'com.palantir.javaformat:palantir-java-format:0.0.1'
1918
}
2019
}
2120

@@ -51,13 +50,4 @@ subprojects {
5150
tasks.withType(Checkstyle) {
5251
enabled = false
5352
}
54-
55-
spotless {
56-
java {
57-
customLazyGroovy('palantir-java-format') {
58-
Formatter formatter = new Formatter(JavaFormatterOptions.builder().style(JavaFormatterOptions.Style.PALANTIR).build())
59-
return { source -> formatter.formatSource(source) }
60-
}
61-
}
62-
}
6353
}

‎gradle.properties‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
com.palantir.baseline-versions.disable = true
1+
com.palantir.baseline-versions.disable=true
2+
com.palantir.baseline-format.palantir-java-format=true
23
org.gradle.parallel=true
3-
org.gradle.caching = true
4+
org.gradle.caching=true

0 commit comments

Comments
 (0)