Skip to content

Commit 3bfe40d

Browse files
getsentry-botgetsentry-bot
committed
Format code
1 parent 00c8173 commit 3bfe40d

File tree

5 files changed

+178
-115
lines changed

5 files changed

+178
-115
lines changed

‎sentry-samples/sentry-samples-netflix-dgs/build.gradle.kts‎

Lines changed: 35 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -40,32 +40,45 @@ dependencies {
4040
// Shadow 9.x enforces DuplicatesStrategy before transformers run, so the `append`
4141
// transformer only sees one copy of each file. We pre-merge Spring metadata files
4242
// from the runtime classpath and include the merged result in the shadow JAR.
43-
val mergeSpringMetadata by tasks.registering {
44-
val outputDir = project.layout.buildDirectory.dir("merged-spring-metadata/META-INF")
45-
val filesToMerge =
46-
listOf("spring.factories", "spring.handlers", "spring.schemas", "spring-autoconfigure-metadata.properties")
47-
outputs.dir(outputDir)
48-
inputs.files(configurations.runtimeClasspath)
49-
doLast {
50-
val out = outputDir.get().asFile
51-
out.mkdirs()
52-
filesToMerge.forEach { fileName ->
53-
val merged = StringBuilder()
54-
configurations.runtimeClasspath.get().filter { it.name.endsWith(".jar") }.forEach { jar ->
55-
try {
56-
val zip = ZipFile(jar)
57-
val entry = zip.getEntry("META-INF/$fileName")
58-
if (entry != null) {
59-
merged.append(zip.getInputStream(entry).bufferedReader().readText())
60-
if (!merged.endsWith("\n")) merged.append("\n")
43+
val mergeSpringMetadata by
44+
tasks.registering {
45+
val outputDir = project.layout.buildDirectory.dir("merged-spring-metadata/META-INF")
46+
val filesToMerge =
47+
listOf(
48+
"spring.factories",
49+
"spring.handlers",
50+
"spring.schemas",
51+
"spring-autoconfigure-metadata.properties",
52+
)
53+
outputs.dir(outputDir)
54+
inputs.files(configurations.runtimeClasspath)
55+
doLast {
56+
val out = outputDir.get().asFile
57+
out.mkdirs()
58+
filesToMerge.forEach { fileName ->
59+
val merged = StringBuilder()
60+
configurations.runtimeClasspath
61+
.get()
62+
.filter { it.name.endsWith(".jar") }
63+
.forEach { jar ->
64+
try {
65+
val zip = ZipFile(jar)
66+
val entry = zip.getEntry("META-INF/$fileName")
67+
if (entry != null) {
68+
merged.append(zip.getInputStream(entry).bufferedReader().readText())
69+
if (!merged.endsWith("\n")) merged.append("\n")
70+
}
71+
zip.close()
72+
} catch (e: Exception) {
73+
/* skip non-zip files */
74+
}
6175
}
62-
zip.close()
63-
} catch (e: Exception) { /* skip non-zip files */ }
76+
if (merged.isNotEmpty()) {
77+
File(out, fileName).writeText(merged.toString())
78+
}
6479
}
65-
if (merged.isNotEmpty()) { File(out, fileName).writeText(merged.toString()) }
6680
}
6781
}
68-
}
6982

7083
// Configure the Shadow JAR (executable JAR with all dependencies)
7184
tasks.shadowJar {

‎sentry-samples/sentry-samples-spring-boot-opentelemetry-noagent/build.gradle.kts‎

Lines changed: 35 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -81,32 +81,45 @@ dependencies {
8181
// Shadow 9.x enforces DuplicatesStrategy before transformers run, so the `append`
8282
// transformer only sees one copy of each file. We pre-merge Spring metadata files
8383
// from the runtime classpath and include the merged result in the shadow JAR.
84-
val mergeSpringMetadata by tasks.registering {
85-
val outputDir = project.layout.buildDirectory.dir("merged-spring-metadata/META-INF")
86-
val filesToMerge =
87-
listOf("spring.factories", "spring.handlers", "spring.schemas", "spring-autoconfigure-metadata.properties")
88-
outputs.dir(outputDir)
89-
inputs.files(configurations.runtimeClasspath)
90-
doLast {
91-
val out = outputDir.get().asFile
92-
out.mkdirs()
93-
filesToMerge.forEach { fileName ->
94-
val merged = StringBuilder()
95-
configurations.runtimeClasspath.get().filter { it.name.endsWith(".jar") }.forEach { jar ->
96-
try {
97-
val zip = ZipFile(jar)
98-
val entry = zip.getEntry("META-INF/$fileName")
99-
if (entry != null) {
100-
merged.append(zip.getInputStream(entry).bufferedReader().readText())
101-
if (!merged.endsWith("\n")) merged.append("\n")
84+
val mergeSpringMetadata by
85+
tasks.registering {
86+
val outputDir = project.layout.buildDirectory.dir("merged-spring-metadata/META-INF")
87+
val filesToMerge =
88+
listOf(
89+
"spring.factories",
90+
"spring.handlers",
91+
"spring.schemas",
92+
"spring-autoconfigure-metadata.properties",
93+
)
94+
outputs.dir(outputDir)
95+
inputs.files(configurations.runtimeClasspath)
96+
doLast {
97+
val out = outputDir.get().asFile
98+
out.mkdirs()
99+
filesToMerge.forEach { fileName ->
100+
val merged = StringBuilder()
101+
configurations.runtimeClasspath
102+
.get()
103+
.filter { it.name.endsWith(".jar") }
104+
.forEach { jar ->
105+
try {
106+
val zip = ZipFile(jar)
107+
val entry = zip.getEntry("META-INF/$fileName")
108+
if (entry != null) {
109+
merged.append(zip.getInputStream(entry).bufferedReader().readText())
110+
if (!merged.endsWith("\n")) merged.append("\n")
111+
}
112+
zip.close()
113+
} catch (e: Exception) {
114+
/* skip non-zip files */
115+
}
102116
}
103-
zip.close()
104-
} catch (e: Exception) { /* skip non-zip files */ }
117+
if (merged.isNotEmpty()) {
118+
File(out, fileName).writeText(merged.toString())
119+
}
105120
}
106-
if (merged.isNotEmpty()) { File(out, fileName).writeText(merged.toString()) }
107121
}
108122
}
109-
}
110123

111124
// Configure the Shadow JAR (executable JAR with all dependencies)
112125
tasks.shadowJar {

‎sentry-samples/sentry-samples-spring-boot-opentelemetry/build.gradle.kts‎

Lines changed: 35 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -77,32 +77,45 @@ dependencies {
7777
// Shadow 9.x enforces DuplicatesStrategy before transformers run, so the `append`
7878
// transformer only sees one copy of each file. We pre-merge Spring metadata files
7979
// from the runtime classpath and include the merged result in the shadow JAR.
80-
val mergeSpringMetadata by tasks.registering {
81-
val outputDir = project.layout.buildDirectory.dir("merged-spring-metadata/META-INF")
82-
val filesToMerge =
83-
listOf("spring.factories", "spring.handlers", "spring.schemas", "spring-autoconfigure-metadata.properties")
84-
outputs.dir(outputDir)
85-
inputs.files(configurations.runtimeClasspath)
86-
doLast {
87-
val out = outputDir.get().asFile
88-
out.mkdirs()
89-
filesToMerge.forEach { fileName ->
90-
val merged = StringBuilder()
91-
configurations.runtimeClasspath.get().filter { it.name.endsWith(".jar") }.forEach { jar ->
92-
try {
93-
val zip = ZipFile(jar)
94-
val entry = zip.getEntry("META-INF/$fileName")
95-
if (entry != null) {
96-
merged.append(zip.getInputStream(entry).bufferedReader().readText())
97-
if (!merged.endsWith("\n")) merged.append("\n")
80+
val mergeSpringMetadata by
81+
tasks.registering {
82+
val outputDir = project.layout.buildDirectory.dir("merged-spring-metadata/META-INF")
83+
val filesToMerge =
84+
listOf(
85+
"spring.factories",
86+
"spring.handlers",
87+
"spring.schemas",
88+
"spring-autoconfigure-metadata.properties",
89+
)
90+
outputs.dir(outputDir)
91+
inputs.files(configurations.runtimeClasspath)
92+
doLast {
93+
val out = outputDir.get().asFile
94+
out.mkdirs()
95+
filesToMerge.forEach { fileName ->
96+
val merged = StringBuilder()
97+
configurations.runtimeClasspath
98+
.get()
99+
.filter { it.name.endsWith(".jar") }
100+
.forEach { jar ->
101+
try {
102+
val zip = ZipFile(jar)
103+
val entry = zip.getEntry("META-INF/$fileName")
104+
if (entry != null) {
105+
merged.append(zip.getInputStream(entry).bufferedReader().readText())
106+
if (!merged.endsWith("\n")) merged.append("\n")
107+
}
108+
zip.close()
109+
} catch (e: Exception) {
110+
/* skip non-zip files */
111+
}
98112
}
99-
zip.close()
100-
} catch (e: Exception) { /* skip non-zip files */ }
113+
if (merged.isNotEmpty()) {
114+
File(out, fileName).writeText(merged.toString())
115+
}
101116
}
102-
if (merged.isNotEmpty()) { File(out, fileName).writeText(merged.toString()) }
103117
}
104118
}
105-
}
106119

107120
// Configure the Shadow JAR (executable JAR with all dependencies)
108121
tasks.shadowJar {

‎sentry-samples/sentry-samples-spring-boot-webflux/build.gradle.kts‎

Lines changed: 35 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -50,32 +50,45 @@ dependencies {
5050
// Shadow 9.x enforces DuplicatesStrategy before transformers run, so the `append`
5151
// transformer only sees one copy of each file. We pre-merge Spring metadata files
5252
// from the runtime classpath and include the merged result in the shadow JAR.
53-
val mergeSpringMetadata by tasks.registering {
54-
val outputDir = project.layout.buildDirectory.dir("merged-spring-metadata/META-INF")
55-
val filesToMerge =
56-
listOf("spring.factories", "spring.handlers", "spring.schemas", "spring-autoconfigure-metadata.properties")
57-
outputs.dir(outputDir)
58-
inputs.files(configurations.runtimeClasspath)
59-
doLast {
60-
val out = outputDir.get().asFile
61-
out.mkdirs()
62-
filesToMerge.forEach { fileName ->
63-
val merged = StringBuilder()
64-
configurations.runtimeClasspath.get().filter { it.name.endsWith(".jar") }.forEach { jar ->
65-
try {
66-
val zip = ZipFile(jar)
67-
val entry = zip.getEntry("META-INF/$fileName")
68-
if (entry != null) {
69-
merged.append(zip.getInputStream(entry).bufferedReader().readText())
70-
if (!merged.endsWith("\n")) merged.append("\n")
53+
val mergeSpringMetadata by
54+
tasks.registering {
55+
val outputDir = project.layout.buildDirectory.dir("merged-spring-metadata/META-INF")
56+
val filesToMerge =
57+
listOf(
58+
"spring.factories",
59+
"spring.handlers",
60+
"spring.schemas",
61+
"spring-autoconfigure-metadata.properties",
62+
)
63+
outputs.dir(outputDir)
64+
inputs.files(configurations.runtimeClasspath)
65+
doLast {
66+
val out = outputDir.get().asFile
67+
out.mkdirs()
68+
filesToMerge.forEach { fileName ->
69+
val merged = StringBuilder()
70+
configurations.runtimeClasspath
71+
.get()
72+
.filter { it.name.endsWith(".jar") }
73+
.forEach { jar ->
74+
try {
75+
val zip = ZipFile(jar)
76+
val entry = zip.getEntry("META-INF/$fileName")
77+
if (entry != null) {
78+
merged.append(zip.getInputStream(entry).bufferedReader().readText())
79+
if (!merged.endsWith("\n")) merged.append("\n")
80+
}
81+
zip.close()
82+
} catch (e: Exception) {
83+
/* skip non-zip files */
84+
}
7185
}
72-
zip.close()
73-
} catch (e: Exception) { /* skip non-zip files */ }
86+
if (merged.isNotEmpty()) {
87+
File(out, fileName).writeText(merged.toString())
88+
}
7489
}
75-
if (merged.isNotEmpty()) { File(out, fileName).writeText(merged.toString()) }
7690
}
7791
}
78-
}
7992

8093
// Configure the Shadow JAR (executable JAR with all dependencies)
8194
tasks.shadowJar {

‎sentry-samples/sentry-samples-spring-boot/build.gradle.kts‎

Lines changed: 38 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import java.util.zip.ZipFile
12
import org.jetbrains.kotlin.config.KotlinCompilerVersion
23
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
3-
import java.util.zip.ZipFile
44

55
plugins {
66
java
@@ -77,36 +77,47 @@ dependencies {
7777
// Shadow 9.x enforces DuplicatesStrategy before transformers run, so the `append`
7878
// transformer only sees one copy of each file. We pre-merge Spring metadata files
7979
// from the runtime classpath and include the merged result in the shadow JAR.
80-
val mergeSpringMetadata by tasks.registering {
81-
val outputDir = project.layout.buildDirectory.dir("merged-spring-metadata/META-INF")
82-
val filesToMerge =
83-
listOf("spring.factories", "spring.handlers", "spring.schemas", "spring-autoconfigure-metadata.properties")
84-
85-
outputs.dir(outputDir)
86-
inputs.files(configurations.runtimeClasspath)
87-
88-
doLast {
89-
val out = outputDir.get().asFile
90-
out.mkdirs()
91-
filesToMerge.forEach { fileName ->
92-
val merged = StringBuilder()
93-
configurations.runtimeClasspath.get().filter { it.name.endsWith(".jar") }.forEach { jar ->
94-
try {
95-
val zip = ZipFile(jar)
96-
val entry = zip.getEntry("META-INF/$fileName")
97-
if (entry != null) {
98-
merged.append(zip.getInputStream(entry).bufferedReader().readText())
99-
if (!merged.endsWith("\n")) merged.append("\n")
80+
val mergeSpringMetadata by
81+
tasks.registering {
82+
val outputDir = project.layout.buildDirectory.dir("merged-spring-metadata/META-INF")
83+
val filesToMerge =
84+
listOf(
85+
"spring.factories",
86+
"spring.handlers",
87+
"spring.schemas",
88+
"spring-autoconfigure-metadata.properties",
89+
)
90+
91+
outputs.dir(outputDir)
92+
inputs.files(configurations.runtimeClasspath)
93+
94+
doLast {
95+
val out = outputDir.get().asFile
96+
out.mkdirs()
97+
filesToMerge.forEach { fileName ->
98+
val merged = StringBuilder()
99+
configurations.runtimeClasspath
100+
.get()
101+
.filter { it.name.endsWith(".jar") }
102+
.forEach { jar ->
103+
try {
104+
val zip = ZipFile(jar)
105+
val entry = zip.getEntry("META-INF/$fileName")
106+
if (entry != null) {
107+
merged.append(zip.getInputStream(entry).bufferedReader().readText())
108+
if (!merged.endsWith("\n")) merged.append("\n")
109+
}
110+
zip.close()
111+
} catch (e: Exception) {
112+
/* skip non-zip files */
113+
}
100114
}
101-
zip.close()
102-
} catch (e: Exception) { /* skip non-zip files */ }
103-
}
104-
if (merged.isNotEmpty()) {
105-
File(out, fileName).writeText(merged.toString())
115+
if (merged.isNotEmpty()) {
116+
File(out, fileName).writeText(merged.toString())
117+
}
106118
}
107119
}
108120
}
109-
}
110121

111122
// Configure the Shadow JAR (executable JAR with all dependencies)
112123
tasks.shadowJar {

0 commit comments

Comments
 (0)