Skip to content

Unblock the Go pin and the Testcontainers 2 bump #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yschimke merged 2 commits into from
Aug 14, 2026
Merged

Unblock the Go pin and the Testcontainers 2 bump #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbd1489
Read the Go version from go.mod, so the pin can't outrun the toolchain
claude Aug 14, 2026
83bf815
Move to Testcontainers 2.0.5
claude Aug 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/test-server.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@ jobs:
- name: Configure Go
uses: actions/setup-go@v7.0.0
with:
go-version: '1.24.13'
# Read from go.mod rather than pinned here. The directive is the floor the
# module actually declares, and GOTOOLCHAIN is local on the runner, so a
# version written down twice is a version that can be raised in one place and
# fail the build from the other.
go-version-file: test-server/go.mod
cache-dependency-path: test-server/go.mod

- name: Vet and Test
Expand Down
2 changes: 1 addition & 1 deletion containers/src/test/kotlin/okhttp/testbed/containers/BasicLoomTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import org.junit.jupiter.api.parallel.Isolated
import org.mockserver.client.MockServerClient
import org.mockserver.model.HttpRequest.request
import org.mockserver.model.HttpResponse.response
import org.testcontainers.containers.MockServerContainer
import org.testcontainers.mockserver.MockServerContainer
import org.testcontainers.junit.jupiter.Container
import org.testcontainers.junit.jupiter.Testcontainers

Expand Down
2 changes: 1 addition & 1 deletion containers/src/test/kotlin/okhttp/testbed/containers/BasicMockServerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import org.mockserver.logging.MockServerLogger
import org.mockserver.model.HttpRequest.request
import org.mockserver.model.HttpResponse.response
import org.mockserver.socket.tls.KeyStoreFactory
import org.testcontainers.containers.MockServerContainer
import org.testcontainers.mockserver.MockServerContainer
import org.testcontainers.junit.jupiter.Container
import org.testcontainers.junit.jupiter.Testcontainers
import org.testcontainers.utility.DockerImageName
Expand Down
2 changes: 1 addition & 1 deletion containers/src/test/kotlin/okhttp/testbed/containers/BasicProxyTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import org.mockserver.model.HttpRequest.request
import org.mockserver.model.HttpResponse.response
import org.mockserver.proxyconfiguration.ProxyConfiguration
import org.mockserver.socket.tls.KeyStoreFactory
import org.testcontainers.containers.MockServerContainer
import org.testcontainers.mockserver.MockServerContainer
import org.testcontainers.junit.jupiter.Container
import org.testcontainers.junit.jupiter.Testcontainers

Expand Down
2 changes: 1 addition & 1 deletion containers/src/test/kotlin/okhttp/testbed/containers/SocksProxyTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import org.mockserver.client.MockServerClient
import org.mockserver.model.HttpRequest.request
import org.mockserver.model.HttpResponse.response
import org.testcontainers.containers.GenericContainer
import org.testcontainers.containers.MockServerContainer
import org.testcontainers.mockserver.MockServerContainer
import org.testcontainers.containers.Network
import org.testcontainers.junit.jupiter.Container
import org.testcontainers.junit.jupiter.Testcontainers
Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ okhttp = "5.4.0"
# ECH config list. Drop this back to `okhttp` once a release ships it.
ech-okhttp = "5.5.0-SNAPSHOT"
org-junit-jupiter = "5.14.4"
testcontainers = "1.21.4"
testcontainers = "2.0.5"

[libraries]
androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test-runner" }
Expand All @@ -32,11 +32,11 @@ junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", vers
junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit-platform" }
junit5android-core = { module = "de.mannodermaus.junit5:android-test-core", version.ref = "android-junit5" }
junit5android-runner = { module = "de.mannodermaus.junit5:android-test-runner", version.ref = "android-junit5" }
mockserver = { module = "org.testcontainers:mockserver", version.ref = "testcontainers" }
mockserver = { module = "org.testcontainers:testcontainers-mockserver", version.ref = "testcontainers" }
mockserver-client = { module = "org.mock-server:mockserver-client-java-no-dependencies", version.ref = "mockserver" }
okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
testcontainers = { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" }
testcontainers-junit5 = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainers" }
testcontainers-junit5 = { module = "org.testcontainers:testcontainers-junit-jupiter", version.ref = "testcontainers" }

[plugins]
android-junit5 = { id = "de.mannodermaus.android-junit5", version.ref = "android-junit5" }
Expand Down