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] <support@github.com>

* Fix spotless

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jack Berg <jberg@newrelic.com>
This commit is contained in:
dependabot[bot] 2023-01-03 12:32:35 -06:00 committed by GitHub
parent 7b92428281
commit 705a32292f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 12 deletions

View File

@ -2,7 +2,7 @@ plugins {
`kotlin-dsl` `kotlin-dsl`
// When updating, update below in dependencies too // When updating, update below in dependencies too
id("com.diffplug.spotless") version "6.12.0" id("com.diffplug.spotless") version "6.12.1"
} }
repositories { repositories {

View File

@ -44,7 +44,7 @@ afterEvaluate {
val substitutionSnippet = bomProjects.joinToString( val substitutionSnippet = bomProjects.joinToString(
separator = "\n", separator = "\n",
prefix = "dependencySubstitution {\n", prefix = "dependencySubstitution {\n",
postfix = "\n}\n" postfix = "\n}\n",
) { project -> ) { project ->
val publication = project.publishing.publications.getByName("mavenPublication") as MavenPublication val publication = project.publishing.publications.getByName("mavenPublication") as MavenPublication
" substitute(module(\"${publication.groupId}:${publication.artifactId}\")).using(project(\"${project.path}\"))" " substitute(module(\"${publication.groupId}:${publication.artifactId}\")).using(project(\"${project.path}\"))"

View File

@ -73,7 +73,7 @@ fun findArtifact(version: String): File {
val depModule = "io.opentelemetry:${base.archivesName.get()}:$version@jar" val depModule = "io.opentelemetry:${base.archivesName.get()}:$version@jar"
val depJar = "${base.archivesName.get()}-$version.jar" val depJar = "${base.archivesName.get()}-$version.jar"
val configuration: Configuration = configurations.detachedConfiguration( val configuration: Configuration = configurations.detachedConfiguration(
dependencies.create(depModule) dependencies.create(depModule),
) )
return files(configuration.files).filter { return files(configuration.files).filter {
it.name.equals(depJar) 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. // so publish the whole API. We do that by flipping this flag, and comparing the current against nothing.
onlyModified.set(false) onlyModified.set(false)
files() files()
} },
) )
// Reproduce defaults from https://github.com/melix/japicmp-gradle-plugin/blob/09f52739ef1fccda6b4310cf3f4b19dc97377024/src/main/java/me/champeau/gradle/japicmp/report/ViolationsGenerator.java#L130 // 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 val baseVersionString = if (apiBaseVersion == null) "latest" else baselineVersion
txtOutputFile.set( txtOutputFile.set(
apiNewVersion?.let { file("$rootDir/docs/apidiffs/${apiNewVersion}_vs_$baselineVersion/${base.archivesName.get()}.txt") } 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. // have the check task depend on the api comparison task, to make it more likely it will get used.

View File

@ -60,8 +60,8 @@ tasks {
"-Xlint:-options", "-Xlint:-options",
// Fail build on any warning // Fail build on any warning
"-Werror" "-Werror",
) ),
) )
} }
@ -81,7 +81,7 @@ tasks {
javaLauncher.set( javaLauncher.set(
javaToolchains.launcherFor { javaToolchains.launcherFor {
languageVersion.set(JavaLanguageVersion.of(testJavaVersion.majorVersion)) languageVersion.set(JavaLanguageVersion.of(testJavaVersion.majorVersion))
} },
) )
} }
@ -125,7 +125,7 @@ tasks {
"Built-By" to System.getProperty("user.name"), "Built-By" to System.getProperty("user.name"),
"Built-JDK" to System.getProperty("java.version"), "Built-JDK" to System.getProperty("java.version"),
"Implementation-Title" to project.name, "Implementation-Title" to project.name,
"Implementation-Version" to project.version "Implementation-Version" to project.version,
) )
} }
} }
@ -200,10 +200,10 @@ dependencies {
class TestArgumentsProvider( class TestArgumentsProvider(
@InputFile @InputFile
@PathSensitive(PathSensitivity.RELATIVE) @PathSensitive(PathSensitivity.RELATIVE)
val loggingProperties: File val loggingProperties: File,
) : CommandLineArgumentProvider { ) : CommandLineArgumentProvider {
override fun asArguments() = listOf( override fun asArguments() = listOf(
"-Djava.util.logging.config.file=${loggingProperties.absolutePath}" "-Djava.util.logging.config.file=${loggingProperties.absolutePath}",
) )
} }

View File

@ -40,7 +40,7 @@ spotless {
"src/**/*.md", "src/**/*.md",
"docs/**/*.md", "docs/**/*.md",
"*.sh", "*.sh",
"src/**/*.properties" "src/**/*.properties",
) )
indentWithSpaces() indentWithSpaces()
trimTrailingWhitespace() trimTrailingWhitespace()