Skip to content

Commit 705a322

Browse files
Bump com.diffplug.spotless from 6.12.0 to 6.12.1 (#5075)
* Bump com.diffplug.spotless from 6.12.0 to 6.12.1 Bumps com.diffplug.spotless from 6.12.0 to 6.12.1. --- updated-dependencies: - dependency-name: com.diffplug.spotless dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Fix spotless Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jack Berg <[email protected]>
1 parent 7b92428 commit 705a322

5 files changed

+12
-12
lines changed

buildSrc/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
`kotlin-dsl`
33

44
// When updating, update below in dependencies too
5-
id("com.diffplug.spotless") version "6.12.0"
5+
id("com.diffplug.spotless") version "6.12.1"
66
}
77

88
repositories {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ afterEvaluate {
4444
val substitutionSnippet = bomProjects.joinToString(
4545
separator = "\n",
4646
prefix = "dependencySubstitution {\n",
47-
postfix = "\n}\n"
47+
postfix = "\n}\n",
4848
) { project ->
4949
val publication = project.publishing.publications.getByName("mavenPublication") as MavenPublication
5050
" substitute(module(\"${publication.groupId}:${publication.artifactId}\")).using(project(\"${project.path}\"))"

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ fun findArtifact(version: String): File {
7373
val depModule = "io.opentelemetry:${base.archivesName.get()}:$version@jar"
7474
val depJar = "${base.archivesName.get()}-$version.jar"
7575
val configuration: Configuration = configurations.detachedConfiguration(
76-
dependencies.create(depModule)
76+
dependencies.create(depModule),
7777
)
7878
return files(configuration.files).filter {
7979
it.name.equals(depJar)
@@ -110,7 +110,7 @@ if (!project.hasProperty("otel.release") && !project.name.startsWith("bom")) {
110110
// so publish the whole API. We do that by flipping this flag, and comparing the current against nothing.
111111
onlyModified.set(false)
112112
files()
113-
}
113+
},
114114
)
115115

116116
// 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")) {
133133
val baseVersionString = if (apiBaseVersion == null) "latest" else baselineVersion
134134
txtOutputFile.set(
135135
apiNewVersion?.let { file("$rootDir/docs/apidiffs/${apiNewVersion}_vs_$baselineVersion/${base.archivesName.get()}.txt") }
136-
?: file("$rootDir/docs/apidiffs/current_vs_$baseVersionString/${base.archivesName.get()}.txt")
136+
?: file("$rootDir/docs/apidiffs/current_vs_$baseVersionString/${base.archivesName.get()}.txt"),
137137
)
138138
}
139139
// have the check task depend on the api comparison task, to make it more likely it will get used.

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ tasks {
6060
"-Xlint:-options",
6161

6262
// Fail build on any warning
63-
"-Werror"
64-
)
63+
"-Werror",
64+
),
6565
)
6666
}
6767

@@ -81,7 +81,7 @@ tasks {
8181
javaLauncher.set(
8282
javaToolchains.launcherFor {
8383
languageVersion.set(JavaLanguageVersion.of(testJavaVersion.majorVersion))
84-
}
84+
},
8585
)
8686
}
8787

@@ -125,7 +125,7 @@ tasks {
125125
"Built-By" to System.getProperty("user.name"),
126126
"Built-JDK" to System.getProperty("java.version"),
127127
"Implementation-Title" to project.name,
128-
"Implementation-Version" to project.version
128+
"Implementation-Version" to project.version,
129129
)
130130
}
131131
}
@@ -200,10 +200,10 @@ dependencies {
200200
class TestArgumentsProvider(
201201
@InputFile
202202
@PathSensitive(PathSensitivity.RELATIVE)
203-
val loggingProperties: File
203+
val loggingProperties: File,
204204
) : CommandLineArgumentProvider {
205205
override fun asArguments() = listOf(
206-
"-Djava.util.logging.config.file=${loggingProperties.absolutePath}"
206+
"-Djava.util.logging.config.file=${loggingProperties.absolutePath}",
207207
)
208208
}
209209

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ spotless {
4040
"src/**/*.md",
4141
"docs/**/*.md",
4242
"*.sh",
43-
"src/**/*.properties"
43+
"src/**/*.properties",
4444
)
4545
indentWithSpaces()
4646
trimTrailingWhitespace()

0 commit comments

Comments
 (0)