Bump com.diffplug.spotless:spotless-plugin-gradle from 6.18.0 to 6.19…

….0 (#893) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mateusz Rzeszutek <[email protected]>
open-telemetry · May 26, 2023 · 128d67c · 128d67c
1 parent eecb996
commit 128d67c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 1 deletion.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -12,7 +12,7 @@ repositories {
 
 dependencies {
   // When updating, update above in plugins too
-  implementation("com.diffplug.spotless:spotless-plugin-gradle:6.18.0")
+  implementation("com.diffplug.spotless:spotless-plugin-gradle:6.19.0")
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:3.1.0")
   implementation("net.ltgt.gradle:gradle-nullaway-plugin:1.6.0")
   implementation("com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.13.3")
@@ -30,6 +30,8 @@ spotless {
       "ktlint_standard_max-line-length" to "disabled",
       // ktlint makes it *very* hard to locate where this actually happened
       "ktlint_standard_trailing-comma-on-call-site" to "disabled",
+      // depends on ktlint_standard_wrapping
+      "ktlint_standard_trailing-comma-on-declaration-site" to "disabled",
       // also very hard to find out where this happens
       "ktlint_standard_wrapping" to "disabled"
     ))

diff --git a/buildSrc/src/main/kotlin/otel.spotless-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.spotless-conventions.gradle.kts
@@ -32,6 +32,8 @@ spotless {
         "ktlint_standard_max-line-length" to "disabled",
         // ktlint makes it *very* hard to locate where this actually happened
         "ktlint_standard_trailing-comma-on-call-site" to "disabled",
+        // depends on ktlint_standard_wrapping
+        "ktlint_standard_trailing-comma-on-declaration-site" to "disabled",
         // also very hard to find out where this happens
         "ktlint_standard_wrapping" to "disabled"
       ))
@@ -49,6 +51,8 @@ spotless {
       "ktlint_standard_max-line-length" to "disabled",
       // ktlint makes it *very* hard to locate where this actually happened
       "ktlint_standard_trailing-comma-on-call-site" to "disabled",
+      // depends on ktlint_standard_wrapping
+      "ktlint_standard_trailing-comma-on-declaration-site" to "disabled",
       // also very hard to find out where this happens
       "ktlint_standard_wrapping" to "disabled"
     ))

diff --git a/...src/main/java/io/opentelemetry/contrib/jfr/connection/FlightRecorderMXBeanConnection.java b/...src/main/java/io/opentelemetry/contrib/jfr/connection/FlightRecorderMXBeanConnection.java
@@ -213,6 +213,7 @@ private FlightRecorderMXBeanConnection(
 
   /** The MBeanServerConnection. */
   private final MBeanServerConnection mBeanServerConnection;
+
   /** The ObjectName of the MBean we are connecting to. */
   private final ObjectName objectName;
 }
diff --git a/...n-extension/src/main/java/io/opentelemetry/maven/semconv/MavenOtelSemanticAttributes.java b/...n-extension/src/main/java/io/opentelemetry/maven/semconv/MavenOtelSemanticAttributes.java
@@ -23,6 +23,7 @@ public class MavenOtelSemanticAttributes {
   /** See {@link ResourceAttributes#CONTAINER_IMAGE_NAME} */
   public static final AttributeKey<String> MAVEN_BUILD_CONTAINER_IMAGE_NAME =
       stringKey("maven.build.container.image.name");
+
   /** See {@link ResourceAttributes#CONTAINER_IMAGE_TAG} */
   public static final AttributeKey<List<String>> MAVEN_BUILD_CONTAINER_IMAGE_TAGS =
       stringArrayKey("maven.build.container.image.tags");

diff --git a/...test/java/io/opentelemetry/contrib/metrics/prometheus/clientbridge/MetricAdapterTest.java b/...test/java/io/opentelemetry/contrib/metrics/prometheus/clientbridge/MetricAdapterTest.java
@@ -806,6 +806,7 @@ public String fallbackToStringOf(Object object) {
       }
       return "null";
     }
+
     /** Convert an exemplar into a human readable string. */
     private static String exemplarToString(Exemplar exemplar) {
       StringBuilder sb = new StringBuilder("Exemplar{ value=");