diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 517ec938c5..709c35f210 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -2,7 +2,7 @@ plugins { `kotlin-dsl` // When updating, update below in dependencies too - id("com.diffplug.spotless") version "6.12.0" + id("com.diffplug.spotless") version "6.12.1" } repositories { diff --git a/buildSrc/src/main/kotlin/otel.bom-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.bom-conventions.gradle.kts index e1c71c26e1..f504ce1d22 100644 --- a/buildSrc/src/main/kotlin/otel.bom-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.bom-conventions.gradle.kts @@ -44,7 +44,7 @@ afterEvaluate { val substitutionSnippet = bomProjects.joinToString( separator = "\n", prefix = "dependencySubstitution {\n", - postfix = "\n}\n" + postfix = "\n}\n", ) { project -> val publication = project.publishing.publications.getByName("mavenPublication") as MavenPublication " substitute(module(\"${publication.groupId}:${publication.artifactId}\")).using(project(\"${project.path}\"))" diff --git a/buildSrc/src/main/kotlin/otel.japicmp-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.japicmp-conventions.gradle.kts index 37b176efb7..65671f7728 100644 --- a/buildSrc/src/main/kotlin/otel.japicmp-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.japicmp-conventions.gradle.kts @@ -73,7 +73,7 @@ fun findArtifact(version: String): File { val depModule = "io.opentelemetry:${base.archivesName.get()}:$version@jar" val depJar = "${base.archivesName.get()}-$version.jar" val configuration: Configuration = configurations.detachedConfiguration( - dependencies.create(depModule) + dependencies.create(depModule), ) return files(configuration.files).filter { it.name.equals(depJar) @@ -110,7 +110,7 @@ if (!project.hasProperty("otel.release") && !project.name.startsWith("bom")) { // so publish the whole API. We do that by flipping this flag, and comparing the current against nothing. onlyModified.set(false) files() - } + }, ) // Reproduce defaults from https://github.com/melix/japicmp-gradle-plugin/blob/09f52739ef1fccda6b4310cf3f4b19dc97377024/src/main/java/me/champeau/gradle/japicmp/report/ViolationsGenerator.java#L130 @@ -133,7 +133,7 @@ if (!project.hasProperty("otel.release") && !project.name.startsWith("bom")) { val baseVersionString = if (apiBaseVersion == null) "latest" else baselineVersion txtOutputFile.set( apiNewVersion?.let { file("$rootDir/docs/apidiffs/${apiNewVersion}_vs_$baselineVersion/${base.archivesName.get()}.txt") } - ?: file("$rootDir/docs/apidiffs/current_vs_$baseVersionString/${base.archivesName.get()}.txt") + ?: file("$rootDir/docs/apidiffs/current_vs_$baseVersionString/${base.archivesName.get()}.txt"), ) } // have the check task depend on the api comparison task, to make it more likely it will get used. diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts index a08e3875e5..279f3d62ba 100644 --- a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts @@ -60,8 +60,8 @@ tasks { "-Xlint:-options", // Fail build on any warning - "-Werror" - ) + "-Werror", + ), ) } @@ -81,7 +81,7 @@ tasks { javaLauncher.set( javaToolchains.launcherFor { languageVersion.set(JavaLanguageVersion.of(testJavaVersion.majorVersion)) - } + }, ) } @@ -125,7 +125,7 @@ tasks { "Built-By" to System.getProperty("user.name"), "Built-JDK" to System.getProperty("java.version"), "Implementation-Title" to project.name, - "Implementation-Version" to project.version + "Implementation-Version" to project.version, ) } } @@ -200,10 +200,10 @@ dependencies { class TestArgumentsProvider( @InputFile @PathSensitive(PathSensitivity.RELATIVE) - val loggingProperties: File + val loggingProperties: File, ) : CommandLineArgumentProvider { override fun asArguments() = listOf( - "-Djava.util.logging.config.file=${loggingProperties.absolutePath}" + "-Djava.util.logging.config.file=${loggingProperties.absolutePath}", ) } diff --git a/buildSrc/src/main/kotlin/otel.spotless-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.spotless-conventions.gradle.kts index 5c96bddc1b..c4ac72f3b0 100644 --- a/buildSrc/src/main/kotlin/otel.spotless-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.spotless-conventions.gradle.kts @@ -40,7 +40,7 @@ spotless { "src/**/*.md", "docs/**/*.md", "*.sh", - "src/**/*.properties" + "src/**/*.properties", ) indentWithSpaces() trimTrailingWhitespace()