clean up build script

1. setting the jvm target in a more succinct way 2. avoid noisy build due to spotless depending on its own output diffplug/spotless#870 (comment)
uber · Oct 26, 2023 · 8327d8b · 8327d8b
1 parent c3e6f51
commit 8327d8b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/build.gradle b/build.gradle
@@ -74,29 +74,29 @@ subprojects {
         apply plugin: 'com.diffplug.spotless'
         spotless {
             format 'misc', {
-                target '**/*.md', '**/.gitignore'
+                target '*.md', '.gitignore'
 
                 trimTrailingWhitespace()
                 endWithNewline()
             }
             kotlin {
-                target "**/*.kt"
+                target "src/**/*.kt"
                 ktlint(deps.versions.ktlint).userData(['indent_size': '2', 'continuation_indent_size': '2'])
                 ktfmt(deps.versions.ktfmt)
                 licenseHeaderFile rootProject.file('config/spotless/copyright.kt')
                 trimTrailingWhitespace()
                 endWithNewline()
             }
             java {
-                target "**/*.java"
+                target "src/**/*.java"
                 googleJavaFormat(deps.versions.gjf)
                 licenseHeaderFile rootProject.file('config/spotless/copyright.java')
                 removeUnusedImports()
                 trimTrailingWhitespace()
                 endWithNewline()
             }
             groovyGradle {
-                target '**/*.gradle'
+                target '*.gradle'
                 trimTrailingWhitespace()
                 endWithNewline()
             }

diff --git a/intellij/ast/build.gradle b/intellij/ast/build.gradle
@@ -11,10 +11,8 @@ intellij {
     updateSinceUntilBuild = false
 }
 
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
-    }
+kotlin {
+    jvmToolchain(17)
 }
 
 dependencies {

diff --git a/intellij/build.gradle b/intellij/build.gradle
@@ -11,10 +11,8 @@ intellij {
     updateSinceUntilBuild = false
 }
 
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
-    }
+kotlin {
+    jvmToolchain(17)
 }
 
 group 'com.uber.motif'