Bump spotless version (#414)

Author: Mateusz Rzeszutek

buildSrc/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
   `kotlin-dsl`
   // When updating, update below in dependencies too
-  id("com.diffplug.spotless") version "6.4.2"
+  id("com.diffplug.spotless") version "6.9.0"
 }
 
 repositories {
@@ -12,14 +12,14 @@ repositories {
 
 dependencies {
   // When updating, update above in plugins too
-  implementation("com.diffplug.spotless:spotless-plugin-gradle:6.4.2")
+  implementation("com.diffplug.spotless:spotless-plugin-gradle:6.9.0")
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:2.0.2")
   implementation("net.ltgt.gradle:gradle-nullaway-plugin:1.3.0")
 }
 
 spotless {
   kotlinGradle {
-    ktlint().userData(mapOf("indent_size" to "2", "continuation_indent_size" to "2", "disabled_rules" to "no-wildcard-imports"))
+    ktlint().editorConfigOverride(mapOf("indent_size" to "2", "continuation_indent_size" to "2", "disabled_rules" to "no-wildcard-imports"))
     target("**/*.gradle.kts")
   }
 }

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

@@ -22,12 +22,12 @@ spotless {
   }
   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"))
+      ktlint().editorConfigOverride(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", "disabled_rules" to "no-wildcard-imports"))
+    ktlint().editorConfigOverride(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

jfr-streaming/src/main/java/io/opentelemetry/contrib/jfr/metrics/HandlerRegistry.java

@@ -81,7 +81,9 @@ static HandlerRegistry createDefault(MeterProvider meterProvider) {
     return new HandlerRegistry(handlers);
   }
 
-  /** @return all entries in this registry. */
+  /**
+   * @return all entries in this registry.
+   */
   List<RecordedEventHandler> all() {
     return mappers;
   }

maven-extension/src/main/java/io/opentelemetry/maven/ChainedExecutionListener.java

@@ -18,7 +18,9 @@ final class ChainedExecutionListener implements ExecutionListener {
 
   private final List<ExecutionListener> listeners;
 
-  /** @param listeners {@code null} values are filtered */
+  /**
+   * @param listeners {@code null} values are filtered
+   */
   ChainedExecutionListener(ExecutionListener... listeners) {
     this.listeners = Arrays.stream(listeners).filter(e -> e != null).collect(Collectors.toList());
   }

samplers/src/main/java/io/opentelemetry/contrib/samplers/SamplingRule.java

@@ -11,7 +11,9 @@
 import java.util.regex.Pattern;
 import javax.annotation.Nullable;
 
-/** @see RuleBasedRoutingSampler */
+/**
+ * @see RuleBasedRoutingSampler
+ */
 class SamplingRule {
   final AttributeKey<String> attributeKey;
   final Sampler delegate;