Skip to content

Commit bbfd2c1

Browse files
authored
Merge pull request #220 from openjavaformat/abashev/Same-output-on-every-route
Format the same on every route: formatDiff on the JVM, ranges, and the order of fixing imports
2 parents 57bb4da + af5f1c7 commit bbfd2c1

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

‎build.gradle‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
dependencies {
88
classpath 'com.gradle.publish:plugin-publish-plugin:2.2.1'
99
// The released open-java-format formats this repository, not the one being built here.
10-
classpath 'dev.openjavaformat:gradle-open-java-format:2.98.0.6'
10+
classpath 'dev.openjavaformat:gradle-open-java-format:21.0.2'
1111
classpath 'me.champeau.jmh:jmh-gradle-plugin:0.7.3'
1212
}
1313
}
@@ -73,16 +73,19 @@ allprojects {
7373
}
7474

7575
repositories {
76-
mavenCentral() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
77-
gradlePluginPortal()
76+
mavenCentral() {
77+
metadataSources {
78+
mavenPom(); ignoreGradleMetadataRedirection()
79+
}
80+
}
7881
}
7982
}
8083

8184
subprojects {
8285
apply plugin: 'java-library'
83-
// Java toolchains, javac and test settings; Error Prone. Both in buildSrc/src/main/groovy.
8486
apply plugin: 'open-java-format.java-conventions'
8587
apply plugin: 'open-java-format.error-prone-conventions'
88+
8689
// Bans Guava's immutable collections, but not in the SPI: FormatterService.getFormatReplacements keeps
8790
// returning ImmutableList, so that code compiled against an older SPI still links.
8891
if (path != ':open-java-format-spi') {

0 commit comments

Comments
 (0)