Skip to content

Commit 815a9a0

Browse files
committed
Check with the most recent OkHttp branch
1 parent 76f4414 commit 815a9a0

3 files changed

Lines changed: 23 additions & 25 deletions

File tree

api-client/src/test/java/de/gesellix/docker/remote/api/client/ExecApiIntegrationTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import okio.Sink;
1616

1717
import org.junit.jupiter.api.BeforeEach;
18-
import org.junit.jupiter.api.Disabled;
1918
import org.junit.jupiter.api.Test;
2019

2120
import static de.gesellix.docker.remote.api.testutil.Constants.LABEL_KEY;
@@ -104,8 +103,6 @@ public void containerExecNonInteractive() {
104103
}
105104

106105
@Test
107-
// see https://github.com/square/okhttp/pull/9159
108-
@Disabled("Pending OkHttp to support upgrade requests with non-empty body")
109106
public void containerExecInteractive() {
110107
removeContainer(engineApiClient, "container-exec-interactive-test");
111108

build.gradle.kts

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,21 @@ val dependencyVersionsByGroup = mapOf(
4040
subprojects {
4141
repositories {
4242
// mavenLocal()
43-
// listOf<String>(
44-
// "gesellix/okhttp",
45-
//// "docker-client/*",
46-
// ).forEach { slug ->
47-
//// fun findProperty(s: String) = project.findProperty(s) as String?
48-
// maven {
49-
// name = "githubPackages"
50-
// url = uri("https://maven.pkg.github.com/${slug}")
51-
// credentials(PasswordCredentials::class)
52-
//// credentials {
53-
//// username = System.getenv("PACKAGE_REGISTRY_USER") ?: findProperty("github.package-registry.username")
54-
//// password = System.getenv("PACKAGE_REGISTRY_TOKEN") ?: findProperty("github.package-registry.password")
55-
//// }
56-
// }
57-
// }
43+
listOf<String>(
44+
"gesellix/okhttp",
45+
// "docker-client/*",
46+
).forEach { slug ->
47+
// fun findProperty(s: String) = project.findProperty(s) as String?
48+
maven {
49+
name = "githubPackages"
50+
url = uri("https://maven.pkg.github.com/${slug}")
51+
credentials(PasswordCredentials::class)
52+
// credentials {
53+
// username = System.getenv("PACKAGE_REGISTRY_USER") ?: findProperty("github.package-registry.username")
54+
// password = System.getenv("PACKAGE_REGISTRY_TOKEN") ?: findProperty("github.package-registry.password")
55+
// }
56+
}
57+
}
5858
mavenCentral()
5959
}
6060
}
@@ -70,12 +70,12 @@ allprojects {
7070
useVersion(forcedVersion)
7171
}
7272
}
73-
// dependencySubstitution {
74-
// substitute(module("com.squareup.okhttp3:okhttp"))
75-
// .using(module("de.gesellix.okhttp3-forked:okhttp:${libs.versions.okhttp.get()}"))
76-
// substitute(module("com.squareup.okhttp3:okhttp-jvm"))
77-
// .using(module("de.gesellix.okhttp3-forked:okhttp-jvm:${libs.versions.okhttp.get()}"))
78-
// }
73+
dependencySubstitution {
74+
substitute(module("com.squareup.okhttp3:okhttp"))
75+
.using(module("de.gesellix.okhttp3-forked:okhttp:${libs.versions.okhttp.get()}"))
76+
substitute(module("com.squareup.okhttp3:okhttp-jvm"))
77+
.using(module("de.gesellix.okhttp3-forked:okhttp-jvm:${libs.versions.okhttp.get()}"))
78+
}
7979
}
8080
}
8181
}

gradle/libs.versions.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ logback = "1.3.15"
77
logbackVersionrange = "[1.2,2)"
88
moshi = "1.15.2"
99
moshiVersionrange = "[1.12.0,2)"
10-
okhttp = "5.2.1"
10+
okhttp = "5.3.0-2025-10-30T12-24-11"
11+
#okhttp = "5.2.1"
1112
okhttpVersionrange = "[4,6)"
1213
okio = "3.16.2"
1314
okioVersionrange = "[3,4)"

0 commit comments

Comments
 (0)