Skip to content

Commit 4da64b3

Browse files
committed
Convert examples/distro Gradle build to Kotlin
Migrate examples/distro/build.gradle from Groovy to Kotlin DSL for improved consistency with the rest of the repository. Most of the instrumentation repository (608 files) already uses Kotlin for Gradle build files. This migration converts one of the remaining Groovy files to match the established pattern. Fixes #15794 Signed-off-by: Sibasis Padhi <sibasis.padhi@gmail.com>
1 parent be30e0c commit 4da64b3

1 file changed

Lines changed: 29 additions & 28 deletions

File tree

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,49 @@
1-
group 'io.opentelemetry.example'
2-
version '1.0-SNAPSHOT'
1+
group = "io.opentelemetry.example"
2+
version = "1.0-SNAPSHOT"
33

44
buildscript {
55
repositories {
66
maven {
7-
url "https://plugins.gradle.org/m2/"
7+
url = uri("https://plugins.gradle.org/m2/")
88
}
99
maven {
1010
name = "sonatype"
1111
url = uri("https://central.sonatype.com/repository/maven-snapshots/")
1212
}
1313
}
1414
dependencies {
15-
classpath "com.diffplug.spotless:spotless-plugin-gradle:8.1.0"
16-
classpath "com.gradleup.shadow:shadow-gradle-plugin:9.3.1"
17-
classpath "io.opentelemetry.instrumentation:gradle-plugins:2.24.0-alpha-SNAPSHOT"
15+
classpath("com.diffplug.spotless:spotless-plugin-gradle:8.1.0")
16+
classpath("com.gradleup.shadow:shadow-gradle-plugin:9.3.1")
17+
classpath("io.opentelemetry.instrumentation:gradle-plugins:2.24.0-alpha-SNAPSHOT")
1818
}
1919
}
2020

2121
subprojects {
2222
version = rootProject.version
2323

24-
apply plugin: "java"
25-
apply plugin: "com.diffplug.spotless"
24+
apply(plugin = "java")
25+
apply(plugin = "com.diffplug.spotless")
2626

27-
ext {
28-
versions = [
29-
// this line is managed by .github/scripts/update-sdk-version.sh
30-
opentelemetrySdk : "1.57.0",
27+
val versions = mapOf(
28+
// this line is managed by .github/scripts/update-sdk-version.sh
29+
"opentelemetrySdk" to "1.57.0",
3130

32-
// these lines are managed by .github/scripts/update-version.sh
33-
opentelemetryJavaagent : "2.24.0-SNAPSHOT",
34-
opentelemetryJavaagentAlpha: "2.24.0-alpha-SNAPSHOT",
31+
// these lines are managed by .github/scripts/update-version.sh
32+
"opentelemetryJavaagent" to "2.24.0-SNAPSHOT",
33+
"opentelemetryJavaagentAlpha" to "2.24.0-alpha-SNAPSHOT",
3534

36-
autoservice : "1.1.1"
37-
]
35+
"autoservice" to "1.1.1"
36+
)
3837

39-
deps = [
40-
autoservice: [
41-
"com.google.auto.service:auto-service:${versions.autoservice}",
42-
"com.google.auto.service:auto-service-annotations:${versions.autoservice}",
43-
]
44-
]
45-
}
38+
val deps = mapOf(
39+
"autoservice" to listOf(
40+
"com.google.auto.service:auto-service:${versions["autoservice"]}",
41+
"com.google.auto.service:auto-service-annotations:${versions["autoservice"]}"
42+
)
43+
)
44+
45+
extra["versions"] = versions
46+
extra["deps"] = deps
4647

4748
repositories {
4849
mavenCentral()
@@ -52,7 +53,7 @@ subprojects {
5253
}
5354
}
5455

55-
spotless {
56+
configure<com.diffplug.gradle.spotless.SpotlessExtension> {
5657
java {
5758
googleJavaFormat()
5859
licenseHeaderFile(rootProject.file("../../buildscripts/spotless.license.java"), "(package|import|public)")
@@ -61,11 +62,11 @@ subprojects {
6162
}
6263

6364
dependencies {
64-
implementation(platform("io.opentelemetry:opentelemetry-bom:${versions.opentelemetrySdk}"))
65+
implementation(platform("io.opentelemetry:opentelemetry-bom:${versions["opentelemetrySdk"]}"))
6566

6667
// these serve as a test of the instrumentation boms
67-
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:${versions.opentelemetryJavaagent}"))
68-
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${versions.opentelemetryJavaagentAlpha}"))
68+
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:${versions["opentelemetryJavaagent"]}"))
69+
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${versions["opentelemetryJavaagentAlpha"]}"))
6970

7071
testImplementation("org.mockito:mockito-core:5.21.0")
7172

0 commit comments

Comments
 (0)