Merge pull request google#294 from google/jt/ktfmt

Use ktfmt in spotless and switch (back) to google-java-format
aurangzaibumer · Mar 10, 2021 · b338ed4 · b338ed4
2 parents b5ff819 + 9d46345
commit b338ed4
Show file tree

Hide file tree

Showing 142 changed files with 7,380 additions and 7,496 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -42,7 +42,7 @@ jobs:
  - name: set up JDK 1.8
  uses: actions/setup-java@v1
  with:
- java-version: 1.8
+ java-version: "11"
 
  - name: Make files executable
  run: chmod +x ./gradlew && chmod +x ./core/checksum.sh

diff --git a/build.gradle b/build.gradle
@@ -24,11 +24,12 @@ allprojects {
 }
 
 subprojects {
- apply plugin: 'com.diffplug.gradle.spotless'
+ apply plugin: 'com.diffplug.spotless'
  spotless {
  kotlin {
  target '**/*.kt'
- ktlint()userData(['max_line_length': '100'])
+ ktlint().userData(['indent_size': '2', 'continuation_indent_size': '2'])
+ ktfmt().googleStyle()
  licenseHeaderFile "${project.rootProject.projectDir}/license-header.txt"
  }
  }
@@ -54,5 +55,4 @@ afterEvaluate {
  }
  }
  }
-
 }