Updated spotless and formatters to latest versions. Set JDK21 as default for Gradle. Apply spottles to source code.

Author: AlexeyKuznetsov-DD

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
   id("datadog.tracer-version")
   id("datadog.dump-hanged-test")
 
-  id("com.diffplug.spotless") version "6.13.0"
+  id("com.diffplug.spotless") version "8.0.0"
   id("com.github.spotbugs") version "5.0.14"
   id("de.thetaphi.forbiddenapis") version "3.8"
   id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
@@ -33,7 +33,7 @@ with(extensions["spotlessPredeclare"] as SpotlessExtension) {
     removeUnusedImports()
 
     // This is the last Google Java Format version that supports Java 8
-    googleJavaFormat("1.7")
+    googleJavaFormat("1.29.0")
   }
   groovyGradle {
     greclipse()
@@ -42,13 +42,13 @@ with(extensions["spotlessPredeclare"] as SpotlessExtension) {
     greclipse()
   }
   kotlinGradle {
-    ktlint("0.41.0")
+    ktlint("1.7.1")
   }
   kotlin {
-    ktlint("0.41.0")
+    ktlint("1.7.1")
   }
   scala {
-    scalafmt("2.7.5")
+    scalafmt("3.9.10")
   }
 }
 apply(from = rootDir.resolve("gradle/spotless.gradle"))
@@ -59,13 +59,15 @@ allprojects {
   group = "com.datadoghq"
 
   if (isCI.isPresent) {
-    layout.buildDirectory = providers.provider {
-      val newProjectCIPath = projectDir.path.replace(
-        rootDir.path,
-        ""
-      )
-      rootDir.resolve("workspace/$newProjectCIPath/build/")
-    }
+    layout.buildDirectory =
+      providers.provider {
+        val newProjectCIPath =
+          projectDir.path.replace(
+            rootDir.path,
+            "",
+          )
+        rootDir.resolve("workspace/$newProjectCIPath/build/")
+      }
   }
 
   apply(from = rootDir.resolve("gradle/dependencies.gradle"))
@@ -82,7 +84,7 @@ allprojects {
       jvmArgs(
         "-XX:ErrorFile=/tmp/hs_err_pid%p.log",
         "-XX:+HeapDumpOnOutOfMemoryError",
-        "-XX:HeapDumpPath=/tmp"
+        "-XX:HeapDumpPath=/tmp",
       )
     }
   }
@@ -121,15 +123,24 @@ nexusPublishing {
   }
 }
 
