Skip to content

Commit 72fab39

Browse files
authored
Merge pull request #26 from zeitlinger/fix/okhttp4-resource-path
fix: okhttp4 resource path rename and unpin hardcoded okhttp version
2 parents 6a71d7a + d1294a8 commit 72fab39

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

exporters/otlp/testing-internal/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencies {
2727

2828
api("io.opentelemetry.proto:opentelemetry-proto")
2929
api("org.junit.jupiter:junit-jupiter-api")
30-
implementation("com.squareup.okhttp3:okhttp:5.3.2")
30+
implementation("com.squareup.okhttp3:okhttp")
3131
implementation("org.junit.jupiter:junit-jupiter-params")
3232

3333
implementation("com.linecorp.armeria:armeria-grpc")

exporters/sender/okhttp4/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ val generateMainResources by tasks.registering(Sync::class) {
3232
from(okhttpDir.resolve("src/main/resources"))
3333
into(layout.buildDirectory.dir("generated/sources/okhttp4/main/resources"))
3434
filter { line: String -> line.replace("sender.okhttp.internal", "sender.okhttp4.internal") }
35+
eachFile { path = path.replace("sender/okhttp/internal", "sender/okhttp4/internal") }
3536
includeEmptyDirs = false
3637
}
3738

0 commit comments

Comments
 (0)