Skip to content

Commit f2b1f33

Browse files
committed
Fix version update script and use idiomatic Kotlin DSL
1 parent e9fcf73 commit f2b1f33

2 files changed

Lines changed: 14 additions & 12 deletions

File tree

.github/scripts/update-version.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@ fi
1111
sed -Ei "s/val stableVersion = \"[^\"]*\"/val stableVersion = \"$version\"/" version.gradle.kts
1212
sed -Ei "s/val alphaVersion = \"[^\"]*\"/val alphaVersion = \"$alpha_version\"/" version.gradle.kts
1313

14-
sed -Ei "s/(opentelemetryJavaagent *: )\"[^\"]*\"/\1\"$version\"/" examples/distro/build.gradle
15-
sed -Ei "s/(opentelemetryJavaagentAlpha *: )\"[^\"]*\"/\1\"$alpha_version\"/" examples/distro/build.gradle
14+
sed -Ei "s/(\"opentelemetryJavaagent\" to )\"[^\"]*\"/\1\"$version\"/" examples/distro/build.gradle.kts
15+
sed -Ei "s/(\"opentelemetryJavaagentAlpha\" to )\"[^\"]*\"/\1\"$alpha_version\"/" examples/distro/build.gradle.kts
16+
17+
sed -Ei "s/(classpath\(\"io\.opentelemetry\.instrumentation:gradle-plugins:)[^\"]*(\"\)\))/\1$alpha_version\2/" examples/distro/build.gradle.kts
18+
1619

17-
sed -Ei "s/(classpath \"io.opentelemetry.instrumentation:gradle-plugins:)[^\"]*\"/\1$alpha_version\"/" examples/distro/build.gradle
1820

1921
sed -Ei "s/(opentelemetryJavaagent *: )\"[^\"]*\"/\1\"$version\"/" examples/extension/build.gradle
2022
sed -Ei "s/(opentelemetryJavaagentAlpha *: )\"[^\"]*\"/\1\"$alpha_version\"/" examples/extension/build.gradle

examples/distro/build.gradle.kts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ subprojects {
2626

2727
val versions = mapOf(
2828
// this line is managed by .github/scripts/update-sdk-version.sh
29-
"opentelemetrySdk" to "1.57.0",
29+
"opentelemetrySdk" to "1.58.0",
3030

3131
// these lines are managed by .github/scripts/update-version.sh
3232
"opentelemetryJavaagent" to "2.24.0-SNAPSHOT",
@@ -63,18 +63,18 @@ subprojects {
6363

6464
plugins.withType<JavaPlugin> {
6565
dependencies {
66-
add("implementation", platform("io.opentelemetry:opentelemetry-bom:${versions["opentelemetrySdk"]}"))
66+
implementation(platform("io.opentelemetry:opentelemetry-bom:${versions["opentelemetrySdk"]}"))
6767

6868
// these serve as a test of the instrumentation boms
69-
add("implementation", platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:${versions["opentelemetryJavaagent"]}"))
70-
add("implementation", platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${versions["opentelemetryJavaagentAlpha"]}"))
69+
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:${versions["opentelemetryJavaagent"]}"))
70+
implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${versions["opentelemetryJavaagentAlpha"]}"))
7171

72-
add("testImplementation", "org.mockito:mockito-core:5.21.0")
72+
testImplementation("org.mockito:mockito-core:5.21.0")
7373

74-
add("testImplementation", enforcedPlatform("org.junit:junit-bom:5.14.2"))
75-
add("testImplementation", "org.junit.jupiter:junit-jupiter-api")
76-
add("testRuntimeOnly", "org.junit.jupiter:junit-jupiter-engine")
77-
add("testRuntimeOnly", "org.junit.platform:junit-platform-launcher")
74+
testImplementation(enforcedPlatform("org.junit:junit-bom:5.14.2"))
75+
testImplementation("org.junit.jupiter:junit-jupiter-api")
76+
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
77+
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
7878
}
7979
}
8080

0 commit comments

Comments
 (0)