From fe6bd254cd4f8483fd3c4d76b678b7f508ed512d Mon Sep 17 00:00:00 2001 From: Yuri Schimke Date: Sat, 29 Aug 2026 14:33:25 +0100 Subject: [PATCH] Delete container tests --- .github/workflows/build.yml | 2 +- .github/workflows/containers.yml | 37 --- container-tests/README.md | 5 - container-tests/build.gradle.kts | 50 ---- .../java/okhttp3/containers/BasicLoomTest.kt | 116 --------- .../okhttp3/containers/BasicMockServerTest.kt | 104 -------- .../java/okhttp3/containers/BasicProxyTest.kt | 228 ------------------ .../java/okhttp3/containers/SocksProxyTest.kt | 86 ------- gradle.properties | 1 - gradle/libs.versions.toml | 6 - settings.gradle.kts | 1 - 11 files changed, 1 insertion(+), 635 deletions(-) delete mode 100644 .github/workflows/containers.yml delete mode 100644 container-tests/README.md delete mode 100644 container-tests/build.gradle.kts delete mode 100644 container-tests/src/test/java/okhttp3/containers/BasicLoomTest.kt delete mode 100644 container-tests/src/test/java/okhttp3/containers/BasicMockServerTest.kt delete mode 100644 container-tests/src/test/java/okhttp3/containers/BasicProxyTest.kt delete mode 100644 container-tests/src/test/java/okhttp3/containers/SocksProxyTest.kt diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d346dff4f20e..b4361a440ef2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -446,7 +446,7 @@ jobs: # uses: gradle/actions/setup-gradle@v6 # # - name: Run Tests -# run: ./gradlew test allTests -Pokhttp.platform=loom -Ptest.java.version=24 -PcontainerTests=true +# run: ./gradlew test allTests -Pokhttp.platform=loom -Ptest.java.version=24 maven: runs-on: ubuntu-latest diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml deleted file mode 100644 index 63212a72abd8..000000000000 --- a/.github/workflows/containers.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: containers - -on: - push: - branches: - - main - pull_request: - types: [opened, labeled, unlabeled, synchronize] - -permissions: - contents: read - -env: - GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx4g -Dorg.gradle.daemon=false -Dkotlin.incremental=false" - -jobs: - test_containers: - permissions: - checks: write # for actions/upload-artifact - runs-on: ubuntu-latest - if: github.ref == 'refs/heads/main' || contains(github.event.pull_request.labels.*.name, 'containers') - - steps: - - name: Checkout - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - - name: Configure JDK - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0 - with: - distribution: 'temurin' - java-version: 21 - - - name: Setup Gradle - uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 - - - name: Run Container Tests - run: ./gradlew container-tests:test -PcontainerTests=true diff --git a/container-tests/README.md b/container-tests/README.md deleted file mode 100644 index 843f0ac2cc27..000000000000 --- a/container-tests/README.md +++ /dev/null @@ -1,5 +0,0 @@ -OkHttp Container Tests -====================== - -This module contains tests against other services -via containers. diff --git a/container-tests/build.gradle.kts b/container-tests/build.gradle.kts deleted file mode 100644 index 90c98809c3f1..000000000000 --- a/container-tests/build.gradle.kts +++ /dev/null @@ -1,50 +0,0 @@ -plugins { - kotlin("jvm") - id("okhttp.base-conventions") -} - -import okhttp3.buildsupport.platform -import okhttp3.buildsupport.testJavaVersion - -val platform = project.platform -val testJavaVersion = project.testJavaVersion - -tasks.withType { - useJUnitPlatform() - val isCi = providers.environmentVariable("CI") - val containerTests = providers.gradleProperty("containerTests") - onlyIf("By default not in CI") { - !isCi.isPresent - || (containerTests.isPresent && containerTests.get().toBoolean()) - } - - jvmArgs( - "-Dokhttp.platform=$platform", - ) - systemProperty("mockserver.version", libs.versions.mockserver.client.get()) - - if (platform == "loom") { - jvmArgs( - "-Djdk.tracePinnedThreads=short", - ) - } - - val javaToolchains = project.extensions.getByType() - javaLauncher.set(javaToolchains.launcherFor { - languageVersion.set(JavaLanguageVersion.of(testJavaVersion)) - }) -} - -dependencies { - api(projects.okhttp) - - testImplementation(projects.okhttpTestingSupport) - testImplementation(libs.junit.jupiter.api) - testImplementation(libs.junit.jupiter.params) - testImplementation(libs.junit.jupiter.engine) - testImplementation(libs.assertk) - testImplementation(libs.testcontainers) - testImplementation(libs.mockserver) - testImplementation(libs.mockserver.client) - testImplementation(libs.testcontainers.junit5) -} diff --git a/container-tests/src/test/java/okhttp3/containers/BasicLoomTest.kt b/container-tests/src/test/java/okhttp3/containers/BasicLoomTest.kt deleted file mode 100644 index 4f4f504afc8a..000000000000 --- a/container-tests/src/test/java/okhttp3/containers/BasicLoomTest.kt +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright (C) 2024 Square, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package okhttp3.containers - -import assertk.assertThat -import assertk.assertions.contains -import assertk.assertions.isEmpty -import assertk.assertions.isNotEmpty -import java.io.ByteArrayOutputStream -import java.io.PrintStream -import java.util.concurrent.ExecutorService -import java.util.concurrent.Executors -import okhttp3.Dispatcher -import okhttp3.HttpUrl.Companion.toHttpUrl -import okhttp3.OkHttpClient -import okhttp3.Request -import okhttp3.containers.BasicMockServerTest.Companion.MOCKSERVER_IMAGE -import okhttp3.containers.BasicMockServerTest.Companion.trustMockServer -import okhttp3.testing.PlatformRule -import org.junit.jupiter.api.AfterEach -import org.junit.jupiter.api.BeforeEach -import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.RegisterExtension -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.junit.jupiter.Container -import org.testcontainers.junit.jupiter.Testcontainers - -@Testcontainers -@Isolated -class BasicLoomTest { - @JvmField - @RegisterExtension - val platform = PlatformRule() - - // Use mock server so we are strictly testing OkHttp client only in this test. - // We should test MockWebServer later. - @Container - val mockServer: MockServerContainer = MockServerContainer(MOCKSERVER_IMAGE) - - val capturedOut = ByteArrayOutputStream() - - private lateinit var executor: ExecutorService - - private lateinit var client: OkHttpClient - - @BeforeEach - fun setUp() { - platform.assumeLoom() - assertThat(System.getProperty("jdk.tracePinnedThreads")).isNotEmpty() - - client = - OkHttpClient - .Builder() - .trustMockServer() - .dispatcher(Dispatcher(newVirtualThreadPerTaskExecutor())) - .build() - - executor = newVirtualThreadPerTaskExecutor() - - // Capture non-deterministic but probable sysout warnings of pinned threads - // https://docs.oracle.com/en/java/javase/21/core/virtual-threads.html - System.setOut(PrintStream(capturedOut)) - } - - @AfterEach - fun checkForPinning() { - assertThat(capturedOut.toString()).isEmpty() - } - - private fun newVirtualThreadPerTaskExecutor(): ExecutorService = - Executors::class.java.getMethod("newVirtualThreadPerTaskExecutor").invoke(null) as ExecutorService - - @Test - fun testHttpsRequest() { - MockServerClient(mockServer.host, mockServer.serverPort).use { mockServerClient -> - mockServerClient - .`when`( - request() - .withPath("/person") - .withQueryStringParameter("name", "peter"), - ).respond(response().withBody("Peter the person!")) - - val results = - (1..20).map { - executor.submit { - val response = - client.newCall(Request((mockServer.secureEndpoint + "/person?name=peter").toHttpUrl())).execute() - - val body = response.body.string() - assertThat(body).contains("Peter the person") - } - } - - results.forEach { - it.get() - } - } - } -} diff --git a/container-tests/src/test/java/okhttp3/containers/BasicMockServerTest.kt b/container-tests/src/test/java/okhttp3/containers/BasicMockServerTest.kt deleted file mode 100644 index d635187774a7..000000000000 --- a/container-tests/src/test/java/okhttp3/containers/BasicMockServerTest.kt +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright (C) 2024 Square, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package okhttp3.containers - -import assertk.assertThat -import assertk.assertions.contains -import javax.net.ssl.TrustManagerFactory -import javax.net.ssl.X509TrustManager -import okhttp3.HttpUrl.Companion.toHttpUrl -import okhttp3.OkHttpClient -import okhttp3.Request -import org.junit.jupiter.api.Test -import org.mockserver.client.MockServerClient -import org.mockserver.configuration.Configuration -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.junit.jupiter.Container -import org.testcontainers.junit.jupiter.Testcontainers -import org.testcontainers.utility.DockerImageName - -@Testcontainers -class BasicMockServerTest { - @Container - val mockServer: MockServerContainer = MockServerContainer(MOCKSERVER_IMAGE) - - val client = - OkHttpClient - .Builder() - .trustMockServer() - .build() - - @Test - fun testRequest() { - MockServerClient(mockServer.host, mockServer.serverPort).use { mockServerClient -> - mockServerClient - .`when`( - request() - .withPath("/person") - .withQueryStringParameter("name", "peter"), - ).respond(response().withBody("Peter the person!")) - - val response = client.newCall(Request((mockServer.endpoint + "/person?name=peter").toHttpUrl())).execute() - - assertThat(response.body.string()).contains("Peter the person") - } - } - - @Test - fun testHttpsRequest() { - MockServerClient(mockServer.host, mockServer.serverPort).use { mockServerClient -> - mockServerClient - .`when`( - request() - .withPath("/person") - .withQueryStringParameter("name", "peter"), - ).respond(response().withBody("Peter the person!")) - - val response = client.newCall(Request((mockServer.secureEndpoint + "/person?name=peter").toHttpUrl())).execute() - - assertThat(response.body.string()).contains("Peter the person") - } - } - - companion object { - private val mockServerVersion = - checkNotNull(System.getProperty("mockserver.version")) { - "mockserver.version is not set" - } - - val MOCKSERVER_IMAGE: DockerImageName = - DockerImageName - .parse("mockserver/mockserver") - .withTag("mockserver-$mockServerVersion") - - fun OkHttpClient.Builder.trustMockServer(): OkHttpClient.Builder = - apply { - val keyStoreFactory = KeyStoreFactory(Configuration.configuration(), MockServerLogger()) - - val socketFactory = keyStoreFactory.sslContext().socketFactory - - val trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()) - trustManagerFactory.init(keyStoreFactory.loadOrCreateKeyStore()) - val trustManager = trustManagerFactory.trustManagers.first() as X509TrustManager - - sslSocketFactory(socketFactory, trustManager) - } - } -} diff --git a/container-tests/src/test/java/okhttp3/containers/BasicProxyTest.kt b/container-tests/src/test/java/okhttp3/containers/BasicProxyTest.kt deleted file mode 100644 index a010cf9c2754..000000000000 --- a/container-tests/src/test/java/okhttp3/containers/BasicProxyTest.kt +++ /dev/null @@ -1,228 +0,0 @@ -/* - * Copyright (C) 2024 Square, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package okhttp3.containers - -import assertk.assertThat -import assertk.assertions.contains -import assertk.assertions.isEqualTo -import java.net.HttpURLConnection -import java.net.Proxy -import java.net.URI -import javax.net.ssl.HttpsURLConnection -import okhttp3.HttpUrl.Companion.toHttpUrl -import okhttp3.OkHttpClient -import okhttp3.Protocol -import okhttp3.Request -import okhttp3.containers.BasicMockServerTest.Companion.MOCKSERVER_IMAGE -import okhttp3.containers.BasicMockServerTest.Companion.trustMockServer -import okio.buffer -import okio.source -import org.junit.jupiter.api.Test -import org.mockserver.client.MockServerClient -import org.mockserver.configuration.Configuration -import org.mockserver.logging.MockServerLogger -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.junit.jupiter.Container -import org.testcontainers.junit.jupiter.Testcontainers - -@Testcontainers -class BasicProxyTest { - @Container - val mockServer: MockServerContainer = - MockServerContainer(MOCKSERVER_IMAGE) - .withNetworkAliases("mockserver") - - @Test - fun testOkHttpDirect() { - testRequest { - val client = OkHttpClient() - - val response = - client - .newCall( - Request((mockServer.endpoint + "/person?name=peter").toHttpUrl()), - ).execute() - - assertThat(response.body.string()).contains("Peter the person") - assertThat(response.protocol).isEqualTo(Protocol.HTTP_1_1) - } - } - - @Test - fun testOkHttpProxied() { - testRequest { - it.withProxyConfiguration(ProxyConfiguration.proxyConfiguration(ProxyConfiguration.Type.HTTP, it.remoteAddress())) - - val client = - OkHttpClient - .Builder() - .proxy(Proxy(Proxy.Type.HTTP, it.remoteAddress())) - .build() - - val response = - client - .newCall( - Request((mockServer.endpoint + "/person?name=peter").toHttpUrl()), - ).execute() - - assertThat(response.body.string()).contains("Peter the person") - } - } - - @Test - fun testOkHttpSecureDirect() { - testRequest { - val client = - OkHttpClient - .Builder() - .trustMockServer() - .build() - - val response = - client - .newCall( - Request((mockServer.secureEndpoint + "/person?name=peter").toHttpUrl()), - ).execute() - - assertThat(response.body.string()).contains("Peter the person") - assertThat(response.protocol).isEqualTo(Protocol.HTTP_2) - } - } - - @Test - fun testOkHttpSecureProxiedHttp1() { - testRequest { - val client = - OkHttpClient - .Builder() - .trustMockServer() - .proxy(Proxy(Proxy.Type.HTTP, it.remoteAddress())) - .protocols(listOf(Protocol.HTTP_1_1)) - .build() - - val response = - client - .newCall( - Request((mockServer.secureEndpoint + "/person?name=peter").toHttpUrl()), - ).execute() - - assertThat(response.body.string()).contains("Peter the person") - assertThat(response.protocol).isEqualTo(Protocol.HTTP_1_1) - } - } - - @Test - fun testUrlConnectionDirect() { - testRequest { - val url = URI(mockServer.endpoint + "/person?name=peter").toURL() - - val connection = url.openConnection() as HttpURLConnection - - assertThat( - connection.inputStream - .source() - .buffer() - .readUtf8(), - ).contains("Peter the person") - } - } - - @Test - fun testUrlConnectionPlaintextProxied() { - testRequest { - val proxy = - Proxy( - Proxy.Type.HTTP, - it.remoteAddress(), - ) - - val url = URI(mockServer.endpoint + "/person?name=peter").toURL() - - val connection = url.openConnection(proxy) as HttpURLConnection - - assertThat( - connection.inputStream - .source() - .buffer() - .readUtf8(), - ).contains("Peter the person") - } - } - - @Test - fun testUrlConnectionSecureDirect() { - val keyStoreFactory = KeyStoreFactory(Configuration.configuration(), MockServerLogger()) - HttpsURLConnection.setDefaultSSLSocketFactory(keyStoreFactory.sslContext().socketFactory) - - testRequest { - val url = URI(mockServer.secureEndpoint + "/person?name=peter").toURL() - - val connection = url.openConnection() as HttpURLConnection - - assertThat( - connection.inputStream - .source() - .buffer() - .readUtf8(), - ).contains("Peter the person") - } - } - - @Test - fun testUrlConnectionSecureProxied() { - val keyStoreFactory = KeyStoreFactory(Configuration.configuration(), MockServerLogger()) - HttpsURLConnection.setDefaultSSLSocketFactory(keyStoreFactory.sslContext().socketFactory) - - testRequest { - val proxy = - Proxy( - Proxy.Type.HTTP, - it.remoteAddress(), - ) - - val url = URI(mockServer.secureEndpoint + "/person?name=peter").toURL() - - val connection = url.openConnection(proxy) as HttpURLConnection - - assertThat( - connection.inputStream - .source() - .buffer() - .readUtf8(), - ).contains("Peter the person") - } - } - - private fun testRequest(function: (MockServerClient) -> Unit) { - MockServerClient(mockServer.host, mockServer.serverPort).use { mockServerClient -> - val request = - request() - .withPath("/person") - .withQueryStringParameter("name", "peter") - - mockServerClient - .`when`( - request, - ).respond(response().withBody("Peter the person!")) - - function(mockServerClient) - } - } -} diff --git a/container-tests/src/test/java/okhttp3/containers/SocksProxyTest.kt b/container-tests/src/test/java/okhttp3/containers/SocksProxyTest.kt deleted file mode 100644 index 4aa18f56865c..000000000000 --- a/container-tests/src/test/java/okhttp3/containers/SocksProxyTest.kt +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (C) 2024 Square, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package okhttp3.containers - -import assertk.assertThat -import assertk.assertions.contains -import java.net.InetSocketAddress -import java.net.Proxy -import java.net.Proxy.Type.SOCKS -import okhttp3.HttpUrl.Companion.toHttpUrl -import okhttp3.OkHttpClient -import okhttp3.Request -import okhttp3.containers.BasicMockServerTest.Companion.MOCKSERVER_IMAGE -import org.junit.jupiter.api.Test -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.containers.Network -import org.testcontainers.junit.jupiter.Container -import org.testcontainers.junit.jupiter.Testcontainers -import org.testcontainers.utility.DockerImageName - -@Testcontainers -class SocksProxyTest { - val network: Network = Network.newNetwork() - - @Container - val mockServer: MockServerContainer = - MockServerContainer(MOCKSERVER_IMAGE) - .withNetwork(network) - .withNetworkAliases("mockserver") - - @Container - val socks5Proxy = - GenericContainer(SOCKS5_PROXY) - .withNetwork(network) - .withExposedPorts(1080) - - @Test - fun testLocal() { - MockServerClient(mockServer.host, mockServer.serverPort).use { mockServerClient -> - mockServerClient - .`when`( - request() - .withPath("/person") - .withQueryStringParameter("name", "peter"), - ).respond(response().withBody("Peter the person!")) - - val client = - OkHttpClient - .Builder() - .proxy(Proxy(SOCKS, InetSocketAddress(socks5Proxy.host, socks5Proxy.firstMappedPort))) - .build() - - val response = - client - .newCall( - Request("http://mockserver:1080/person?name=peter".toHttpUrl()), - ).execute() - - assertThat(response.body.string()).contains("Peter the person") - } - } - - companion object { - val SOCKS5_PROXY: DockerImageName = - DockerImageName - .parse("serjs/go-socks5-proxy") - .withTag("v0.0.3") - } -} diff --git a/gradle.properties b/gradle.properties index 09306a9200fb..ac6c0db5e490 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,6 @@ kotlin.mpp.applyDefaultHierarchyTemplate=false androidBuild=false graalBuild=false loomBuild=false -containerTests=false okhttpModuleTests=false okhttpDokka=false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d298bd1760b3..3433702c3394 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -40,7 +40,6 @@ ksp = "2.3.11" lint-gradle = "1.0.0" maven-publish = "0.37.0" maven-sympathy = "0.3.0" -mockserver-client = "7.6.0" mrjar = "0.1.1" openjsse = "1.1.14" org-conscrypt = "2.6.3" @@ -58,7 +57,6 @@ square-moshi = "1.15.2" square-okio = "3.18.1" square-retrofit = "3.0.0" startup-runtime = "1.2.0" -testcontainers = "1.21.4" zstd-kmp-okio = "0.4.0" # Set to lower version than KGP version to maximize compatibility @@ -121,8 +119,6 @@ kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-c kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" } kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "serialization" } kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" } -mockserver = { module = "org.testcontainers:mockserver", version.ref = "testcontainers" } -mockserver-client = { module = "org.mock-server:mockserver-client-java-no-dependencies", version.ref = "mockserver-client" } native-image-svm = { module = "org.graalvm.nativeimage:svm", version.ref = "graalvm" } openjsse = { module = "org.openjsse:openjsse", version.ref = "openjsse" } playservices-safetynet = { module = "com.google.android.gms:play-services-safetynet", version.ref = "playservices-safetynet" } @@ -137,8 +133,6 @@ square-moshi-kotlin = { module = "com.squareup.moshi:moshi-kotlin", version.ref square-kotlin-poet = { module = "com.squareup:kotlinpoet", version.ref = "square-kotlin-poet" } square-okio = { module = "com.squareup.okio:okio", version.ref = "square-okio" } square-okio-fakefilesystem = { module = "com.squareup.okio:okio-fakefilesystem", version.ref = "square-okio" } -testcontainers = { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" } -testcontainers-junit5 = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainers" } square-zstd-kmp-okio = { module = "com.squareup.zstd:zstd-kmp-okio", version.ref = "zstd-kmp-okio" } # Build Logic Dependencies diff --git a/settings.gradle.kts b/settings.gradle.kts index 12a2b495f972..0b46154232c1 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -67,7 +67,6 @@ include(":samples:slack") include(":samples:static-server") include(":samples:tlssurvey") include(":samples:unixdomainsockets") -include(":container-tests") val okhttpModuleTests: String by settings if (okhttpModuleTests.toBoolean()) { include(":module-tests")