Преглед на файлове

Sync spotless configuration with otel-java repo (#3989)

* Sync spotless configuration with otel-java repo

* Remove googleJavaFormat version in buildSrc too
Trask Stalnaker преди 3 години
родител
ревизия
1fd3d777af

+ 2 - 2
buildSrc/build.gradle.kts

@@ -7,8 +7,8 @@ plugins {
 
 spotless {
   java {
-    googleJavaFormat("1.10.0")
-    licenseHeaderFile(rootProject.file("../gradle/enforcement/spotless.license.java"), "(package|import|public)")
+    googleJavaFormat()
+    licenseHeaderFile(rootProject.file("../buildscripts/spotless.license.java"), "(package|import|public)")
     target("src/**/*.java")
   }
 }

+ 2 - 2
buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -261,12 +261,12 @@ afterEvaluate {
 }
 
 codenarc {
-  configFile = rootProject.file("gradle/enforcement/codenarc.groovy")
+  configFile = rootProject.file("buildscripts/codenarc.groovy")
   toolVersion = "2.0.0"
 }
 
 checkstyle {
-  configFile = rootProject.file("gradle/enforcement/checkstyle.xml")
+  configFile = rootProject.file("buildscripts/checkstyle.xml")
   // this version should match the version of google_checks.xml used as basis for above configuration
   toolVersion = "8.37"
   maxWarnings = 0

+ 27 - 13
buildSrc/src/main/kotlin/otel.spotless-conventions.gradle.kts

@@ -4,28 +4,42 @@ plugins {
 
 spotless {
   java {
-    googleJavaFormat("1.10.0")
-    licenseHeaderFile(rootProject.file("gradle/enforcement/spotless.license.java"), "(package|import|public|// Includes work from:)")
+    googleJavaFormat()
+    licenseHeaderFile(rootProject.file("buildscripts/spotless.license.java"), "(package|import|public|// Includes work from:)")
     target("src/**/*.java")
   }
-  groovy {
-    licenseHeaderFile(rootProject.file("gradle/enforcement/spotless.license.java"), "(package|import|class)")
+  plugins.withId("groovy") {
+    groovy {
+      licenseHeaderFile(rootProject.file("buildscripts/spotless.license.java"), "(package|import|class)")
+    }
   }
-  scala {
-    scalafmt()
-    licenseHeaderFile(rootProject.file("gradle/enforcement/spotless.license.java"), "(package|import|public)")
-    target("src/**/*.scala")
+  plugins.withId("scala") {
+    scala {
+      scalafmt()
+      licenseHeaderFile(rootProject.file("buildscripts/spotless.license.java"), "(package|import|public)")
+      target("src/**/*.scala")
+    }
   }
-  kotlin {
-    ktlint().userData(mapOf("indent_size" to "2", "continuation_indent_size" to "2"))
-    licenseHeaderFile(rootProject.file("gradle/enforcement/spotless.license.java"), "(package|import|public)")
+  plugins.withId("org.jetbrains.kotlin.jvm") {
+    kotlin {
+      ktlint().userData(mapOf("indent_size" to "2", "continuation_indent_size" to "2", "disabled_rules" to "no-wildcard-imports"))
+      licenseHeaderFile(rootProject.file("buildscripts/spotless.license.java"), "(package|import|class|// Includes work from:)")
+    }
   }
   kotlinGradle {
-    ktlint().userData(mapOf("indent_size" to "2", "continuation_indent_size" to "2"))
+    ktlint().userData(mapOf("indent_size" to "2", "continuation_indent_size" to "2", "disabled_rules" to "no-wildcard-imports"))
   }
   format("misc") {
     // not using "**/..." to help keep spotless fast
-    target(".gitignore", "*.md", "src/**/*.md", "*.sh", "src/**/*.properties")
+    target(
+      ".gitattributes",
+      ".gitconfig",
+      ".editorconfig",
+      "*.md",
+      "src/**/*.md",
+      "docs/**/*.md",
+      "*.sh",
+      "src/**/*.properties")
     indentWithSpaces()
     trimTrailingWhitespace()
     endWithNewline()

+ 0 - 0
gradle/enforcement/checkstyle.xml → buildscripts/checkstyle.xml


+ 0 - 0
gradle/enforcement/codenarc.groovy → buildscripts/codenarc.groovy


+ 0 - 0
gradle/enforcement/spotless.license.java → buildscripts/spotless.license.java