-val writeMainVersionFileTask = tasks.register("writeMainVersionFile") {
-  val versionFile = rootProject.layout.buildDirectory.file("main.version")
-  inputs.property("version", project.version)
-  outputs.file(versionFile)
-  doFirst {
-    require(versionFile.get().asFile.parentFile.mkdirs() || versionFile.get().asFile.parentFile.isDirectory)
-    versionFile.get().asFile.writeText(project.version.toString())
+val writeMainVersionFileTask =
+  tasks.register("writeMainVersionFile") {
+    val versionFile = rootProject.layout.buildDirectory.file("main.version")
+    inputs.property("version", project.version)
+    outputs.file(versionFile)
+    doFirst {
+      require(
+        versionFile
+          .get()
+          .asFile.parentFile
+          .mkdirs() ||
+          versionFile
+            .get()
+            .asFile.parentFile.isDirectory,
+      )
+      versionFile.get().asFile.writeText(project.version.toString())
+    }
   }
-}
 
 allprojects {
   tasks.withType<PublishToMavenLocal>().configureEach {

buildSrc/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
   `java-gradle-plugin`
   `kotlin-dsl`
   `jvm-test-suite`
-  id("com.diffplug.spotless") version "6.13.0"
+  id("com.diffplug.spotless") version "8.0.0"
 }
 
 java {

buildSrc/call-site-instrumentation-plugin/build.gradle.kts

@@ -1,9 +1,7 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
 plugins {
   java
   groovy
-  id("com.diffplug.spotless") version "6.13.0"
+  id("com.diffplug.spotless") version "8.0.0"
   id("com.gradleup.shadow") version "8.3.6"
 }
 
@@ -20,7 +18,7 @@ spotless {
     // ignore embedded test projects
     targetExclude("src/test/resources/**")
     // This is the last Google Java Format version that supports Java 8
-    googleJavaFormat("1.7")
+    googleJavaFormat("1.29.0")
   }
 }
 

buildSrc/src/main/kotlin/datadog/gradle/plugin/config/ConfigInversionLinter.kt

@@ -5,8 +5,6 @@ import org.gradle.api.Project
 import org.gradle.api.GradleException
 import org.gradle.api.tasks.SourceSet
 import org.gradle.api.tasks.SourceSetContainer
-import org.gradle.internal.impldep.kotlinx.metadata.impl.extensions.KmExtension
-import org.gradle.kotlin.dsl.accessors.runtime.externalModuleDependencyFor
 import org.gradle.kotlin.dsl.getByType
 import java.net.URLClassLoader
 import java.nio.file.Path

buildSrc/src/main/kotlin/datadog/gradle/plugin/muzzle/MuzzlePluginUtils.kt

@@ -1,17 +1,10 @@
 package datadog.gradle.plugin.muzzle
 
 import org.gradle.api.Project
-import org.gradle.api.file.FileCollection
 import org.gradle.api.tasks.SourceSet
 import org.gradle.api.tasks.SourceSet.MAIN_SOURCE_SET_NAME
 import org.gradle.api.tasks.SourceSetContainer
-import org.gradle.build.event.BuildEventsListenerRegistry
 import org.gradle.kotlin.dsl.findByType
-import org.gradle.kotlin.dsl.getByType
-import org.gradle.tooling.events.FinishEvent
-import org.gradle.tooling.events.OperationCompletionListener
-import org.gradle.tooling.events.task.TaskFinishEvent
-import org.gradle.tooling.events.task.TaskSuccessResult
 
 internal val Project.mainSourceSet: SourceSet
   get() = extensions.findByType<SourceSetContainer>()

buildSrc/src/main/kotlin/datadog/gradle/plugin/muzzle/tasks/AbstractMuzzleReportTask.kt

@@ -3,7 +3,6 @@ package datadog.gradle.plugin.muzzle.tasks
 import datadog.gradle.plugin.muzzle.TestedArtifact
 import datadog.gradle.plugin.muzzle.pathSlug
 import org.gradle.api.file.RegularFile
-import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.OutputFile
 import java.util.SortedMap

buildSrc/src/main/kotlin/datadog/gradle/plugin/muzzle/tasks/MuzzleGenerateReportTask.kt

@@ -3,7 +3,6 @@ package datadog.gradle.plugin.muzzle.tasks
 import datadog.gradle.plugin.muzzle.MuzzleMavenRepoUtils
 import datadog.gradle.plugin.muzzle.TestedArtifact
 import org.eclipse.aether.util.version.GenericVersionScheme
-import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.TaskAction
 import java.util.TreeMap
 

buildSrc/src/main/kotlin/datadog/gradle/plugin/muzzle/tasks/MuzzleGetReferencesTask.kt

@@ -9,10 +9,6 @@ import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
 import org.gradle.build.event.BuildEventsListenerRegistry
-import org.gradle.tooling.events.FinishEvent
-import org.gradle.tooling.events.OperationCompletionListener
-import org.gradle.tooling.events.task.TaskFinishEvent
-import org.gradle.tooling.events.task.TaskSuccessResult
 import java.io.PrintWriter
 import java.io.StringWriter
 import java.lang.reflect.Method

communication/build.gradle.kts

@@ -29,7 +29,10 @@ dependencies {
   testImplementation(
     group = "com.squareup.okhttp3",
     name = "mockwebserver",
-    version = libs.versions.okhttp.legacy.get() // actually a version range
+    version =
+      libs.versions.okhttp.legacy
+        .get(),
+    // actually a version range
   )
 }
 
@@ -57,15 +60,15 @@ val excludedClassesCoverage by extra(
     "datadog.communication.IntakeApi",
     "datadog.communication.util.IOUtils",
     "datadog.communication.util.IOUtils.1",
-  )
+  ),
 )
 val excludedClassesBranchCoverage by extra(
   listOf(
     "datadog.communication.ddagent.TracerVersion",
     "datadog.communication.BackendApiFactory",
     "datadog.communication.EvpProxyApi",
     "datadog.communication.IntakeApi",
-  )
+  ),
 )
 val excludedClassesInstructionCoverage by extra(
   listOf(
@@ -79,5 +82,5 @@ val excludedClassesInstructionCoverage by extra(
     "datadog.communication.IntakeApi",
     "datadog.communication.util.IOUtils",
     "datadog.communication.util.IOUtils.1",
-  )
+  ),
 )

components/context/src/main/java/datadog/context/ContextKey.java

@@ -10,8 +10,10 @@
  */
 public final class ContextKey<T> {
   private static final AtomicInteger NEXT_INDEX = new AtomicInteger(0);
+
   /** The key name, for debugging purpose only. */
   private final String name;
+
   /** The key unique context, related to {@link IndexedContext} implementation. */
   final int index;