Skip to content

Commit e7d67c4

Browse files
fix(deps): update spotless packages to v8 (major) (open-telemetry#14784)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: otelbot <[email protected]>
1 parent fbdb9cb commit e7d67c4

File tree

7 files changed

+21
-15
lines changed

7 files changed

+21
-15
lines changed

benchmark-overhead/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id("java")
3-
id("com.diffplug.spotless") version "7.2.1"
3+
id("com.diffplug.spotless") version "8.0.0"
44
}
55

66
spotless {

conventions/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
`kotlin-dsl`
33
// When updating, update below in dependencies too
4-
id("com.diffplug.spotless") version "7.2.1"
4+
id("com.diffplug.spotless") version "8.0.0"
55
}
66

77
spotless {
@@ -54,7 +54,7 @@ dependencies {
5454
implementation("org.apache.maven:maven-aether-provider:3.3.9")
5555

5656
// When updating, update above in plugins too
57-
implementation("com.diffplug.spotless:spotless-plugin-gradle:7.2.1")
57+
implementation("com.diffplug.spotless:spotless-plugin-gradle:8.0.0")
5858
implementation("com.google.guava:guava:33.5.0-jre")
5959
implementation("com.gradleup.shadow:shadow-gradle-plugin:9.2.1")
6060
implementation("org.apache.httpcomponents:httpclient:4.5.14")

custom-checks/src/test/java/io/opentelemetry/javaagent/customchecks/OtelInternalJavadocTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class OtelInternalJavadocTest {
1414
void test() {
1515
doTest(
1616
"internal/InternalJavadocPositiveCases.java",
17-
"""
17+
"""
1818
package io.opentelemetry.javaagent.customchecks.internal;
1919
2020
// BUG: Diagnostic contains: doesn't end with any of the applicable javadoc disclaimers
@@ -30,7 +30,7 @@ public static class Two {}
3030
""");
3131
doTest(
3232
"internal/InternalJavadocNegativeCases.java",
33-
"""
33+
"""
3434
package io.opentelemetry.javaagent.customchecks.internal;
3535
3636
/**

examples/distro/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212
}
1313
}
1414
dependencies {
15-
classpath "com.diffplug.spotless:spotless-plugin-gradle:7.2.1"
15+
classpath "com.diffplug.spotless:spotless-plugin-gradle:8.0.0"
1616
classpath "com.gradleup.shadow:shadow-gradle-plugin:9.2.1"
1717
classpath "io.opentelemetry.instrumentation:gradle-plugins:2.21.0-alpha-SNAPSHOT"
1818
}

examples/extension/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ plugins {
1111
See https://imperceptiblethoughts.com/shadow/ for more details about Shadow plugin.
1212
*/
1313
id "com.gradleup.shadow" version "9.2.1"
14-
id "com.diffplug.spotless" version "7.2.1"
14+
id "com.diffplug.spotless" version "8.0.0"
1515

1616
id "io.opentelemetry.instrumentation.muzzle-generation" version "2.21.0-alpha-SNAPSHOT"
1717
id "io.opentelemetry.instrumentation.muzzle-check" version "2.21.0-alpha-SNAPSHOT"

instrumentation-docs/src/test/java/io/opentelemetry/instrumentation/docs/auditors/SupportedLibrariesAuditorTest.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ void testPerformAuditWithMissingItems() throws IOException, InterruptedException
7373
}
7474

7575
private static String createLocalSupportedLibrariesContent() {
76-
return """
76+
return
77+
"""
7778
# Supported libraries, frameworks, application servers, and JVMs
7879
7980
We automatically instrument and support a huge number of libraries, frameworks,
@@ -105,7 +106,8 @@ private static String createLocalSupportedLibrariesContent() {
105106
}
106107

107108
private static String createRemoteSupportedLibrariesContent() {
108-
return """
109+
return
110+
"""
109111
# Supported libraries, frameworks, application servers, and JVMs
110112
111113
We automatically instrument and support a huge number of libraries, frameworks,
@@ -137,7 +139,8 @@ private static String createRemoteSupportedLibrariesContent() {
137139
}
138140

139141
private static String createRemoteSupportedLibrariesContentMissing() {
140-
return """
142+
return
143+
"""
141144
# Supported libraries, frameworks, application servers, and JVMs
142145
143146
We automatically instrument and support a huge number of libraries, frameworks,

instrumentation-docs/src/test/java/io/opentelemetry/instrumentation/docs/auditors/SuppressionListAuditorTest.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ void testGetAuditorName() {
8181
@Test
8282
void testParseDocumentationDisabledList() {
8383
String testFile =
84-
"""
84+
"""
8585
## Enable manual instrumentation only
8686
8787
You can suppress all auto instrumentations but have support for manual
@@ -116,7 +116,7 @@ void testParseDocumentationDisabledList() {
116116
@Test
117117
void testParseInstrumentationList() {
118118
String testList =
119-
"""
119+
"""
120120
libraries:
121121
activej:
122122
- name: activej-http-6.0
@@ -191,7 +191,8 @@ void testIdentifyMissingItemsWithHyphenatedMatch() {
191191
}
192192

193193
private static String createDisableListContent() {
194-
return """
194+
return
195+
"""
195196
## Enable manual instrumentation only
196197
197198
You can suppress all auto instrumentations but have support for manual
@@ -216,7 +217,8 @@ private static String createDisableListContent() {
216217
}
217218

218219
private static String createDisableListContentMissing() {
219-
return """
220+
return
221+
"""
220222
## Enable manual instrumentation only
221223
222224
You can suppress all auto instrumentations but have support for manual
@@ -240,7 +242,8 @@ private static String createDisableListContentMissing() {
240242
}
241243

242244
private static String createInstrumentationListContent() {
243-
return """
245+
return
246+
"""
244247
libraries:
245248
activej:
246249
- name: activej-http-6.0

0 commit comments

Comments
 (0)