From c056530682d89bf5530f97cc60b477ccd1ae6ef0 Mon Sep 17 00:00:00 2001 From: Jesse Wilson Date: Wed, 20 Dec 2023 18:27:07 -0500 Subject: [PATCH] Switch back to the kotlin JVM plugin (#8149) * Switch back to the kotlin JVM plugin This does a ton of file moves from jvmMain to main, and jvmTest to test. * Don't use AnimalSniffer on okcurl * Use assertk more (#8150) --- .github/workflows/build.yml | 26 ++-- README.md | 2 +- android-test/build.gradle.kts | 1 + .../android/test/alpn/AlpnOverrideTest.kt | 13 +- .../test/letsencrypt/LetsEncryptClientTest.kt | 5 +- .../android/test/sni/SniOverrideTest.kt | 4 +- build.gradle.kts | 46 +------ buildSrc/src/main/kotlin/artifacts.kt | 6 - docs/features/r8_proguard.md | 2 +- mockwebserver-junit4/build.gradle.kts | 1 + .../junit4/MockWebServerRuleTest.kt | 5 +- mockwebserver-junit5/build.gradle.kts | 1 + .../junit5/internal/ExtensionLifecycleTest.kt | 5 +- .../ExtensionMultipleInstancesTest.kt | 5 +- .../internal/ExtensionMultipleTestsTest.kt | 4 +- mockwebserver/build.gradle.kts | 1 + .../mockwebserver3/CustomDispatcherTest.kt | 3 +- .../mockwebserver3/MockResponseSniTest.kt | 6 +- .../java/mockwebserver3/MockWebServerTest.kt | 35 +++-- .../mockwebserver3/RecordedRequestTest.kt | 3 +- okcurl/build.gradle.kts | 74 +++-------- .../kotlin/okhttp3/curl/Main.kt | 0 .../kotlin/okhttp3/curl/MainCommandLine.kt | 0 .../okhttp3/curl/internal/-MainCommon.kt | 0 .../okhttp3/curl/logging/LoggingUtil.kt | 0 .../okhttp3/curl/logging/MessageFormatter.kt | 0 .../okhttp3/curl/logging/OneLineLogFormat.kt | 0 .../okcurl-version.properties | 0 .../okhttp3/okcurl/reflect-config.json | 0 .../okhttp3/okcurl/resource-config.json | 0 .../kotlin/okhttp3/curl/MainTest.kt | 0 .../kotlin/okhttp3/curl/OkcurlTest.kt | 0 okhttp-android/build.gradle.kts | 2 + .../okhttp3/android/AndroidAsyncDnsTest.kt | 13 +- .../android/RobolectricOkHttpClientTest.kt | 16 ++- okhttp-brotli/build.gradle.kts | 1 + .../okhttp3/brotli/BrotliInterceptorTest.kt | 6 +- okhttp-coroutines/build.gradle.kts | 49 +++---- .../kotlin/okhttp3/JvmCallExtensions.kt | 0 .../kotlin/okhttp3/SuspendCallTest.kt | 0 okhttp-logging-interceptor/build.gradle.kts | 1 + .../okhttp3/logging/IsProbablyUtf8Test.kt | 4 +- okhttp-testing-support/build.gradle.kts | 58 ++++----- .../kotlin/okhttp3/CallEvent.kt | 0 .../kotlin/okhttp3/ClientRuleEventListener.kt | 0 .../kotlin/okhttp3/ConnectionEvent.kt | 0 .../kotlin/okhttp3/DelegatingSSLSession.kt | 0 .../kotlin/okhttp3/DelegatingSSLSocket.kt | 0 .../okhttp3/DelegatingSSLSocketFactory.kt | 0 .../okhttp3/DelegatingServerSocketFactory.kt | 0 .../kotlin/okhttp3/DelegatingSocketFactory.kt | 0 .../kotlin/okhttp3/FakeDns.kt | 3 +- .../kotlin/okhttp3/FakeProxySelector.kt | 0 .../kotlin/okhttp3/FakeSSLSession.kt | 0 .../kotlin/okhttp3/ForwardingRequestBody.kt | 0 .../kotlin/okhttp3/ForwardingResponseBody.kt | 0 .../kotlin/okhttp3/JsseDebugLogging.kt | 0 .../kotlin/okhttp3/OkHttpClientTestRule.kt | 0 .../kotlin/okhttp3/OkHttpDebugLogging.kt | 0 .../okhttp3/RecordingConnectionListener.kt | 20 +-- .../kotlin/okhttp3/RecordingCookieJar.kt | 3 +- .../kotlin/okhttp3/RecordingEventListener.kt | 17 ++- .../okhttp3/RecordingHostnameVerifier.kt | 0 .../kotlin/okhttp3/SimpleProvider.kt | 0 .../okhttp3/SpecificHostSocketFactory.kt | 0 .../kotlin/okhttp3/TestUtilCommon.kt | 0 .../kotlin/okhttp3/TestUtilJvm.kt | 0 .../kotlin/okhttp3/TestValueFactory.kt | 0 .../okhttp3/UppercaseRequestInterceptor.kt | 0 .../okhttp3/UppercaseResponseInterceptor.kt | 0 .../internal/RecordingOkAuthenticator.kt | 0 .../okhttp3/internal/concurrent/TaskFaker.kt | 5 +- .../internal/duplex/AsyncRequestBody.kt | 0 .../internal/http/RecordingProxySelector.kt | 3 +- .../Http2FlowControlConnectionListener.kt | 0 .../kotlin/okhttp3/okio/LoggingFilesystem.kt | 0 .../kotlin/okhttp3/testing/Flaky.kt | 0 .../kotlin/okhttp3/testing/PlatformRule.kt | 0 .../kotlin/okhttp3/testing/PlatformVersion.kt | 0 .../okhttp3/OkHttpClientTestRuleTest.kt | 0 .../okhttp3/testing/PlatformRuleTest.kt | 0 okhttp/build.gradle.kts | 120 ++++++++---------- .../kotlin/okhttp3/-JvmPlatform.kt | 0 .../kotlin/okhttp3/Address.kt | 0 .../kotlin/okhttp3/AsyncDns.kt | 0 .../kotlin/okhttp3/Authenticator.kt | 0 .../{jvmMain => main}/kotlin/okhttp3/Cache.kt | 0 .../kotlin/okhttp3/CacheControl.kt | 0 .../{jvmMain => main}/kotlin/okhttp3/Call.kt | 0 .../kotlin/okhttp3/Callback.kt | 0 .../kotlin/okhttp3/CertificatePinner.kt | 0 .../kotlin/okhttp3/Challenge.kt | 0 .../kotlin/okhttp3/CipherSuite.kt | 0 .../kotlin/okhttp3/Connection.kt | 0 .../kotlin/okhttp3/ConnectionListener.kt | 0 .../kotlin/okhttp3/ConnectionPool.kt | 0 .../kotlin/okhttp3/ConnectionSpec.kt | 0 .../kotlin/okhttp3/Cookie.kt | 0 .../kotlin/okhttp3/CookieJar.kt | 0 .../kotlin/okhttp3/Credentials.kt | 0 .../kotlin/okhttp3/Dispatcher.kt | 0 .../{jvmMain => main}/kotlin/okhttp3/Dns.kt | 0 .../kotlin/okhttp3/EventListener.kt | 0 .../kotlin/okhttp3/FormBody.kt | 0 .../kotlin/okhttp3/Handshake.kt | 0 .../kotlin/okhttp3/Headers.kt | 0 .../kotlin/okhttp3/HttpUrl.kt | 0 .../kotlin/okhttp3/Interceptor.kt | 0 .../kotlin/okhttp3/MediaType.kt | 0 .../kotlin/okhttp3/MultipartBody.kt | 0 .../kotlin/okhttp3/MultipartReader.kt | 0 .../kotlin/okhttp3/OkHttp.kt | 0 .../kotlin/okhttp3/OkHttpClient.kt | 0 .../kotlin/okhttp3/Protocol.kt | 0 .../kotlin/okhttp3/Request.kt | 0 .../kotlin/okhttp3/RequestBody.kt | 0 .../kotlin/okhttp3/Response.kt | 0 .../kotlin/okhttp3/ResponseBody.kt | 0 .../{jvmMain => main}/kotlin/okhttp3/Route.kt | 0 .../kotlin/okhttp3/TlsVersion.kt | 0 .../kotlin/okhttp3/WebSocket.kt | 0 .../kotlin/okhttp3/WebSocketListener.kt | 0 .../okhttp3/internal/-CacheControlCommon.kt | 0 .../okhttp3/internal/-ChallengeCommon.kt | 0 .../kotlin/okhttp3/internal/-HeadersCommon.kt | 0 .../okhttp3/internal/-HostnamesCommon.kt | 0 .../kotlin/okhttp3/internal/-HttpUrlCommon.kt | 0 .../kotlin/okhttp3/internal/-HttpUrlJvm.kt | 0 .../okhttp3/internal/-MediaTypeCommon.kt | 0 .../kotlin/okhttp3/internal/-NormalizeJvm.kt | 0 .../okhttp3/internal/-RequestBodyCommon.kt | 0 .../kotlin/okhttp3/internal/-RequestCommon.kt | 0 .../okhttp3/internal/-ResponseBodyCommon.kt | 0 .../okhttp3/internal/-ResponseCommon.kt | 0 .../kotlin/okhttp3/internal/-UtilCommon.kt | 0 .../kotlin/okhttp3/internal/-UtilJvm.kt | 0 .../internal/NativeImageTestsAccessors.kt | 0 .../internal/SuppressSignatureCheck.kt | 0 .../authenticator/JavaNetAuthenticator.kt | 0 .../internal/cache/CacheInterceptor.kt | 0 .../okhttp3/internal/cache/CacheRequest.kt | 0 .../okhttp3/internal/cache/CacheStrategy.kt | 0 .../okhttp3/internal/cache/DiskLruCache.kt | 0 .../okhttp3/internal/cache/FaultHidingSink.kt | 0 .../okhttp3/internal/cache2/FileOperator.kt | 0 .../kotlin/okhttp3/internal/cache2/Relay.kt | 0 .../okhttp3/internal/concurrent/Task.kt | 0 .../okhttp3/internal/concurrent/TaskLogger.kt | 0 .../okhttp3/internal/concurrent/TaskQueue.kt | 0 .../okhttp3/internal/concurrent/TaskRunner.kt | 0 .../internal/connection/ConnectInterceptor.kt | 0 .../internal/connection/ConnectPlan.kt | 0 .../connection/ConnectionSpecSelector.kt | 0 .../okhttp3/internal/connection/Exchange.kt | 0 .../internal/connection/ExchangeFinder.kt | 0 .../okhttp3/internal/connection/FailedPlan.kt | 0 .../connection/FastFallbackExchangeFinder.kt | 0 .../internal/connection/InetAddressOrder.kt | 0 .../okhttp3/internal/connection/RealCall.kt | 0 .../internal/connection/RealConnection.kt | 0 .../internal/connection/RealConnectionPool.kt | 0 .../internal/connection/RealRoutePlanner.kt | 0 .../okhttp3/internal/connection/ReusePlan.kt | 0 .../internal/connection/RouteDatabase.kt | 0 .../internal/connection/RoutePlanner.kt | 0 .../internal/connection/RouteSelector.kt | 0 .../connection/SequentialExchangeFinder.kt | 0 .../internal/connection/tlsHandshake.kt | 0 .../okhttp3/internal/graal/OkHttpFeature.kt | 0 .../kotlin/okhttp3/internal/graal/svm.kt | 0 .../internal/http/BridgeInterceptor.kt | 0 .../internal/http/CallServerInterceptor.kt | 0 .../okhttp3/internal/http/ExchangeCodec.kt | 0 .../okhttp3/internal/http/HttpHeaders.kt | 0 .../okhttp3/internal/http/HttpMethod.kt | 0 .../okhttp3/internal/http/HttpStatusCodes.kt | 0 .../internal/http/RealInterceptorChain.kt | 0 .../okhttp3/internal/http/RealResponseBody.kt | 0 .../okhttp3/internal/http/RequestLine.kt | 0 .../http/RetryAndFollowUpInterceptor.kt | 0 .../okhttp3/internal/http/StatusLine.kt | 0 .../kotlin/okhttp3/internal/http/dates.kt | 0 .../okhttp3/internal/http1/HeadersReader.kt | 0 .../internal/http1/Http1ExchangeCodec.kt | 0 .../http2/ConnectionShutdownException.kt | 0 .../okhttp3/internal/http2/ErrorCode.kt | 0 .../internal/http2/FlowControlListener.kt | 0 .../kotlin/okhttp3/internal/http2/Header.kt | 0 .../kotlin/okhttp3/internal/http2/Hpack.kt | 0 .../kotlin/okhttp3/internal/http2/Http2.kt | 0 .../okhttp3/internal/http2/Http2Connection.kt | 0 .../internal/http2/Http2ExchangeCodec.kt | 0 .../okhttp3/internal/http2/Http2Reader.kt | 0 .../okhttp3/internal/http2/Http2Stream.kt | 0 .../okhttp3/internal/http2/Http2Writer.kt | 0 .../kotlin/okhttp3/internal/http2/Huffman.kt | 0 .../okhttp3/internal/http2/PushObserver.kt | 0 .../kotlin/okhttp3/internal/http2/Settings.kt | 0 .../internal/http2/StreamResetException.kt | 0 .../http2/flowcontrol/WindowCounter.kt | 0 .../okhttp3/internal/idn/IdnaMappingTable.kt | 0 .../kotlin/okhttp3/internal/idn/Punycode.kt | 0 .../kotlin/okhttp3/internal/internal.kt | 0 .../internal/platform/Android10Platform.kt | 0 .../internal/platform/AndroidPlatform.kt | 0 .../internal/platform/BouncyCastlePlatform.kt | 0 .../internal/platform/ConscryptPlatform.kt | 0 .../platform/Jdk8WithJettyBootPlatform.kt | 0 .../okhttp3/internal/platform/Jdk9Platform.kt | 0 .../internal/platform/OpenJSSEPlatform.kt | 0 .../okhttp3/internal/platform/Platform.kt | 0 .../android/Android10SocketAdapter.kt | 0 .../android/AndroidCertificateChainCleaner.kt | 0 .../internal/platform/android/AndroidLog.kt | 0 .../platform/android/AndroidSocketAdapter.kt | 0 .../android/BouncyCastleSocketAdapter.kt | 0 .../android/ConscryptSocketAdapter.kt | 0 .../platform/android/DeferredSocketAdapter.kt | 0 .../platform/android/SocketAdapter.kt | 0 .../android/StandardAndroidSocketAdapter.kt | 0 .../internal/proxy/NullProxySelector.kt | 0 .../publicsuffix/PublicSuffixDatabase.kt | 0 .../tls/BasicCertificateChainCleaner.kt | 0 .../internal/tls/BasicTrustRootIndex.kt | 0 .../internal/tls/CertificateChainCleaner.kt | 0 .../internal/tls/OkHostnameVerifier.kt | 0 .../okhttp3/internal/tls/TrustRootIndex.kt | 0 .../okhttp3/internal/ws/MessageDeflater.kt | 0 .../okhttp3/internal/ws/MessageInflater.kt | 0 .../okhttp3/internal/ws/RealWebSocket.kt | 0 .../internal/ws/WebSocketExtensions.kt | 0 .../okhttp3/internal/ws/WebSocketProtocol.kt | 0 .../okhttp3/internal/ws/WebSocketReader.kt | 0 .../okhttp3/internal/ws/WebSocketWriter.kt | 0 .../okhttp3/internal/-InternalVersion.kt | 0 .../okhttp/okhttp/native-image.properties | 0 .../okhttp/okhttp/reflect-config.json | 0 .../okhttp/okhttp/resource-config.json | 0 .../resources/META-INF/proguard/okhttp3.pro | 0 .../okhttp3/internal/publicsuffix/NOTICE | 0 .../publicsuffix/PublicSuffixDatabase.gz | Bin .../java/okhttp3/AddressTest.kt | 0 .../java/okhttp3/AutobahnTester.kt | 0 .../java/okhttp3/BouncyCastleTest.kt | 0 .../java/okhttp3/CacheControlJvmTest.kt | 0 .../java/okhttp3/CacheControlTest.kt | 0 .../java/okhttp3/CacheCorruptionTest.kt | 0 .../java/okhttp3/CacheTest.java | 0 .../java/okhttp3/CallHandshakeTest.kt | 0 .../java/okhttp3/CallKotlinTest.kt | 0 .../java/okhttp3/CallTest.kt | 0 .../okhttp3/CertificateChainCleanerTest.java | 0 .../okhttp3/CertificatePinnerKotlinTest.kt | 0 .../java/okhttp3/CertificatePinnerTest.java | 0 .../java/okhttp3/ChannelSocketFactory.kt | 0 .../java/okhttp3/CipherSuiteTest.java | 0 .../java/okhttp3/CommonRequestBodyTest.kt | 0 .../okhttp3/ConnectionCoalescingTest.java | 0 .../java/okhttp3/ConnectionListenerTest.kt | 0 .../java/okhttp3/ConnectionReuseTest.kt | 0 .../java/okhttp3/ConnectionSpecTest.java | 0 .../java/okhttp3/ConscryptTest.kt | 0 .../java/okhttp3/CookieTest.kt | 0 .../java/okhttp3/CookiesTest.java | 0 .../java/okhttp3/CorrettoTest.kt | 0 .../java/okhttp3/DispatcherCleanupTest.kt | 0 .../java/okhttp3/DispatcherTest.java | 0 .../java/okhttp3/DuplexTest.java | 0 .../java/okhttp3/EventListenerTest.java | 0 .../java/okhttp3/FakeRoutePlanner.kt | 0 .../FallbackTestClientSocketFactory.java | 0 .../java/okhttp3/FastFallbackTest.kt | 0 .../java/okhttp3/FormBodyTest.java | 0 .../java/okhttp3/HandshakeTest.kt | 0 .../java/okhttp3/HeadersChallengesTest.kt | 0 .../java/okhttp3/HeadersJvmTest.kt | 0 .../java/okhttp3/HeadersKotlinTest.kt | 0 .../java/okhttp3/HeadersRequestTest.kt | 0 .../java/okhttp3/HeadersTest.kt | 0 .../java/okhttp3/HttpUrlJvmTest.kt | 0 .../java/okhttp3/HttpUrlTest.kt | 0 .../java/okhttp3/InsecureForHostTest.kt | 0 .../java/okhttp3/InterceptorTest.java | 0 .../java/okhttp3/JSSETest.kt | 0 .../okhttp3/KotlinDeprecationErrorTest.kt | 0 .../java/okhttp3/KotlinSourceModernTest.kt | 0 .../java/okhttp3/LoomTest.kt | 0 .../java/okhttp3/MediaTypeGetTest.kt | 0 .../java/okhttp3/MediaTypeJvmTest.kt | 0 .../java/okhttp3/MediaTypeTest.kt | 0 .../java/okhttp3/MultipartBodyTest.java | 0 .../java/okhttp3/MultipartReaderTest.kt | 0 .../java/okhttp3/OkHttpClientTest.kt | 0 .../java/okhttp3/OkHttpTest.kt | 0 .../java/okhttp3/OpenJSSETest.kt | 0 .../java/okhttp3/ProtocolTest.java | 0 .../java/okhttp3/PublicInternalApiTest.java | 0 .../java/okhttp3/RecordedResponse.java | 0 .../java/okhttp3/RecordingCallback.java | 0 .../java/okhttp3/RecordingExecutor.kt | 0 .../okhttp3/RecordingWebSocketListener.java | 0 .../java/okhttp3/RequestBodyTest.kt | 0 .../java/okhttp3/RequestCommonTest.kt | 0 .../java/okhttp3/RequestTest.kt | 0 .../java/okhttp3/ResponseBodyJvmTest.kt | 0 .../java/okhttp3/ResponseBodyTest.kt | 0 .../java/okhttp3/ResponseCommonTest.kt | 0 .../java/okhttp3/ResponseJvmTest.kt | 0 .../java/okhttp3/RouteFailureTest.kt | 0 .../okhttp3/ServerTruncatesRequestTest.kt | 0 .../java/okhttp3/SessionReuseTest.kt | 0 .../java/okhttp3/SocketChannelTest.kt | 0 .../java/okhttp3/SocksProxy.kt | 0 .../java/okhttp3/SocksProxyTest.java | 0 .../java/okhttp3/TestLogHandler.java | 0 .../java/okhttp3/TestTls13Request.java | 0 .../java/okhttp3/URLConnectionTest.kt | 0 .../okhttp3/UrlComponentEncodingTester.kt | 0 .../okhttp3/UrlComponentEncodingTesterJvm.kt | 0 .../java/okhttp3/WebPlatformToAsciiData.kt | 2 +- .../java/okhttp3/WebPlatformToAsciiTest.kt | 0 .../java/okhttp3/WebPlatformUrlTest.kt | 0 .../java/okhttp3/WebPlatformUrlTestData.kt | 0 .../okhttp3/WholeOperationTimeoutTest.java | 0 .../internal/DoubleInetAddressDns.java | 0 .../java/okhttp3/internal/HostnamesTest.kt | 0 .../internal/RecordingAuthenticator.java | 0 .../java/okhttp3/internal/SocketRecorder.java | 0 .../java/okhttp3/internal/UtilTest.kt | 0 .../authenticator/JavaNetAuthenticatorTest.kt | 0 .../internal/cache/DiskLruCacheTest.kt | 0 .../internal/cache2/FileOperatorTest.java | 0 .../okhttp3/internal/cache2/RelayTest.java | 0 .../internal/concurrent/TaskLoggerTest.kt | 0 .../concurrent/TaskRunnerRealBackendTest.kt | 0 .../internal/concurrent/TaskRunnerTest.kt | 0 .../internal/connection/ConnectionPoolTest.kt | 0 .../FastFallbackExchangeFinderTest.kt | 0 .../connection/InetAddressOrderTest.kt | 0 .../connection/RetryConnectionTest.kt | 0 .../internal/connection/RouteSelectorTest.kt | 0 .../java/okhttp3/internal/http/CancelTest.kt | 0 .../internal/http/ExternalHttp2Example.kt | 0 .../okhttp3/internal/http/HttpDateTest.kt | 0 .../okhttp3/internal/http/StatusLineTest.java | 0 .../internal/http/ThreadInterruptTest.java | 0 .../internal/http2/BaseTestHandler.java | 0 .../okhttp3/internal/http2/FrameLogTest.kt | 0 .../okhttp3/internal/http2/HpackTest.java | 0 .../internal/http2/Http2ConnectionTest.kt | 0 .../java/okhttp3/internal/http2/Http2Test.kt | 0 .../internal/http2/HttpOverHttp2Test.kt | 0 .../okhttp3/internal/http2/HuffmanTest.java | 0 .../okhttp3/internal/http2/MockHttp2Peer.kt | 0 .../okhttp3/internal/http2/SettingsTest.java | 0 .../internal/idn/IdnaMappingTableTest.kt | 0 .../java/okhttp3/internal/idn/PunycodeTest.kt | 0 .../idn/StringprepTablesReaderTest.kt | 0 .../okhttp3/internal/idn/StringprepTest.kt | 0 .../java/okhttp3/internal/idn/stringprep.kt | 0 .../internal/idn/stringprepTablesReader.kt | 0 .../okhttp3/internal/io/FaultyFileSystem.kt | 0 .../Jdk8WithJettyBootPlatformTest.java | 0 .../internal/platform/Jdk9PlatformTest.java | 0 .../internal/platform/PlatformTest.java | 0 .../android/AndroidSocketAdapterTest.kt | 0 .../publicsuffix/PublicSuffixDatabaseTest.kt | 0 .../publicsuffix/PublicSuffixListGenerator.kt | 4 +- .../CertificatePinnerChainValidationTest.java | 0 .../okhttp3/internal/tls/ClientAuthTest.java | 0 .../internal/tls/HostnameVerifierTest.kt | 0 .../ws/MessageDeflaterInflaterTest.kt | 0 .../internal/ws/RealWebSocketTest.java | 0 .../internal/ws/WebSocketExtensionsTest.kt | 0 .../internal/ws/WebSocketHttpTest.java | 0 .../internal/ws/WebSocketReaderTest.kt | 0 .../internal/ws/WebSocketRecorder.java | 0 .../internal/ws/WebSocketWriterTest.kt | 0 .../java/okhttp3/osgi/OsgiTest.java | 2 +- .../resources/okhttp3/internal/idn/README.md | 2 +- .../okhttp3/internal/idn/rfc3454.A.1.txt | 0 .../okhttp3/internal/idn/rfc3454.B.1.txt | 0 .../okhttp3/internal/idn/rfc3454.B.2.txt | 0 .../okhttp3/internal/idn/rfc3454.C.1.2.txt | 0 .../okhttp3/internal/idn/rfc3454.C.2.2.txt | 0 .../okhttp3/internal/idn/rfc3454.C.3.txt | 0 .../okhttp3/internal/idn/rfc3454.C.4.txt | 0 .../okhttp3/internal/idn/rfc3454.C.5.txt | 0 .../okhttp3/internal/idn/rfc3454.C.6.txt | 0 .../okhttp3/internal/idn/rfc3454.C.7.txt | 0 .../okhttp3/internal/idn/rfc3454.C.8.txt | 0 .../okhttp3/internal/idn/rfc3454.C.9.txt | 0 .../okhttp3/internal/idn/rfc3454.D.1.txt | 0 .../okhttp3/internal/idn/rfc3454.D.2.txt | 0 .../publicsuffix/public_suffix_list.dat | 0 .../resources/web-platform-test-toascii.json | 0 .../web-platform-test-urltestdata.txt | 0 397 files changed, 257 insertions(+), 322 deletions(-) rename okcurl/src/{jvmMain => main}/kotlin/okhttp3/curl/Main.kt (100%) rename okcurl/src/{jvmMain => main}/kotlin/okhttp3/curl/MainCommandLine.kt (100%) rename okcurl/src/{jvmMain => main}/kotlin/okhttp3/curl/internal/-MainCommon.kt (100%) rename okcurl/src/{jvmMain => main}/kotlin/okhttp3/curl/logging/LoggingUtil.kt (100%) rename okcurl/src/{jvmMain => main}/kotlin/okhttp3/curl/logging/MessageFormatter.kt (100%) rename okcurl/src/{jvmMain => main}/kotlin/okhttp3/curl/logging/OneLineLogFormat.kt (100%) rename okcurl/src/{jvmMain => main}/resources-templates/okcurl-version.properties (100%) rename okcurl/src/{jvmMain => main}/resources/META-INF/native-image/okhttp3/okcurl/reflect-config.json (100%) rename okcurl/src/{jvmMain => main}/resources/META-INF/native-image/okhttp3/okcurl/resource-config.json (100%) rename okcurl/src/{jvmTest => test}/kotlin/okhttp3/curl/MainTest.kt (100%) rename okcurl/src/{jvmTest => test}/kotlin/okhttp3/curl/OkcurlTest.kt (100%) rename okhttp-coroutines/src/{jvmMain => main}/kotlin/okhttp3/JvmCallExtensions.kt (100%) rename okhttp-coroutines/src/{jvmTest => test}/kotlin/okhttp3/SuspendCallTest.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/CallEvent.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/ClientRuleEventListener.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/ConnectionEvent.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/DelegatingSSLSession.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/DelegatingSSLSocket.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/DelegatingSSLSocketFactory.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/DelegatingServerSocketFactory.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/DelegatingSocketFactory.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/FakeDns.kt (97%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/FakeProxySelector.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/FakeSSLSession.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/ForwardingRequestBody.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/ForwardingResponseBody.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/JsseDebugLogging.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/OkHttpClientTestRule.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/OkHttpDebugLogging.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/RecordingConnectionListener.kt (90%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/RecordingCookieJar.kt (95%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/RecordingEventListener.kt (95%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/RecordingHostnameVerifier.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/SimpleProvider.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/SpecificHostSocketFactory.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/TestUtilCommon.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/TestUtilJvm.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/TestValueFactory.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/UppercaseRequestInterceptor.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/UppercaseResponseInterceptor.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/internal/RecordingOkAuthenticator.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/internal/concurrent/TaskFaker.kt (99%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/internal/duplex/AsyncRequestBody.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/internal/http/RecordingProxySelector.kt (95%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/internal/http2/Http2FlowControlConnectionListener.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/okio/LoggingFilesystem.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/testing/Flaky.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/testing/PlatformRule.kt (100%) rename okhttp-testing-support/src/{jvmMain => main}/kotlin/okhttp3/testing/PlatformVersion.kt (100%) rename okhttp-testing-support/src/{jvmTest => test}/kotlin/okhttp3/OkHttpClientTestRuleTest.kt (100%) rename okhttp-testing-support/src/{jvmTest => test}/kotlin/okhttp3/testing/PlatformRuleTest.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/-JvmPlatform.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/Address.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/AsyncDns.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/Authenticator.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/Cache.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/CacheControl.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/Call.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/Callback.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/CertificatePinner.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/Challenge.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/CipherSuite.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/Connection.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/ConnectionListener.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/ConnectionPool.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/ConnectionSpec.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/Cookie.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/CookieJar.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/Credentials.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/Dispatcher.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/Dns.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/EventListener.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/FormBody.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/Handshake.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/Headers.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/HttpUrl.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/Interceptor.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/MediaType.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/MultipartBody.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/MultipartReader.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/OkHttp.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/OkHttpClient.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/Protocol.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/Request.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/RequestBody.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/Response.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/ResponseBody.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/Route.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/TlsVersion.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/WebSocket.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/WebSocketListener.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/-CacheControlCommon.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/-ChallengeCommon.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/-HeadersCommon.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/-HostnamesCommon.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/-HttpUrlCommon.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/-HttpUrlJvm.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/-MediaTypeCommon.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/-NormalizeJvm.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/-RequestBodyCommon.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/-RequestCommon.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/-ResponseBodyCommon.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/-ResponseCommon.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/-UtilCommon.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/-UtilJvm.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/NativeImageTestsAccessors.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/SuppressSignatureCheck.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/authenticator/JavaNetAuthenticator.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/cache/CacheInterceptor.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/cache/CacheRequest.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/cache/CacheStrategy.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/cache/DiskLruCache.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/cache/FaultHidingSink.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/cache2/FileOperator.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/cache2/Relay.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/concurrent/Task.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/concurrent/TaskLogger.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/concurrent/TaskQueue.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/concurrent/TaskRunner.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/connection/ConnectInterceptor.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/connection/ConnectPlan.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/connection/ConnectionSpecSelector.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/connection/Exchange.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/connection/ExchangeFinder.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/connection/FailedPlan.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/connection/FastFallbackExchangeFinder.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/connection/InetAddressOrder.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/connection/RealCall.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/connection/RealConnection.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/connection/RealConnectionPool.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/connection/RealRoutePlanner.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/connection/ReusePlan.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/connection/RouteDatabase.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/connection/RoutePlanner.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/connection/RouteSelector.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/connection/SequentialExchangeFinder.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/connection/tlsHandshake.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/graal/OkHttpFeature.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/graal/svm.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http/BridgeInterceptor.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http/CallServerInterceptor.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http/ExchangeCodec.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http/HttpHeaders.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http/HttpMethod.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http/HttpStatusCodes.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http/RealInterceptorChain.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http/RealResponseBody.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http/RequestLine.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http/RetryAndFollowUpInterceptor.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http/StatusLine.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http/dates.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http1/HeadersReader.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http1/Http1ExchangeCodec.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http2/ConnectionShutdownException.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http2/ErrorCode.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http2/FlowControlListener.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http2/Header.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http2/Hpack.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http2/Http2.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http2/Http2Connection.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http2/Http2ExchangeCodec.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http2/Http2Reader.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http2/Http2Stream.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http2/Http2Writer.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http2/Huffman.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http2/PushObserver.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http2/Settings.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http2/StreamResetException.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/http2/flowcontrol/WindowCounter.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/idn/IdnaMappingTable.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/idn/Punycode.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/internal.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/platform/Android10Platform.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/platform/AndroidPlatform.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/platform/BouncyCastlePlatform.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/platform/ConscryptPlatform.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/platform/Jdk8WithJettyBootPlatform.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/platform/Jdk9Platform.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/platform/OpenJSSEPlatform.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/platform/Platform.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/platform/android/Android10SocketAdapter.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/platform/android/AndroidCertificateChainCleaner.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/platform/android/AndroidLog.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/platform/android/AndroidSocketAdapter.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/platform/android/BouncyCastleSocketAdapter.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/platform/android/ConscryptSocketAdapter.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/platform/android/DeferredSocketAdapter.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/platform/android/SocketAdapter.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/platform/android/StandardAndroidSocketAdapter.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/proxy/NullProxySelector.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/publicsuffix/PublicSuffixDatabase.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/tls/BasicCertificateChainCleaner.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/tls/BasicTrustRootIndex.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/tls/CertificateChainCleaner.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/tls/OkHostnameVerifier.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/tls/TrustRootIndex.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/ws/MessageDeflater.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/ws/MessageInflater.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/ws/RealWebSocket.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/ws/WebSocketExtensions.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/ws/WebSocketProtocol.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/ws/WebSocketReader.kt (100%) rename okhttp/src/{jvmMain => main}/kotlin/okhttp3/internal/ws/WebSocketWriter.kt (100%) rename okhttp/src/{jvmMain => main}/kotlinTemplates/okhttp3/internal/-InternalVersion.kt (100%) rename okhttp/src/{jvmMain => main}/resources/META-INF/native-image/okhttp/okhttp/native-image.properties (100%) rename okhttp/src/{jvmMain => main}/resources/META-INF/native-image/okhttp/okhttp/reflect-config.json (100%) rename okhttp/src/{jvmMain => main}/resources/META-INF/native-image/okhttp/okhttp/resource-config.json (100%) rename okhttp/src/{jvmMain => main}/resources/META-INF/proguard/okhttp3.pro (100%) rename okhttp/src/{jvmMain => main}/resources/okhttp3/internal/publicsuffix/NOTICE (100%) rename okhttp/src/{jvmMain => main}/resources/okhttp3/internal/publicsuffix/PublicSuffixDatabase.gz (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/AddressTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/AutobahnTester.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/BouncyCastleTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/CacheControlJvmTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/CacheControlTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/CacheCorruptionTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/CacheTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/CallHandshakeTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/CallKotlinTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/CallTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/CertificateChainCleanerTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/CertificatePinnerKotlinTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/CertificatePinnerTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/ChannelSocketFactory.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/CipherSuiteTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/CommonRequestBodyTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/ConnectionCoalescingTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/ConnectionListenerTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/ConnectionReuseTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/ConnectionSpecTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/ConscryptTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/CookieTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/CookiesTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/CorrettoTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/DispatcherCleanupTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/DispatcherTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/DuplexTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/EventListenerTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/FakeRoutePlanner.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/FallbackTestClientSocketFactory.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/FastFallbackTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/FormBodyTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/HandshakeTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/HeadersChallengesTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/HeadersJvmTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/HeadersKotlinTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/HeadersRequestTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/HeadersTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/HttpUrlJvmTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/HttpUrlTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/InsecureForHostTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/InterceptorTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/JSSETest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/KotlinDeprecationErrorTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/KotlinSourceModernTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/LoomTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/MediaTypeGetTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/MediaTypeJvmTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/MediaTypeTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/MultipartBodyTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/MultipartReaderTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/OkHttpClientTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/OkHttpTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/OpenJSSETest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/ProtocolTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/PublicInternalApiTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/RecordedResponse.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/RecordingCallback.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/RecordingExecutor.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/RecordingWebSocketListener.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/RequestBodyTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/RequestCommonTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/RequestTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/ResponseBodyJvmTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/ResponseBodyTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/ResponseCommonTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/ResponseJvmTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/RouteFailureTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/ServerTruncatesRequestTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/SessionReuseTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/SocketChannelTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/SocksProxy.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/SocksProxyTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/TestLogHandler.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/TestTls13Request.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/URLConnectionTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/UrlComponentEncodingTester.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/UrlComponentEncodingTesterJvm.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/WebPlatformToAsciiData.kt (93%) rename okhttp/src/{jvmTest => test}/java/okhttp3/WebPlatformToAsciiTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/WebPlatformUrlTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/WebPlatformUrlTestData.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/WholeOperationTimeoutTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/DoubleInetAddressDns.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/HostnamesTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/RecordingAuthenticator.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/SocketRecorder.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/UtilTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/authenticator/JavaNetAuthenticatorTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/cache/DiskLruCacheTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/cache2/FileOperatorTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/cache2/RelayTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/concurrent/TaskLoggerTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/concurrent/TaskRunnerRealBackendTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/concurrent/TaskRunnerTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/connection/ConnectionPoolTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/connection/FastFallbackExchangeFinderTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/connection/InetAddressOrderTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/connection/RetryConnectionTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/connection/RouteSelectorTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/http/CancelTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/http/ExternalHttp2Example.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/http/HttpDateTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/http/StatusLineTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/http/ThreadInterruptTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/http2/BaseTestHandler.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/http2/FrameLogTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/http2/HpackTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/http2/Http2ConnectionTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/http2/Http2Test.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/http2/HttpOverHttp2Test.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/http2/HuffmanTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/http2/MockHttp2Peer.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/http2/SettingsTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/idn/IdnaMappingTableTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/idn/PunycodeTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/idn/StringprepTablesReaderTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/idn/StringprepTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/idn/stringprep.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/idn/stringprepTablesReader.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/io/FaultyFileSystem.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/platform/Jdk8WithJettyBootPlatformTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/platform/Jdk9PlatformTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/platform/PlatformTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/platform/android/AndroidSocketAdapterTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/publicsuffix/PublicSuffixDatabaseTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/publicsuffix/PublicSuffixListGenerator.kt (96%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/tls/CertificatePinnerChainValidationTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/tls/ClientAuthTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/tls/HostnameVerifierTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/ws/MessageDeflaterInflaterTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/ws/RealWebSocketTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/ws/WebSocketExtensionsTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/ws/WebSocketHttpTest.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/ws/WebSocketReaderTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/ws/WebSocketRecorder.java (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/internal/ws/WebSocketWriterTest.kt (100%) rename okhttp/src/{jvmTest => test}/java/okhttp3/osgi/OsgiTest.java (98%) rename okhttp/src/{jvmTest => test}/resources/okhttp3/internal/idn/README.md (91%) rename okhttp/src/{jvmTest => test}/resources/okhttp3/internal/idn/rfc3454.A.1.txt (100%) rename okhttp/src/{jvmTest => test}/resources/okhttp3/internal/idn/rfc3454.B.1.txt (100%) rename okhttp/src/{jvmTest => test}/resources/okhttp3/internal/idn/rfc3454.B.2.txt (100%) rename okhttp/src/{jvmTest => test}/resources/okhttp3/internal/idn/rfc3454.C.1.2.txt (100%) rename okhttp/src/{jvmTest => test}/resources/okhttp3/internal/idn/rfc3454.C.2.2.txt (100%) rename okhttp/src/{jvmTest => test}/resources/okhttp3/internal/idn/rfc3454.C.3.txt (100%) rename okhttp/src/{jvmTest => test}/resources/okhttp3/internal/idn/rfc3454.C.4.txt (100%) rename okhttp/src/{jvmTest => test}/resources/okhttp3/internal/idn/rfc3454.C.5.txt (100%) rename okhttp/src/{jvmTest => test}/resources/okhttp3/internal/idn/rfc3454.C.6.txt (100%) rename okhttp/src/{jvmTest => test}/resources/okhttp3/internal/idn/rfc3454.C.7.txt (100%) rename okhttp/src/{jvmTest => test}/resources/okhttp3/internal/idn/rfc3454.C.8.txt (100%) rename okhttp/src/{jvmTest => test}/resources/okhttp3/internal/idn/rfc3454.C.9.txt (100%) rename okhttp/src/{jvmTest => test}/resources/okhttp3/internal/idn/rfc3454.D.1.txt (100%) rename okhttp/src/{jvmTest => test}/resources/okhttp3/internal/idn/rfc3454.D.2.txt (100%) rename okhttp/src/{jvmTest => test}/resources/okhttp3/internal/publicsuffix/public_suffix_list.dat (100%) rename okhttp/src/{jvmTest => test}/resources/web-platform-test-toascii.json (100%) rename okhttp/src/{jvmTest => test}/resources/web-platform-test-urltestdata.txt (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9ca5e32439dd..08f429dfe3cd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,7 +80,7 @@ jobs: - name: Run Checks uses: gradle/gradle-build-action@v2 with: - arguments: check -PandroidBuild=true -PgraalBuild=true -x test -x jvmTest + arguments: check -PandroidBuild=true -PgraalBuild=true -x test -x test testopenjdk11: permissions: @@ -108,7 +108,7 @@ jobs: - name: Run Checks uses: gradle/gradle-build-action@v2 with: - arguments: jvmTest -Dtest.java.version=11 + arguments: test -Dtest.java.version=11 - name: Publish Test Report if: github.repository == 'square/okhttp' && github.ref == 'refs/heads/master' @@ -142,7 +142,7 @@ jobs: - name: Run Checks uses: gradle/gradle-build-action@v2 with: - arguments: jvmTest -Dtest.java.version=11 + arguments: test -Dtest.java.version=11 testopenjdk8: runs-on: ubuntu-latest @@ -169,7 +169,7 @@ jobs: - name: Run Checks uses: gradle/gradle-build-action@v2 with: - arguments: jvmTest -Dtest.java.version=8 + arguments: test -Dtest.java.version=8 testopenjdk8alpn: runs-on: ubuntu-latest @@ -202,7 +202,7 @@ jobs: - name: Run Checks uses: gradle/gradle-build-action@v2 with: - arguments: jvmTest -Dtest.java.version=8 -Dokhttp.platform=jdk8alpn -Dalpn.boot.version=8.1.13.v20181017 -Dorg.gradle.java.installations.paths=/opt/hostedtoolcache/Java_Adopt_jdk/8.0.242-8.1/x64 + arguments: test -Dtest.java.version=8 -Dokhttp.platform=jdk8alpn -Dalpn.boot.version=8.1.13.v20181017 -Dorg.gradle.java.installations.paths=/opt/hostedtoolcache/Java_Adopt_jdk/8.0.242-8.1/x64 testopenjsse: runs-on: ubuntu-latest @@ -229,7 +229,7 @@ jobs: - name: Run Checks uses: gradle/gradle-build-action@v2 with: - arguments: jvmTest -Dtest.java.version=8 -Dokhttp.platform=openjsse + arguments: test -Dtest.java.version=8 -Dokhttp.platform=openjsse testconscrypt: runs-on: ubuntu-latest @@ -256,7 +256,7 @@ jobs: - name: Run Checks uses: gradle/gradle-build-action@v2 with: - arguments: jvmTest -Dokhttp.platform=conscrypt + arguments: test -Dokhttp.platform=conscrypt testbouncycastle: runs-on: ubuntu-latest @@ -283,7 +283,7 @@ jobs: - name: Run Checks uses: gradle/gradle-build-action@v2 with: - arguments: jvmTest -Dokhttp.platform=bouncycastle + arguments: test -Dokhttp.platform=bouncycastle testcorretto: runs-on: ubuntu-latest @@ -311,7 +311,7 @@ jobs: - name: Run Checks uses: gradle/gradle-build-action@v2 with: - arguments: jvmTest -Dokhttp.platform=corretto + arguments: test -Dokhttp.platform=corretto testopenjdk17: runs-on: ubuntu-latest @@ -339,7 +339,7 @@ jobs: - name: Run Checks uses: gradle/gradle-build-action@v2 with: - arguments: jvmTest -Dtest.java.version=17 + arguments: test -Dtest.java.version=17 testopenjdk19: runs-on: ubuntu-latest @@ -373,7 +373,7 @@ jobs: - name: Run Checks uses: gradle/gradle-build-action@v2 with: - arguments: jvmTest -Dtest.java.version=19 + arguments: test -Dtest.java.version=19 testwindows: runs-on: windows-latest @@ -401,7 +401,7 @@ jobs: - name: Test uses: gradle/gradle-build-action@v2 with: - arguments: jvmTest + arguments: test testgraal: runs-on: ubuntu-latest @@ -532,7 +532,7 @@ jobs: - name: Run Checks uses: gradle/gradle-build-action@v2 with: - arguments: jvmTest -Dokhttp.platform=loom -Dtest.java.version=20 + arguments: test -Dokhttp.platform=loom -Dtest.java.version=20 testandroidregression: diff --git a/README.md b/README.md index 064b261eca37..e70c426cc535 100644 --- a/README.md +++ b/README.md @@ -167,7 +167,7 @@ limitations under the License. [conscrypt]: https://github.com/google/conscrypt/ [get_example]: https://raw.github.com/square/okhttp/master/samples/guide/src/main/java/okhttp3/guide/GetExample.java [kotlin]: https://kotlinlang.org/ - [okhttp3_pro]: https://raw.githubusercontent.com/square/okhttp/master/okhttp/src/jvmMain/resources/META-INF/proguard/okhttp3.pro + [okhttp3_pro]: https://raw.githubusercontent.com/square/okhttp/master/okhttp/src/main/resources/META-INF/proguard/okhttp3.pro [okhttp_312x]: https://github.com/square/okhttp/tree/okhttp_3.12.x [okhttp]: https://square.github.io/okhttp/ [okio]: https://github.com/square/okio diff --git a/android-test/build.gradle.kts b/android-test/build.gradle.kts index 84013fe73230..12c2794bfc01 100644 --- a/android-test/build.gradle.kts +++ b/android-test/build.gradle.kts @@ -63,6 +63,7 @@ dependencies { exclude("org.conscrypt", "conscrypt-openjdk-uber") exclude("software.amazon.cryptools", "AmazonCorrettoCryptoProvider") } + androidTestImplementation(libs.assertk) androidTestImplementation(libs.bouncycastle.bcprov) androidTestImplementation(libs.bouncycastle.bctls) androidTestImplementation(libs.conscrypt.android) diff --git a/android-test/src/androidTest/java/okhttp/android/test/alpn/AlpnOverrideTest.kt b/android-test/src/androidTest/java/okhttp/android/test/alpn/AlpnOverrideTest.kt index d4bdd36a5298..8bb47256b00b 100644 --- a/android-test/src/androidTest/java/okhttp/android/test/alpn/AlpnOverrideTest.kt +++ b/android-test/src/androidTest/java/okhttp/android/test/alpn/AlpnOverrideTest.kt @@ -17,12 +17,17 @@ package okhttp.android.test.alpn; import android.os.Build import android.util.Log -import java.net.InetSocketAddress -import java.net.Proxy +import assertk.assertThat +import assertk.assertions.isEqualTo import javax.net.ssl.SSLSocket import javax.net.ssl.SSLSocketFactory -import okhttp3.* -import org.assertj.core.api.Assertions.assertThat +import okhttp3.Call +import okhttp3.Connection +import okhttp3.ConnectionSpec +import okhttp3.DelegatingSSLSocketFactory +import okhttp3.EventListener +import okhttp3.OkHttpClient +import okhttp3.Request import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test diff --git a/android-test/src/androidTest/java/okhttp/android/test/letsencrypt/LetsEncryptClientTest.kt b/android-test/src/androidTest/java/okhttp/android/test/letsencrypt/LetsEncryptClientTest.kt index b2cd95264b2a..5bf749abb89d 100644 --- a/android-test/src/androidTest/java/okhttp/android/test/letsencrypt/LetsEncryptClientTest.kt +++ b/android-test/src/androidTest/java/okhttp/android/test/letsencrypt/LetsEncryptClientTest.kt @@ -16,15 +16,16 @@ package okhttp.android.test.letsencrypt; import android.os.Build +import assertk.assertThat +import assertk.assertions.isEqualTo +import java.security.cert.X509Certificate import okhttp3.OkHttpClient import okhttp3.Protocol import okhttp3.Request import okhttp3.tls.HandshakeCertificates import okhttp3.tls.decodeCertificatePem -import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test -import java.security.cert.X509Certificate /** * Test for new Let's Encrypt Root Certificate. diff --git a/android-test/src/androidTest/java/okhttp/android/test/sni/SniOverrideTest.kt b/android-test/src/androidTest/java/okhttp/android/test/sni/SniOverrideTest.kt index 1fd02e23b25d..6b3e3f79e4cd 100644 --- a/android-test/src/androidTest/java/okhttp/android/test/sni/SniOverrideTest.kt +++ b/android-test/src/androidTest/java/okhttp/android/test/sni/SniOverrideTest.kt @@ -17,6 +17,9 @@ package okhttp.android.test.sni; import android.os.Build import android.util.Log +import assertk.assertThat +import assertk.assertions.contains +import assertk.assertions.isEqualTo import java.security.cert.X509Certificate import javax.net.ssl.SNIHostName import javax.net.ssl.SNIServerName @@ -28,7 +31,6 @@ import okhttp3.OkHttpClient import okhttp3.Protocol import okhttp3.Request import org.junit.jupiter.api.Assumptions.assumeTrue -import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test diff --git a/build.gradle.kts b/build.gradle.kts index 085f5e116e5e..a0245c40a9c8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,15 +2,10 @@ import com.vanniktech.maven.publish.MavenPublishBaseExtension import com.vanniktech.maven.publish.SonatypeHost -import groovy.util.Node -import groovy.util.NodeList import java.net.URL import kotlinx.validation.ApiValidationExtension import org.gradle.api.tasks.testing.logging.TestExceptionFormat import org.jetbrains.dokka.gradle.DokkaTaskPartial -import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest -import org.jetbrains.kotlin.gradle.targets.jvm.tasks.KotlinJvmTest -import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeTest import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import ru.vyarus.gradle.plugin.animalsniffer.AnimalSnifferExtension @@ -179,16 +174,9 @@ subprojects { } // https://publicobject.com/2023/04/16/read-a-project-file-in-a-kotlin-multiplatform-test/ - tasks.withType().configureEach { + tasks.withType().configureEach { environment("OKHTTP_ROOT", rootDir) } - tasks.withType().configureEach { - environment("SIMCTL_CHILD_OKHTTP_ROOT", rootDir) - environment("OKHTTP_ROOT", rootDir) - } - tasks.withType().configureEach { - environment("OKHTTP_ROOT", rootDir.toString()) - } if (platform == "jdk8alpn") { // Add alpn-boot on Java 8 so we can use HTTP/2 without a stable API. @@ -265,31 +253,6 @@ subprojects { } } } - - // Configure the kotlinMultiplatform artifact to depend on the JVM artifact in pom.xml only. - // This hack allows Maven users to continue using our original OkHttp artifact names (like - // com.squareup.okhttp3:okhttp:5.x.y) even though we changed that artifact from JVM-only - // to Kotlin Multiplatform. Note that module.json doesn't need this hack. - val mavenPublications = publishingExtension.publications.withType() - mavenPublications.configureEach { - if (name != "jvm") return@configureEach - val jvmPublication = this - val kmpPublication = mavenPublications.getByName("kotlinMultiplatform") - kmpPublication.pom.withXml { - val root = asNode() - val dependencies = (root["dependencies"] as NodeList).firstOrNull() as Node? - ?: root.appendNode("dependencies") - for (child in dependencies.children().toList()) { - dependencies.remove(child as Node) - } - dependencies.appendNode("dependency").apply { - appendNode("groupId", jvmPublication.groupId) - appendNode("artifactId", jvmPublication.artifactId) - appendNode("version", jvmPublication.version) - appendNode("scope", "compile") - } - } - } } } @@ -304,13 +267,6 @@ subprojects { ignoredPackages += "okhttp3.tls.internal" } } - - plugins.withId("org.jetbrains.kotlin.jvm") { - val jvmTest by tasks.creating { - description = "Get 'gradlew jvmTest' to run the tests of JVM-only modules" - dependsOn("test") - } - } } tasks.wrapper { diff --git a/buildSrc/src/main/kotlin/artifacts.kt b/buildSrc/src/main/kotlin/artifacts.kt index 40a6707a2718..7a33138b8e24 100644 --- a/buildSrc/src/main/kotlin/artifacts.kt +++ b/buildSrc/src/main/kotlin/artifacts.kt @@ -26,12 +26,6 @@ import org.gradle.kotlin.dsl.get import org.gradle.kotlin.dsl.getByName fun Project.applyOsgi(vararg bndProperties: String) { - // Configure OSGi for the JVM platform on kotlin-multiplatform. - plugins.withId("org.jetbrains.kotlin.multiplatform") { - applyOsgi("jvmJar", "jvmOsgiApi", bndProperties) - } - - // Configure OSGi for kotlin-jvm. plugins.withId("org.jetbrains.kotlin.jvm") { applyOsgi("jar", "osgiApi", bndProperties) } diff --git a/docs/features/r8_proguard.md b/docs/features/r8_proguard.md index acdc93807f96..cafa22b3700c 100644 --- a/docs/features/r8_proguard.md +++ b/docs/features/r8_proguard.md @@ -9,5 +9,5 @@ interpreted by R8 automatically. If you, however, don't use R8 you have to apply the rules from [this file][okhttp3_pro]. You might also need rules from [Okio][okio] which is a dependency of this library. - [okhttp3_pro]: https://raw.githubusercontent.com/square/okhttp/master/okhttp/src/jvmMain/resources/META-INF/proguard/okhttp3.pro + [okhttp3_pro]: https://raw.githubusercontent.com/square/okhttp/master/okhttp/src/main/resources/META-INF/proguard/okhttp3.pro [okio]: https://square.github.io/okio/ diff --git a/mockwebserver-junit4/build.gradle.kts b/mockwebserver-junit4/build.gradle.kts index 9e1b5980688c..8302a3a3035c 100644 --- a/mockwebserver-junit4/build.gradle.kts +++ b/mockwebserver-junit4/build.gradle.kts @@ -19,6 +19,7 @@ dependencies { api(libs.junit) testImplementation(libs.assertj.core) + testImplementation(libs.assertk) } mavenPublishing { diff --git a/mockwebserver-junit4/src/test/java/mockwebserver3/junit4/MockWebServerRuleTest.kt b/mockwebserver-junit4/src/test/java/mockwebserver3/junit4/MockWebServerRuleTest.kt index c37f0a182a97..69a9a0a40969 100644 --- a/mockwebserver-junit4/src/test/java/mockwebserver3/junit4/MockWebServerRuleTest.kt +++ b/mockwebserver-junit4/src/test/java/mockwebserver3/junit4/MockWebServerRuleTest.kt @@ -15,9 +15,10 @@ */ package mockwebserver3.junit4 +import assertk.assertThat +import assertk.assertions.isTrue import java.net.ConnectException import java.util.concurrent.atomic.AtomicBoolean -import org.assertj.core.api.Assertions.assertThat import org.junit.Assert.fail import org.junit.Test import org.junit.runner.Description @@ -34,7 +35,7 @@ class MockWebServerRuleTest { } }, Description.EMPTY) statement.evaluate() - assertThat(called.get()).isTrue + assertThat(called.get()).isTrue() try { rule.server.url("/").toUrl().openConnection().connect() fail() diff --git a/mockwebserver-junit5/build.gradle.kts b/mockwebserver-junit5/build.gradle.kts index 99cb2ed5b5c4..8eab01aee008 100644 --- a/mockwebserver-junit5/build.gradle.kts +++ b/mockwebserver-junit5/build.gradle.kts @@ -30,6 +30,7 @@ dependencies { testImplementation(libs.kotlin.junit5) testImplementation(projects.okhttpTestingSupport) testImplementation(libs.assertj.core) + testImplementation(libs.assertk) } mavenPublishing { diff --git a/mockwebserver-junit5/src/test/java/mockwebserver3/junit5/internal/ExtensionLifecycleTest.kt b/mockwebserver-junit5/src/test/java/mockwebserver3/junit5/internal/ExtensionLifecycleTest.kt index f5a269e591a4..989e11aae8bb 100644 --- a/mockwebserver-junit5/src/test/java/mockwebserver3/junit5/internal/ExtensionLifecycleTest.kt +++ b/mockwebserver-junit5/src/test/java/mockwebserver3/junit5/internal/ExtensionLifecycleTest.kt @@ -15,11 +15,14 @@ */ package mockwebserver3.junit5.internal +import assertk.assertThat +import assertk.assertions.isEqualTo +import assertk.assertions.isSameAs +import assertk.assertions.isTrue import mockwebserver3.MockResponse import mockwebserver3.MockWebServer import okhttp3.OkHttpClientTestRule import okhttp3.Request -import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test diff --git a/mockwebserver-junit5/src/test/java/mockwebserver3/junit5/internal/ExtensionMultipleInstancesTest.kt b/mockwebserver-junit5/src/test/java/mockwebserver3/junit5/internal/ExtensionMultipleInstancesTest.kt index fbbc89b70bbb..e9fb71a83b79 100644 --- a/mockwebserver-junit5/src/test/java/mockwebserver3/junit5/internal/ExtensionMultipleInstancesTest.kt +++ b/mockwebserver-junit5/src/test/java/mockwebserver3/junit5/internal/ExtensionMultipleInstancesTest.kt @@ -15,8 +15,11 @@ */ package mockwebserver3.junit5.internal +import assertk.assertThat +import assertk.assertions.isEqualTo +import assertk.assertions.isNotEqualTo +import assertk.assertions.isTrue import mockwebserver3.MockWebServer -import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test diff --git a/mockwebserver-junit5/src/test/java/mockwebserver3/junit5/internal/ExtensionMultipleTestsTest.kt b/mockwebserver-junit5/src/test/java/mockwebserver3/junit5/internal/ExtensionMultipleTestsTest.kt index 441c9cefdb3a..a531031f3d4a 100644 --- a/mockwebserver-junit5/src/test/java/mockwebserver3/junit5/internal/ExtensionMultipleTestsTest.kt +++ b/mockwebserver-junit5/src/test/java/mockwebserver3/junit5/internal/ExtensionMultipleTestsTest.kt @@ -15,10 +15,10 @@ */ package mockwebserver3.junit5.internal +import assertk.assertThat +import assertk.assertions.isTrue import mockwebserver3.MockWebServer -import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import org.junit.jupiter.api.TestInstance import org.junit.jupiter.api.extension.ExtendWith @ExtendWith(MockWebServerExtension::class) diff --git a/mockwebserver/build.gradle.kts b/mockwebserver/build.gradle.kts index c6483c07c0fa..34eefd8c694e 100644 --- a/mockwebserver/build.gradle.kts +++ b/mockwebserver/build.gradle.kts @@ -22,6 +22,7 @@ dependencies { testRuntimeOnly(projects.mockwebserver3Junit5) testImplementation(libs.junit) testImplementation(libs.assertj.core) + testImplementation(libs.assertk) } mavenPublishing { diff --git a/mockwebserver/src/test/java/mockwebserver3/CustomDispatcherTest.kt b/mockwebserver/src/test/java/mockwebserver3/CustomDispatcherTest.kt index ea2ee1441bdb..682c790fb03d 100644 --- a/mockwebserver/src/test/java/mockwebserver3/CustomDispatcherTest.kt +++ b/mockwebserver/src/test/java/mockwebserver3/CustomDispatcherTest.kt @@ -15,11 +15,12 @@ */ package mockwebserver3 +import assertk.assertThat +import assertk.assertions.isEqualTo import java.io.IOException import java.net.HttpURLConnection import java.util.concurrent.CountDownLatch import java.util.concurrent.atomic.AtomicInteger -import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.junit.jupiter.api.Timeout diff --git a/mockwebserver/src/test/java/mockwebserver3/MockResponseSniTest.kt b/mockwebserver/src/test/java/mockwebserver3/MockResponseSniTest.kt index d3049f8e4106..b312a5d61f80 100644 --- a/mockwebserver/src/test/java/mockwebserver3/MockResponseSniTest.kt +++ b/mockwebserver/src/test/java/mockwebserver3/MockResponseSniTest.kt @@ -15,6 +15,11 @@ */ package mockwebserver3 +import assertk.assertThat +import assertk.assertions.containsExactly +import assertk.assertions.isEmpty +import assertk.assertions.isEqualTo +import assertk.assertions.isTrue import okhttp3.Dns import okhttp3.Headers.Companion.headersOf import okhttp3.HttpUrl.Companion.toHttpUrl @@ -24,7 +29,6 @@ import okhttp3.testing.PlatformRule import okhttp3.tls.HandshakeCertificates import okhttp3.tls.HeldCertificate import okhttp3.tls.internal.TlsUtil.localhost -import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.RegisterExtension diff --git a/mockwebserver/src/test/java/mockwebserver3/MockWebServerTest.kt b/mockwebserver/src/test/java/mockwebserver3/MockWebServerTest.kt index 4f425236624f..4c298ac7fb5c 100644 --- a/mockwebserver/src/test/java/mockwebserver3/MockWebServerTest.kt +++ b/mockwebserver/src/test/java/mockwebserver3/MockWebServerTest.kt @@ -15,6 +15,17 @@ */ package mockwebserver3 +import assertk.assertThat +import assertk.assertions.contains +import assertk.assertions.containsExactly +import assertk.assertions.isBetween +import assertk.assertions.isCloseTo +import assertk.assertions.isEqualTo +import assertk.assertions.isGreaterThan +import assertk.assertions.isGreaterThanOrEqualTo +import assertk.assertions.isNotEqualTo +import assertk.assertions.isNotNull +import assertk.assertions.isNull import java.io.BufferedReader import java.io.Closeable import java.io.IOException @@ -42,8 +53,6 @@ import okhttp3.testing.PlatformRule import okhttp3.tls.HandshakeCertificates import okhttp3.tls.HeldCertificate import okio.Buffer -import org.assertj.core.api.Assertions.assertThat -import org.assertj.core.data.Offset import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Assertions.fail import org.junit.jupiter.api.BeforeEach @@ -371,7 +380,7 @@ class MockWebServerTest { i++ } // Halfway +/- 0.5% - assertThat(i.toFloat()).isCloseTo(512f, Offset.offset(5f)) + assertThat(i.toFloat()).isCloseTo(512f, 5f) } @Test @@ -425,12 +434,12 @@ class MockWebServerTest { @Test fun hostnameImplicitlyStarts() { - assertThat(server.hostName).isNotNull + assertThat(server.hostName).isNotNull() } @Test fun toProxyAddressImplicitlyStarts() { - assertThat(server.toProxyAddress()).isNotNull + assertThat(server.toProxyAddress()).isNotNull() } @Test @@ -491,7 +500,7 @@ class MockWebServerTest { refusedConnection.responseCode fail("Second connection should be refused") } catch (e: ConnectException) { - assertThat(e.message).contains("refused") + assertThat(e.message!!).contains("refused") } } @@ -579,9 +588,9 @@ class MockWebServerTest { val request = server.takeRequest() assertThat(request.requestUrl!!.scheme).isEqualTo("https") val handshake = request.handshake - assertThat(handshake!!.tlsVersion).isNotNull - assertThat(handshake.cipherSuite).isNotNull - assertThat(handshake.localPrincipal).isNotNull + assertThat(handshake!!.tlsVersion).isNotNull() + assertThat(handshake.cipherSuite).isNotNull() + assertThat(handshake.localPrincipal).isNotNull() assertThat(handshake.localCertificates.size).isEqualTo(1) assertThat(handshake.peerPrincipal).isNull() assertThat(handshake.peerCertificates.size).isEqualTo(0) @@ -628,11 +637,11 @@ class MockWebServerTest { val request = server.takeRequest() assertThat(request.requestUrl!!.scheme).isEqualTo("https") val handshake = request.handshake - assertThat(handshake!!.tlsVersion).isNotNull - assertThat(handshake.cipherSuite).isNotNull - assertThat(handshake.localPrincipal).isNotNull + assertThat(handshake!!.tlsVersion).isNotNull() + assertThat(handshake.cipherSuite).isNotNull() + assertThat(handshake.localPrincipal).isNotNull() assertThat(handshake.localCertificates.size).isEqualTo(1) - assertThat(handshake.peerPrincipal).isNotNull + assertThat(handshake.peerPrincipal).isNotNull() assertThat(handshake.peerCertificates.size).isEqualTo(1) } diff --git a/mockwebserver/src/test/java/mockwebserver3/RecordedRequestTest.kt b/mockwebserver/src/test/java/mockwebserver3/RecordedRequestTest.kt index fe2b1b9e9044..e2120f7446df 100644 --- a/mockwebserver/src/test/java/mockwebserver3/RecordedRequestTest.kt +++ b/mockwebserver/src/test/java/mockwebserver3/RecordedRequestTest.kt @@ -16,13 +16,14 @@ @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") package mockwebserver3 +import assertk.assertThat +import assertk.assertions.isEqualTo import java.net.InetAddress import java.net.Socket import okhttp3.Headers import okhttp3.Headers.Companion.headersOf import okhttp3.internal.EMPTY_HEADERS import okio.Buffer -import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.api.Timeout diff --git a/okcurl/build.gradle.kts b/okcurl/build.gradle.kts index 55417bede5c2..77734c77c77d 100644 --- a/okcurl/build.gradle.kts +++ b/okcurl/build.gradle.kts @@ -1,9 +1,9 @@ import com.vanniktech.maven.publish.JavadocJar -import com.vanniktech.maven.publish.KotlinMultiplatform +import com.vanniktech.maven.publish.KotlinJvm import org.apache.tools.ant.taskdefs.condition.Os plugins { - kotlin("multiplatform") + kotlin("jvm") id("org.jetbrains.dokka") id("com.vanniktech.maven.publish.base") id("com.palantir.graal") @@ -11,55 +11,35 @@ plugins { } val copyResourcesTemplates = tasks.register("copyResourcesTemplates") { - from("src/jvmMain/resources-templates") + from("src/main/resources-templates") into("$buildDir/generated/resources-templates") expand("projectVersion" to "${project.version}") filteringCharset = Charsets.UTF_8.toString() } kotlin { - jvm() - sourceSets { - val jvmMain by getting { + val main by getting { resources.srcDir(copyResourcesTemplates.get().outputs) - dependencies { - api(libs.kotlin.stdlib) - } - dependencies { - api(libs.kotlin.stdlib) - api(projects.okhttp) - api(projects.loggingInterceptor) - api(libs.squareup.okio) - implementation(libs.clikt) - api(libs.guava.jre) - } } + } +} - val jvmTest by getting { - dependencies { - api(libs.kotlin.stdlib) - implementation(projects.okhttpTestingSupport) - api(libs.squareup.okio) - api(libs.assertk) - implementation(kotlin("test")) - } - } +dependencies { + api(libs.kotlin.stdlib) + api(projects.okhttp) + api(projects.loggingInterceptor) + api(libs.squareup.okio) + implementation(libs.clikt) + api(libs.guava.jre) - // Workaround for https://github.com/palantir/gradle-graal/issues/129 - // Add a second configuration to populate - // runtimeClasspath vs jvmRuntimeClasspath - val main by register("main") { - dependencies { - implementation(libs.kotlin.stdlib) - implementation(projects.okhttp) - implementation(projects.loggingInterceptor) - implementation(libs.squareup.okio) - implementation(libs.clikt) - implementation(libs.guava.jre) - } - } - } + testImplementation(projects.okhttpTestingSupport) + testApi(libs.assertk) + testImplementation(kotlin("test")) +} + +animalsniffer { + isIgnoreFailures = true } tasks.jar { @@ -89,18 +69,6 @@ graal { } } -// Workaround for https://github.com/palantir/gradle-graal/issues/129 -// Copy the jvmJar output into the normal jar location -val copyJvmJar = tasks.register("copyJvmJar") { - val sourceFile = project.tasks.getByName("jvmJar").outputs.files.singleFile - val destinationFile = project.tasks.getByName("jar").outputs.files.singleFile - from(sourceFile) - into(destinationFile.parentFile) - rename (sourceFile.name, destinationFile.name) -} -tasks.getByName("copyJvmJar").dependsOn(tasks.getByName("jvmJar")) -tasks.getByName("nativeImage").dependsOn(copyJvmJar) - mavenPublishing { - configure(KotlinMultiplatform(javadocJar = JavadocJar.Empty())) + configure(KotlinJvm(javadocJar = JavadocJar.Empty())) } diff --git a/okcurl/src/jvmMain/kotlin/okhttp3/curl/Main.kt b/okcurl/src/main/kotlin/okhttp3/curl/Main.kt similarity index 100% rename from okcurl/src/jvmMain/kotlin/okhttp3/curl/Main.kt rename to okcurl/src/main/kotlin/okhttp3/curl/Main.kt diff --git a/okcurl/src/jvmMain/kotlin/okhttp3/curl/MainCommandLine.kt b/okcurl/src/main/kotlin/okhttp3/curl/MainCommandLine.kt similarity index 100% rename from okcurl/src/jvmMain/kotlin/okhttp3/curl/MainCommandLine.kt rename to okcurl/src/main/kotlin/okhttp3/curl/MainCommandLine.kt diff --git a/okcurl/src/jvmMain/kotlin/okhttp3/curl/internal/-MainCommon.kt b/okcurl/src/main/kotlin/okhttp3/curl/internal/-MainCommon.kt similarity index 100% rename from okcurl/src/jvmMain/kotlin/okhttp3/curl/internal/-MainCommon.kt rename to okcurl/src/main/kotlin/okhttp3/curl/internal/-MainCommon.kt diff --git a/okcurl/src/jvmMain/kotlin/okhttp3/curl/logging/LoggingUtil.kt b/okcurl/src/main/kotlin/okhttp3/curl/logging/LoggingUtil.kt similarity index 100% rename from okcurl/src/jvmMain/kotlin/okhttp3/curl/logging/LoggingUtil.kt rename to okcurl/src/main/kotlin/okhttp3/curl/logging/LoggingUtil.kt diff --git a/okcurl/src/jvmMain/kotlin/okhttp3/curl/logging/MessageFormatter.kt b/okcurl/src/main/kotlin/okhttp3/curl/logging/MessageFormatter.kt similarity index 100% rename from okcurl/src/jvmMain/kotlin/okhttp3/curl/logging/MessageFormatter.kt rename to okcurl/src/main/kotlin/okhttp3/curl/logging/MessageFormatter.kt diff --git a/okcurl/src/jvmMain/kotlin/okhttp3/curl/logging/OneLineLogFormat.kt b/okcurl/src/main/kotlin/okhttp3/curl/logging/OneLineLogFormat.kt similarity index 100% rename from okcurl/src/jvmMain/kotlin/okhttp3/curl/logging/OneLineLogFormat.kt rename to okcurl/src/main/kotlin/okhttp3/curl/logging/OneLineLogFormat.kt diff --git a/okcurl/src/jvmMain/resources-templates/okcurl-version.properties b/okcurl/src/main/resources-templates/okcurl-version.properties similarity index 100% rename from okcurl/src/jvmMain/resources-templates/okcurl-version.properties rename to okcurl/src/main/resources-templates/okcurl-version.properties diff --git a/okcurl/src/jvmMain/resources/META-INF/native-image/okhttp3/okcurl/reflect-config.json b/okcurl/src/main/resources/META-INF/native-image/okhttp3/okcurl/reflect-config.json similarity index 100% rename from okcurl/src/jvmMain/resources/META-INF/native-image/okhttp3/okcurl/reflect-config.json rename to okcurl/src/main/resources/META-INF/native-image/okhttp3/okcurl/reflect-config.json diff --git a/okcurl/src/jvmMain/resources/META-INF/native-image/okhttp3/okcurl/resource-config.json b/okcurl/src/main/resources/META-INF/native-image/okhttp3/okcurl/resource-config.json similarity index 100% rename from okcurl/src/jvmMain/resources/META-INF/native-image/okhttp3/okcurl/resource-config.json rename to okcurl/src/main/resources/META-INF/native-image/okhttp3/okcurl/resource-config.json diff --git a/okcurl/src/jvmTest/kotlin/okhttp3/curl/MainTest.kt b/okcurl/src/test/kotlin/okhttp3/curl/MainTest.kt similarity index 100% rename from okcurl/src/jvmTest/kotlin/okhttp3/curl/MainTest.kt rename to okcurl/src/test/kotlin/okhttp3/curl/MainTest.kt diff --git a/okcurl/src/jvmTest/kotlin/okhttp3/curl/OkcurlTest.kt b/okcurl/src/test/kotlin/okhttp3/curl/OkcurlTest.kt similarity index 100% rename from okcurl/src/jvmTest/kotlin/okhttp3/curl/OkcurlTest.kt rename to okcurl/src/test/kotlin/okhttp3/curl/OkcurlTest.kt diff --git a/okhttp-android/build.gradle.kts b/okhttp-android/build.gradle.kts index c6c81e79b8d6..fefcab407408 100644 --- a/okhttp-android/build.gradle.kts +++ b/okhttp-android/build.gradle.kts @@ -56,6 +56,7 @@ dependencies { testImplementation(libs.junit) testImplementation(libs.junit.ktx) testImplementation(libs.assertj.core) + testImplementation(libs.assertk) testImplementation(projects.okhttpTls) testImplementation(libs.androidx.test.runner) testImplementation(libs.robolectric) @@ -64,6 +65,7 @@ dependencies { androidTestImplementation(projects.okhttpTls) androidTestImplementation(libs.assertj.core) + androidTestImplementation(libs.assertk) androidTestImplementation(projects.mockwebserver3Junit4) androidTestImplementation(libs.androidx.test.runner) } diff --git a/okhttp-android/src/androidTest/kotlin/okhttp3/android/AndroidAsyncDnsTest.kt b/okhttp-android/src/androidTest/kotlin/okhttp3/android/AndroidAsyncDnsTest.kt index 4e9a958adfee..9525b1ce6f04 100644 --- a/okhttp-android/src/androidTest/kotlin/okhttp3/android/AndroidAsyncDnsTest.kt +++ b/okhttp-android/src/androidTest/kotlin/okhttp3/android/AndroidAsyncDnsTest.kt @@ -20,11 +20,16 @@ import android.content.Context import android.net.ConnectivityManager import android.os.Build import androidx.test.platform.app.InstrumentationRegistry +import assertk.assertThat +import assertk.assertions.hasMessage +import assertk.assertions.isEmpty +import assertk.assertions.isEqualTo +import assertk.assertions.isNotEmpty +import assertk.assertions.isNull import java.net.InetAddress import java.net.UnknownHostException import java.util.concurrent.CountDownLatch import mockwebserver3.MockResponse -import mockwebserver3.MockWebServer import mockwebserver3.junit4.MockWebServerRule import okhttp3.AsyncDns import okhttp3.HttpUrl.Companion.toHttpUrl @@ -33,9 +38,7 @@ import okhttp3.Request import okhttp3.tls.HandshakeCertificates import okhttp3.tls.HeldCertificate import okio.IOException -import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.fail -import org.junit.Assume import org.junit.Assume.assumeTrue import org.junit.AssumptionViolatedException import org.junit.Before @@ -115,7 +118,7 @@ class AndroidAsyncDnsTest { val (allAddresses, exception) = dnsQuery("localhost") assertThat(exception).isNull() - assertThat(allAddresses).isNotEmpty + assertThat(allAddresses).isNotEmpty() } private fun dnsQuery(hostname: String): Pair, Exception?> { @@ -148,7 +151,7 @@ class AndroidAsyncDnsTest { val (allAddresses, exception) = dnsQuery("google.com") assertThat(exception).isNull() - assertThat(allAddresses).isNotEmpty + assertThat(allAddresses).isNotEmpty() } @Test diff --git a/okhttp-android/src/test/kotlin/okhttp3/android/RobolectricOkHttpClientTest.kt b/okhttp-android/src/test/kotlin/okhttp3/android/RobolectricOkHttpClientTest.kt index f2c30dd7af2e..7308a612e554 100644 --- a/okhttp-android/src/test/kotlin/okhttp3/android/RobolectricOkHttpClientTest.kt +++ b/okhttp-android/src/test/kotlin/okhttp3/android/RobolectricOkHttpClientTest.kt @@ -19,22 +19,24 @@ package okhttp3.android import android.app.Application import android.content.Context import androidx.test.core.app.ApplicationProvider -import okhttp3.CacheControl +import assertk.assertThat +import assertk.assertions.isEqualTo +import assertk.assertions.isNotNull +import assertk.assertions.isNull +import java.net.InetAddress +import java.net.UnknownHostException +import okhttp3.Cache import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.OkHttpClient import okhttp3.Request -import org.assertj.core.api.Assertions.assertThat +import okio.Path.Companion.toPath +import okio.fakefilesystem.FakeFileSystem import org.junit.AssumptionViolatedException import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config -import java.net.InetAddress -import java.net.UnknownHostException -import okhttp3.Cache -import okio.Path.Companion.toPath -import okio.fakefilesystem.FakeFileSystem @RunWith(RobolectricTestRunner::class) @Config( diff --git a/okhttp-brotli/build.gradle.kts b/okhttp-brotli/build.gradle.kts index 60111d3c7238..e0c2764fb7ec 100644 --- a/okhttp-brotli/build.gradle.kts +++ b/okhttp-brotli/build.gradle.kts @@ -23,6 +23,7 @@ dependencies { testImplementation(libs.conscrypt.openjdk) testImplementation(libs.junit) testImplementation(libs.assertj.core) + testImplementation(libs.assertk) } mavenPublishing { diff --git a/okhttp-brotli/src/test/java/okhttp3/brotli/BrotliInterceptorTest.kt b/okhttp-brotli/src/test/java/okhttp3/brotli/BrotliInterceptorTest.kt index 46f9b91f8c6e..ccf8f58b6516 100644 --- a/okhttp-brotli/src/test/java/okhttp3/brotli/BrotliInterceptorTest.kt +++ b/okhttp-brotli/src/test/java/okhttp3/brotli/BrotliInterceptorTest.kt @@ -15,6 +15,11 @@ */ package okhttp3.brotli +import assertk.assertThat +import assertk.assertions.contains +import assertk.assertions.hasMessage +import assertk.assertions.isEmpty +import assertk.assertions.isEqualTo import java.io.IOException import okhttp3.MediaType.Companion.toMediaType import okhttp3.Protocol @@ -26,7 +31,6 @@ import okio.ByteString import okio.ByteString.Companion.EMPTY import okio.ByteString.Companion.decodeHex import okio.ByteString.Companion.encodeUtf8 -import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.api.fail diff --git a/okhttp-coroutines/build.gradle.kts b/okhttp-coroutines/build.gradle.kts index 376ee27d0670..748bac6238f2 100644 --- a/okhttp-coroutines/build.gradle.kts +++ b/okhttp-coroutines/build.gradle.kts @@ -1,48 +1,33 @@ import com.vanniktech.maven.publish.JavadocJar -import com.vanniktech.maven.publish.KotlinMultiplatform +import com.vanniktech.maven.publish.KotlinJvm plugins { - kotlin("multiplatform") + kotlin("jvm") id("org.jetbrains.dokka") id("com.vanniktech.maven.publish.base") id("binary-compatibility-validator") } -kotlin { - jvm { - withJava() - } - - sourceSets { - getByName("jvmMain") { - dependencies { - api(projects.okhttp) - implementation(libs.kotlinx.coroutines.core) - api(libs.squareup.okio) - api(libs.kotlin.stdlib) - } - } - getByName("jvmTest") { - dependencies { - implementation(libs.kotlin.test.common) - implementation(libs.kotlin.test.annotations) - api(libs.assertk) - implementation(projects.okhttpTestingSupport) - implementation(libs.kotlinx.coroutines.test) - implementation(projects.mockwebserver3Junit5) - } - } - } -} - project.applyOsgi( "Export-Package: okhttp3.coroutines", "Automatic-Module-Name: okhttp3.coroutines", "Bundle-SymbolicName: com.squareup.okhttp3.coroutines" ) +dependencies { + api(projects.okhttp) + implementation(libs.kotlinx.coroutines.core) + api(libs.squareup.okio) + api(libs.kotlin.stdlib) + + testImplementation(libs.kotlin.test.common) + testImplementation(libs.kotlin.test.annotations) + testApi(libs.assertk) + testImplementation(projects.okhttpTestingSupport) + testImplementation(libs.kotlinx.coroutines.test) + testImplementation(projects.mockwebserver3Junit5) +} + mavenPublishing { - configure( - KotlinMultiplatform(javadocJar = JavadocJar.Empty()) - ) + configure(KotlinJvm(javadocJar = JavadocJar.Empty())) } diff --git a/okhttp-coroutines/src/jvmMain/kotlin/okhttp3/JvmCallExtensions.kt b/okhttp-coroutines/src/main/kotlin/okhttp3/JvmCallExtensions.kt similarity index 100% rename from okhttp-coroutines/src/jvmMain/kotlin/okhttp3/JvmCallExtensions.kt rename to okhttp-coroutines/src/main/kotlin/okhttp3/JvmCallExtensions.kt diff --git a/okhttp-coroutines/src/jvmTest/kotlin/okhttp3/SuspendCallTest.kt b/okhttp-coroutines/src/test/kotlin/okhttp3/SuspendCallTest.kt similarity index 100% rename from okhttp-coroutines/src/jvmTest/kotlin/okhttp3/SuspendCallTest.kt rename to okhttp-coroutines/src/test/kotlin/okhttp3/SuspendCallTest.kt diff --git a/okhttp-logging-interceptor/build.gradle.kts b/okhttp-logging-interceptor/build.gradle.kts index dbf546c5e5ff..9395c780d8fc 100644 --- a/okhttp-logging-interceptor/build.gradle.kts +++ b/okhttp-logging-interceptor/build.gradle.kts @@ -25,6 +25,7 @@ dependencies { testImplementation(projects.okhttpTestingSupport) testImplementation(projects.okhttpTls) testImplementation(libs.assertj.core) + testImplementation(libs.assertk) } mavenPublishing { diff --git a/okhttp-logging-interceptor/src/test/java/okhttp3/logging/IsProbablyUtf8Test.kt b/okhttp-logging-interceptor/src/test/java/okhttp3/logging/IsProbablyUtf8Test.kt index d1b06e28fec5..f965ff6c03be 100644 --- a/okhttp-logging-interceptor/src/test/java/okhttp3/logging/IsProbablyUtf8Test.kt +++ b/okhttp-logging-interceptor/src/test/java/okhttp3/logging/IsProbablyUtf8Test.kt @@ -15,9 +15,11 @@ */ package okhttp3.logging +import assertk.assertThat +import assertk.assertions.isFalse +import assertk.assertions.isTrue import okhttp3.logging.internal.isProbablyUtf8 import okio.Buffer -import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test class IsProbablyUtf8Test { diff --git a/okhttp-testing-support/build.gradle.kts b/okhttp-testing-support/build.gradle.kts index f6a38d13e0c4..01138236cecf 100644 --- a/okhttp-testing-support/build.gradle.kts +++ b/okhttp-testing-support/build.gradle.kts @@ -1,47 +1,33 @@ plugins { - kotlin("multiplatform") + kotlin("jvm") id("ru.vyarus.animalsniffer") } -kotlin { - jvm { - withJava() - } - - sourceSets { - val jvmMain by getting { - dependencies { - api(libs.squareup.okio) - api(projects.okhttp) - api(projects.okhttpTls) - api(libs.assertj.core) - api(libs.bouncycastle.bcprov) - implementation(libs.bouncycastle.bcpkix) - implementation(libs.bouncycastle.bctls) - api(libs.conscrypt.openjdk) - api(libs.openjsse) - - api(libs.amazonCorretto) - - api(libs.hamcrestLibrary) - api(libs.junit.jupiter.api) - api(libs.junit.jupiter.params) +dependencies { + api(libs.squareup.okio) + api(projects.okhttp) + api(projects.okhttpTls) + api(libs.assertj.core) + api(libs.assertk) + api(libs.bouncycastle.bcprov) + implementation(libs.bouncycastle.bcpkix) + implementation(libs.bouncycastle.bctls) + api(libs.conscrypt.openjdk) + api(libs.openjsse) + + api(variantOf(libs.amazonCorretto) { + classifier("linux-x86_64") + }) - api(libs.junit.pioneer) + api(libs.hamcrestLibrary) + api(libs.junit.jupiter.api) + api(libs.junit.jupiter.params) - compileOnly(libs.findbugs.jsr305) - compileOnly(libs.robolectric.android) - } - } - } -} + api(libs.junit.pioneer) -val jvmMainApi by configurations.getting + compileOnly(libs.findbugs.jsr305) + compileOnly(libs.robolectric.android) -dependencies { - jvmMainApi(variantOf(libs.amazonCorretto) { - classifier("linux-x86_64") - }) } animalsniffer { diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/CallEvent.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/CallEvent.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/CallEvent.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/CallEvent.kt diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/ClientRuleEventListener.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/ClientRuleEventListener.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/ClientRuleEventListener.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/ClientRuleEventListener.kt diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/ConnectionEvent.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/ConnectionEvent.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/ConnectionEvent.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/ConnectionEvent.kt diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/DelegatingSSLSession.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/DelegatingSSLSession.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/DelegatingSSLSession.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/DelegatingSSLSession.kt diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/DelegatingSSLSocket.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/DelegatingSSLSocket.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/DelegatingSSLSocket.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/DelegatingSSLSocket.kt diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/DelegatingSSLSocketFactory.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/DelegatingSSLSocketFactory.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/DelegatingSSLSocketFactory.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/DelegatingSSLSocketFactory.kt diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/DelegatingServerSocketFactory.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/DelegatingServerSocketFactory.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/DelegatingServerSocketFactory.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/DelegatingServerSocketFactory.kt diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/DelegatingSocketFactory.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/DelegatingSocketFactory.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/DelegatingSocketFactory.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/DelegatingSocketFactory.kt diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/FakeDns.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/FakeDns.kt similarity index 97% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/FakeDns.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/FakeDns.kt index 9ab1a138a4b0..3462f6a603a5 100644 --- a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/FakeDns.kt +++ b/okhttp-testing-support/src/main/kotlin/okhttp3/FakeDns.kt @@ -15,10 +15,11 @@ */ package okhttp3 +import assertk.assertThat +import assertk.assertions.containsExactly import java.net.InetAddress import java.net.UnknownHostException import okio.Buffer -import org.assertj.core.api.Assertions.assertThat class FakeDns : Dns { private val hostAddresses: MutableMap> = mutableMapOf() diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/FakeProxySelector.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/FakeProxySelector.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/FakeProxySelector.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/FakeProxySelector.kt diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/FakeSSLSession.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/FakeSSLSession.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/FakeSSLSession.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/FakeSSLSession.kt diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/ForwardingRequestBody.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/ForwardingRequestBody.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/ForwardingRequestBody.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/ForwardingRequestBody.kt diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/ForwardingResponseBody.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/ForwardingResponseBody.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/ForwardingResponseBody.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/ForwardingResponseBody.kt diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/JsseDebugLogging.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/JsseDebugLogging.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/JsseDebugLogging.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/JsseDebugLogging.kt diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/OkHttpClientTestRule.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/OkHttpClientTestRule.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/OkHttpClientTestRule.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/OkHttpClientTestRule.kt diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/OkHttpDebugLogging.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/OkHttpDebugLogging.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/OkHttpDebugLogging.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/OkHttpDebugLogging.kt diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/RecordingConnectionListener.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/RecordingConnectionListener.kt similarity index 90% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/RecordingConnectionListener.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/RecordingConnectionListener.kt index 6dabd1848e4c..589c51a722be 100644 --- a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/RecordingConnectionListener.kt +++ b/okhttp-testing-support/src/main/kotlin/okhttp3/RecordingConnectionListener.kt @@ -15,15 +15,17 @@ */ package okhttp3 +import assertk.assertThat +import assertk.assertions.isCloseTo +import assertk.assertions.isFalse +import assertk.assertions.isInstanceOf +import assertk.assertions.matchesPredicate import java.util.Deque import java.util.concurrent.ConcurrentLinkedDeque import java.util.concurrent.TimeUnit import okhttp3.ConnectionEvent.NoNewExchanges import okhttp3.internal.connection.RealConnection -import okhttp3.internal.platform.Platform import okio.IOException -import org.assertj.core.api.Assertions.assertThat -import org.assertj.core.data.Offset import org.junit.jupiter.api.Assertions open class RecordingConnectionListener( @@ -88,7 +90,7 @@ open class RecordingConnectionListener( TimeUnit.NANOSECONDS.toMillis(actualElapsedNs) .toDouble() ) - .isCloseTo(elapsedMs.toDouble(), Offset.offset(100.0)) + .isCloseTo(elapsedMs.toDouble(), 100.0) } return result @@ -104,13 +106,11 @@ open class RecordingConnectionListener( private fun logEvent(e: ConnectionEvent) { if (e.connection != null) { - assertThat(Thread.holdsLock(e.connection)) - .overridingErrorMessage("Called with lock $${e.connection}") + assertThat(Thread.holdsLock(e.connection), "Called with lock $${e.connection}") .isFalse() } for (lock in forbiddenLocks) { - assertThat(Thread.holdsLock(lock)) - .overridingErrorMessage("Called with lock $lock") + assertThat(Thread.holdsLock(lock), "Called with lock $lock") .isFalse() } @@ -153,7 +153,9 @@ open class RecordingConnectionListener( override fun connectionReleased(connection: Connection, call: Call) { if (eventSequence.find { it is ConnectionEvent.ConnectStart && it.connection == connection } != null && connection is RealConnection) { if (connection.noNewExchanges) { - assertThat(eventSequence).anyMatch { it is NoNewExchanges && it.connection == connection } + assertThat(eventSequence).matchesPredicate { deque -> + deque.any { it is NoNewExchanges && it.connection == connection } + } } } diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/RecordingCookieJar.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/RecordingCookieJar.kt similarity index 95% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/RecordingCookieJar.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/RecordingCookieJar.kt index b20be3f5e2f4..9940e8db44be 100644 --- a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/RecordingCookieJar.kt +++ b/okhttp-testing-support/src/main/kotlin/okhttp3/RecordingCookieJar.kt @@ -15,9 +15,10 @@ */ package okhttp3 +import assertk.assertThat +import assertk.assertions.containsExactly import java.util.ArrayDeque import java.util.Deque -import org.assertj.core.api.Assertions.assertThat class RecordingCookieJar : CookieJar { private val requestCookies: Deque> = ArrayDeque() diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/RecordingEventListener.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/RecordingEventListener.kt similarity index 95% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/RecordingEventListener.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/RecordingEventListener.kt index f16e0e1c6feb..013b4ac26168 100644 --- a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/RecordingEventListener.kt +++ b/okhttp-testing-support/src/main/kotlin/okhttp3/RecordingEventListener.kt @@ -15,6 +15,11 @@ */ package okhttp3 +import assertk.assertThat +import assertk.assertions.isCloseTo +import assertk.assertions.isFalse +import assertk.assertions.isInstanceOf +import assertk.assertions.matchesPredicate import java.io.IOException import java.net.InetAddress import java.net.InetSocketAddress @@ -51,11 +56,7 @@ import okhttp3.CallEvent.ResponseHeadersStart import okhttp3.CallEvent.SatisfactionFailure import okhttp3.CallEvent.SecureConnectEnd import okhttp3.CallEvent.SecureConnectStart -import org.assertj.core.api.Assertions.assertThat -import org.assertj.core.data.Offset -import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Assertions.fail -import org.junit.jupiter.api.fail open class RecordingEventListener( /** @@ -119,7 +120,7 @@ open class RecordingEventListener( TimeUnit.NANOSECONDS.toMillis(actualElapsedNs) .toDouble() ) - .isCloseTo(elapsedMs.toDouble(), Offset.offset(100.0)) + .isCloseTo(elapsedMs.toDouble(), 100.0) } return result @@ -135,9 +136,7 @@ open class RecordingEventListener( private fun logEvent(e: CallEvent) { for (lock in forbiddenLocks) { - assertThat(Thread.holdsLock(lock)) - .overridingErrorMessage(lock.toString()) - .isFalse() + assertThat(Thread.holdsLock(lock), lock.toString()).isFalse() } if (enforceOrder) { @@ -149,7 +148,7 @@ open class RecordingEventListener( private fun checkForStartEvent(e: CallEvent) { if (eventSequence.isEmpty()) { - assertThat(e).isInstanceOfAny(CallStart::class.java, Canceled::class.java) + assertThat(e).matchesPredicate { it is CallStart || it is Canceled } } else { eventSequence.forEach loop@ { when (e.closes(it)) { diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/RecordingHostnameVerifier.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/RecordingHostnameVerifier.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/RecordingHostnameVerifier.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/RecordingHostnameVerifier.kt diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/SimpleProvider.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/SimpleProvider.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/SimpleProvider.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/SimpleProvider.kt diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/SpecificHostSocketFactory.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/SpecificHostSocketFactory.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/SpecificHostSocketFactory.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/SpecificHostSocketFactory.kt diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/TestUtilCommon.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/TestUtilCommon.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/TestUtilCommon.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/TestUtilCommon.kt diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/TestUtilJvm.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/TestUtilJvm.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/TestUtilJvm.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/TestUtilJvm.kt diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/TestValueFactory.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/TestValueFactory.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/TestValueFactory.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/TestValueFactory.kt diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/UppercaseRequestInterceptor.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/UppercaseRequestInterceptor.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/UppercaseRequestInterceptor.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/UppercaseRequestInterceptor.kt diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/UppercaseResponseInterceptor.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/UppercaseResponseInterceptor.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/UppercaseResponseInterceptor.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/UppercaseResponseInterceptor.kt diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/internal/RecordingOkAuthenticator.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/internal/RecordingOkAuthenticator.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/internal/RecordingOkAuthenticator.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/internal/RecordingOkAuthenticator.kt diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/internal/concurrent/TaskFaker.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/internal/concurrent/TaskFaker.kt similarity index 99% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/internal/concurrent/TaskFaker.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/internal/concurrent/TaskFaker.kt index 155b610cccb1..356888484dab 100644 --- a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/internal/concurrent/TaskFaker.kt +++ b/okhttp-testing-support/src/main/kotlin/okhttp3/internal/concurrent/TaskFaker.kt @@ -15,8 +15,8 @@ */ package okhttp3.internal.concurrent -import okhttp3.OkHttpClient -import org.assertj.core.api.Assertions.assertThat +import assertk.assertThat +import assertk.assertions.isEmpty import java.io.Closeable import java.util.AbstractQueue import java.util.concurrent.BlockingQueue @@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicBoolean import java.util.logging.Logger import kotlin.concurrent.withLock +import okhttp3.OkHttpClient /** * Runs a [TaskRunner] in a controlled environment so that everything is sequential and diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/internal/duplex/AsyncRequestBody.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/internal/duplex/AsyncRequestBody.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/internal/duplex/AsyncRequestBody.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/internal/duplex/AsyncRequestBody.kt diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/internal/http/RecordingProxySelector.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/internal/http/RecordingProxySelector.kt similarity index 95% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/internal/http/RecordingProxySelector.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/internal/http/RecordingProxySelector.kt index 3e9e7e6ec2fe..af367abace92 100644 --- a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/internal/http/RecordingProxySelector.kt +++ b/okhttp-testing-support/src/main/kotlin/okhttp3/internal/http/RecordingProxySelector.kt @@ -16,6 +16,8 @@ @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") package okhttp3.internal.http +import assertk.assertThat +import assertk.assertions.containsExactly import java.io.IOException import java.net.InetSocketAddress import java.net.Proxy @@ -23,7 +25,6 @@ import java.net.ProxySelector import java.net.SocketAddress import java.net.URI import okhttp3.internal.format -import org.assertj.core.api.Assertions.assertThat class RecordingProxySelector : ProxySelector() { @JvmField val proxies = mutableListOf() diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/internal/http2/Http2FlowControlConnectionListener.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/internal/http2/Http2FlowControlConnectionListener.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/internal/http2/Http2FlowControlConnectionListener.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/internal/http2/Http2FlowControlConnectionListener.kt diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/okio/LoggingFilesystem.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/okio/LoggingFilesystem.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/okio/LoggingFilesystem.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/okio/LoggingFilesystem.kt diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/testing/Flaky.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/testing/Flaky.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/testing/Flaky.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/testing/Flaky.kt diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/testing/PlatformRule.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/testing/PlatformRule.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/testing/PlatformRule.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/testing/PlatformRule.kt diff --git a/okhttp-testing-support/src/jvmMain/kotlin/okhttp3/testing/PlatformVersion.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/testing/PlatformVersion.kt similarity index 100% rename from okhttp-testing-support/src/jvmMain/kotlin/okhttp3/testing/PlatformVersion.kt rename to okhttp-testing-support/src/main/kotlin/okhttp3/testing/PlatformVersion.kt diff --git a/okhttp-testing-support/src/jvmTest/kotlin/okhttp3/OkHttpClientTestRuleTest.kt b/okhttp-testing-support/src/test/kotlin/okhttp3/OkHttpClientTestRuleTest.kt similarity index 100% rename from okhttp-testing-support/src/jvmTest/kotlin/okhttp3/OkHttpClientTestRuleTest.kt rename to okhttp-testing-support/src/test/kotlin/okhttp3/OkHttpClientTestRuleTest.kt diff --git a/okhttp-testing-support/src/jvmTest/kotlin/okhttp3/testing/PlatformRuleTest.kt b/okhttp-testing-support/src/test/kotlin/okhttp3/testing/PlatformRuleTest.kt similarity index 100% rename from okhttp-testing-support/src/jvmTest/kotlin/okhttp3/testing/PlatformRuleTest.kt rename to okhttp-testing-support/src/test/kotlin/okhttp3/testing/PlatformRuleTest.kt diff --git a/okhttp/build.gradle.kts b/okhttp/build.gradle.kts index 9e197e87225f..093bb6eacedf 100644 --- a/okhttp/build.gradle.kts +++ b/okhttp/build.gradle.kts @@ -1,8 +1,8 @@ import com.vanniktech.maven.publish.JavadocJar -import com.vanniktech.maven.publish.KotlinMultiplatform +import com.vanniktech.maven.publish.KotlinJvm plugins { - kotlin("multiplatform") + kotlin("jvm") kotlin("plugin.serialization") id("org.jetbrains.dokka") id("com.vanniktech.maven.publish.base") @@ -11,7 +11,7 @@ plugins { // Build & use okhttp3/internal/-InternalVersion.kt val copyKotlinTemplates = tasks.register("copyKotlinTemplates") { - from("src/jvmMain/kotlinTemplates") + from("src/main/kotlinTemplates") into("$buildDir/generated/sources/kotlinTemplates") expand("projectVersion" to project.version) filteringCharset = Charsets.UTF_8.toString() @@ -30,67 +30,10 @@ val generateIdnaMappingTable by tasks.creating(JavaExec::class.java) { } kotlin { - jvm { - withJava() - } - sourceSets { - getByName("jvmMain") { + getByName("main") { kotlin.srcDir(copyKotlinTemplates.get().outputs) kotlin.srcDir(generateIdnaMappingTable.outputs) - - dependencies { - api(libs.squareup.okio) - api(libs.kotlin.stdlib) - - // These compileOnly dependencies must also be listed in the OSGi configuration above. - compileOnly(libs.robolectric.android) - compileOnly(libs.bouncycastle.bcprov) - compileOnly(libs.bouncycastle.bctls) - compileOnly(libs.conscrypt.openjdk) - compileOnly(libs.openjsse) - compileOnly(libs.findbugs.jsr305) - compileOnly(libs.animalsniffer.annotations) - - // graal build support - compileOnly(libs.nativeImageSvm) - } - } - getByName("jvmTest") { - dependencies { - implementation(projects.okhttpTestingSupport) - implementation(libs.assertk) - implementation(libs.kotlin.test.annotations) - implementation(libs.kotlin.test.common) - implementation(libs.kotlinx.serialization.core) - implementation(libs.kotlinx.serialization.json) - implementation(projects.okhttpJavaNetCookiejar) - implementation(projects.okhttpTls) - implementation(projects.okhttpUrlconnection) - implementation(projects.mockwebserver3) - implementation(projects.mockwebserver3Junit4) - implementation(projects.mockwebserver3Junit5) - implementation(projects.mockwebserver) - implementation(projects.loggingInterceptor) - implementation(projects.okhttpBrotli) - implementation(projects.okhttpDnsoverhttps) - implementation(projects.okhttpIdnaMappingTable) - implementation(projects.okhttpSse) - implementation(projects.okhttpCoroutines) - implementation(libs.kotlinx.coroutines.core) - implementation(libs.squareup.moshi) - implementation(libs.squareup.moshi.kotlin) - implementation(libs.squareup.okio.fakefilesystem) - implementation(libs.conscrypt.openjdk) - implementation(libs.junit) - implementation(libs.junit.jupiter.api) - implementation(libs.junit.jupiter.params) - implementation(libs.kotlin.test.junit) - implementation(libs.assertj.core) - implementation(libs.openjsse) - implementation(libs.aqute.resolve) - compileOnly(libs.findbugs.jsr305) - } } } } @@ -145,17 +88,66 @@ val osgiTestDeploy: Configuration by configurations.creating val copyOsgiTestDeployment by tasks.creating(Copy::class.java) { from(osgiTestDeploy) - into("$buildDir/resources/jvmTest/okhttp3/osgi/deployments") + into("$buildDir/resources/test/okhttp3/osgi/deployments") } -tasks.getByName("jvmTest") { +tasks.getByName("test") { dependsOn(copyOsgiTestDeployment) } dependencies { + api(libs.squareup.okio) + api(libs.kotlin.stdlib) + + // These compileOnly dependencies must also be listed in the OSGi configuration above. + compileOnly(libs.robolectric.android) + compileOnly(libs.bouncycastle.bcprov) + compileOnly(libs.bouncycastle.bctls) + compileOnly(libs.conscrypt.openjdk) + compileOnly(libs.openjsse) + compileOnly(libs.findbugs.jsr305) + compileOnly(libs.animalsniffer.annotations) + + // graal build support + compileOnly(libs.nativeImageSvm) + + testCompileOnly(libs.bouncycastle.bctls) + testImplementation(projects.okhttpTestingSupport) + testImplementation(libs.assertk) + testImplementation(libs.kotlin.test.annotations) + testImplementation(libs.kotlin.test.common) + testImplementation(libs.kotlinx.serialization.core) + testImplementation(libs.kotlinx.serialization.json) + testImplementation(projects.okhttpJavaNetCookiejar) + testImplementation(projects.okhttpTls) + testImplementation(projects.okhttpUrlconnection) + testImplementation(projects.mockwebserver3) + testImplementation(projects.mockwebserver3Junit4) + testImplementation(projects.mockwebserver3Junit5) + testImplementation(projects.mockwebserver) + testImplementation(projects.loggingInterceptor) + testImplementation(projects.okhttpBrotli) + testImplementation(projects.okhttpDnsoverhttps) + testImplementation(projects.okhttpIdnaMappingTable) + testImplementation(projects.okhttpSse) + testImplementation(projects.okhttpCoroutines) + testImplementation(libs.kotlinx.coroutines.core) + testImplementation(libs.squareup.moshi) + testImplementation(libs.squareup.moshi.kotlin) + testImplementation(libs.squareup.okio.fakefilesystem) + testImplementation(libs.conscrypt.openjdk) + testImplementation(libs.junit) + testImplementation(libs.junit.jupiter.api) + testImplementation(libs.junit.jupiter.params) + testImplementation(libs.kotlin.test.junit) + testImplementation(libs.assertj.core) + testImplementation(libs.openjsse) + testImplementation(libs.aqute.resolve) + testCompileOnly(libs.findbugs.jsr305) + osgiTestDeploy(libs.eclipseOsgi) osgiTestDeploy(libs.kotlin.stdlib.osgi) } mavenPublishing { - configure(KotlinMultiplatform(javadocJar = JavadocJar.Empty())) + configure(KotlinJvm(javadocJar = JavadocJar.Empty())) } diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/-JvmPlatform.kt b/okhttp/src/main/kotlin/okhttp3/-JvmPlatform.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/-JvmPlatform.kt rename to okhttp/src/main/kotlin/okhttp3/-JvmPlatform.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/Address.kt b/okhttp/src/main/kotlin/okhttp3/Address.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/Address.kt rename to okhttp/src/main/kotlin/okhttp3/Address.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/AsyncDns.kt b/okhttp/src/main/kotlin/okhttp3/AsyncDns.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/AsyncDns.kt rename to okhttp/src/main/kotlin/okhttp3/AsyncDns.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/Authenticator.kt b/okhttp/src/main/kotlin/okhttp3/Authenticator.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/Authenticator.kt rename to okhttp/src/main/kotlin/okhttp3/Authenticator.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/Cache.kt b/okhttp/src/main/kotlin/okhttp3/Cache.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/Cache.kt rename to okhttp/src/main/kotlin/okhttp3/Cache.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/CacheControl.kt b/okhttp/src/main/kotlin/okhttp3/CacheControl.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/CacheControl.kt rename to okhttp/src/main/kotlin/okhttp3/CacheControl.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/Call.kt b/okhttp/src/main/kotlin/okhttp3/Call.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/Call.kt rename to okhttp/src/main/kotlin/okhttp3/Call.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/Callback.kt b/okhttp/src/main/kotlin/okhttp3/Callback.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/Callback.kt rename to okhttp/src/main/kotlin/okhttp3/Callback.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/CertificatePinner.kt b/okhttp/src/main/kotlin/okhttp3/CertificatePinner.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/CertificatePinner.kt rename to okhttp/src/main/kotlin/okhttp3/CertificatePinner.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/Challenge.kt b/okhttp/src/main/kotlin/okhttp3/Challenge.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/Challenge.kt rename to okhttp/src/main/kotlin/okhttp3/Challenge.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/CipherSuite.kt b/okhttp/src/main/kotlin/okhttp3/CipherSuite.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/CipherSuite.kt rename to okhttp/src/main/kotlin/okhttp3/CipherSuite.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/Connection.kt b/okhttp/src/main/kotlin/okhttp3/Connection.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/Connection.kt rename to okhttp/src/main/kotlin/okhttp3/Connection.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/ConnectionListener.kt b/okhttp/src/main/kotlin/okhttp3/ConnectionListener.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/ConnectionListener.kt rename to okhttp/src/main/kotlin/okhttp3/ConnectionListener.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/ConnectionPool.kt b/okhttp/src/main/kotlin/okhttp3/ConnectionPool.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/ConnectionPool.kt rename to okhttp/src/main/kotlin/okhttp3/ConnectionPool.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/ConnectionSpec.kt b/okhttp/src/main/kotlin/okhttp3/ConnectionSpec.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/ConnectionSpec.kt rename to okhttp/src/main/kotlin/okhttp3/ConnectionSpec.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/Cookie.kt b/okhttp/src/main/kotlin/okhttp3/Cookie.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/Cookie.kt rename to okhttp/src/main/kotlin/okhttp3/Cookie.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/CookieJar.kt b/okhttp/src/main/kotlin/okhttp3/CookieJar.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/CookieJar.kt rename to okhttp/src/main/kotlin/okhttp3/CookieJar.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/Credentials.kt b/okhttp/src/main/kotlin/okhttp3/Credentials.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/Credentials.kt rename to okhttp/src/main/kotlin/okhttp3/Credentials.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/Dispatcher.kt b/okhttp/src/main/kotlin/okhttp3/Dispatcher.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/Dispatcher.kt rename to okhttp/src/main/kotlin/okhttp3/Dispatcher.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/Dns.kt b/okhttp/src/main/kotlin/okhttp3/Dns.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/Dns.kt rename to okhttp/src/main/kotlin/okhttp3/Dns.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/EventListener.kt b/okhttp/src/main/kotlin/okhttp3/EventListener.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/EventListener.kt rename to okhttp/src/main/kotlin/okhttp3/EventListener.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/FormBody.kt b/okhttp/src/main/kotlin/okhttp3/FormBody.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/FormBody.kt rename to okhttp/src/main/kotlin/okhttp3/FormBody.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/Handshake.kt b/okhttp/src/main/kotlin/okhttp3/Handshake.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/Handshake.kt rename to okhttp/src/main/kotlin/okhttp3/Handshake.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/Headers.kt b/okhttp/src/main/kotlin/okhttp3/Headers.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/Headers.kt rename to okhttp/src/main/kotlin/okhttp3/Headers.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/HttpUrl.kt b/okhttp/src/main/kotlin/okhttp3/HttpUrl.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/HttpUrl.kt rename to okhttp/src/main/kotlin/okhttp3/HttpUrl.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/Interceptor.kt b/okhttp/src/main/kotlin/okhttp3/Interceptor.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/Interceptor.kt rename to okhttp/src/main/kotlin/okhttp3/Interceptor.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/MediaType.kt b/okhttp/src/main/kotlin/okhttp3/MediaType.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/MediaType.kt rename to okhttp/src/main/kotlin/okhttp3/MediaType.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/MultipartBody.kt b/okhttp/src/main/kotlin/okhttp3/MultipartBody.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/MultipartBody.kt rename to okhttp/src/main/kotlin/okhttp3/MultipartBody.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/MultipartReader.kt b/okhttp/src/main/kotlin/okhttp3/MultipartReader.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/MultipartReader.kt rename to okhttp/src/main/kotlin/okhttp3/MultipartReader.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/OkHttp.kt b/okhttp/src/main/kotlin/okhttp3/OkHttp.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/OkHttp.kt rename to okhttp/src/main/kotlin/okhttp3/OkHttp.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/OkHttpClient.kt b/okhttp/src/main/kotlin/okhttp3/OkHttpClient.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/OkHttpClient.kt rename to okhttp/src/main/kotlin/okhttp3/OkHttpClient.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/Protocol.kt b/okhttp/src/main/kotlin/okhttp3/Protocol.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/Protocol.kt rename to okhttp/src/main/kotlin/okhttp3/Protocol.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/Request.kt b/okhttp/src/main/kotlin/okhttp3/Request.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/Request.kt rename to okhttp/src/main/kotlin/okhttp3/Request.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/RequestBody.kt b/okhttp/src/main/kotlin/okhttp3/RequestBody.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/RequestBody.kt rename to okhttp/src/main/kotlin/okhttp3/RequestBody.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/Response.kt b/okhttp/src/main/kotlin/okhttp3/Response.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/Response.kt rename to okhttp/src/main/kotlin/okhttp3/Response.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/ResponseBody.kt b/okhttp/src/main/kotlin/okhttp3/ResponseBody.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/ResponseBody.kt rename to okhttp/src/main/kotlin/okhttp3/ResponseBody.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/Route.kt b/okhttp/src/main/kotlin/okhttp3/Route.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/Route.kt rename to okhttp/src/main/kotlin/okhttp3/Route.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/TlsVersion.kt b/okhttp/src/main/kotlin/okhttp3/TlsVersion.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/TlsVersion.kt rename to okhttp/src/main/kotlin/okhttp3/TlsVersion.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/WebSocket.kt b/okhttp/src/main/kotlin/okhttp3/WebSocket.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/WebSocket.kt rename to okhttp/src/main/kotlin/okhttp3/WebSocket.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/WebSocketListener.kt b/okhttp/src/main/kotlin/okhttp3/WebSocketListener.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/WebSocketListener.kt rename to okhttp/src/main/kotlin/okhttp3/WebSocketListener.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/-CacheControlCommon.kt b/okhttp/src/main/kotlin/okhttp3/internal/-CacheControlCommon.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/-CacheControlCommon.kt rename to okhttp/src/main/kotlin/okhttp3/internal/-CacheControlCommon.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/-ChallengeCommon.kt b/okhttp/src/main/kotlin/okhttp3/internal/-ChallengeCommon.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/-ChallengeCommon.kt rename to okhttp/src/main/kotlin/okhttp3/internal/-ChallengeCommon.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/-HeadersCommon.kt b/okhttp/src/main/kotlin/okhttp3/internal/-HeadersCommon.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/-HeadersCommon.kt rename to okhttp/src/main/kotlin/okhttp3/internal/-HeadersCommon.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/-HostnamesCommon.kt b/okhttp/src/main/kotlin/okhttp3/internal/-HostnamesCommon.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/-HostnamesCommon.kt rename to okhttp/src/main/kotlin/okhttp3/internal/-HostnamesCommon.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/-HttpUrlCommon.kt b/okhttp/src/main/kotlin/okhttp3/internal/-HttpUrlCommon.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/-HttpUrlCommon.kt rename to okhttp/src/main/kotlin/okhttp3/internal/-HttpUrlCommon.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/-HttpUrlJvm.kt b/okhttp/src/main/kotlin/okhttp3/internal/-HttpUrlJvm.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/-HttpUrlJvm.kt rename to okhttp/src/main/kotlin/okhttp3/internal/-HttpUrlJvm.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/-MediaTypeCommon.kt b/okhttp/src/main/kotlin/okhttp3/internal/-MediaTypeCommon.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/-MediaTypeCommon.kt rename to okhttp/src/main/kotlin/okhttp3/internal/-MediaTypeCommon.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/-NormalizeJvm.kt b/okhttp/src/main/kotlin/okhttp3/internal/-NormalizeJvm.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/-NormalizeJvm.kt rename to okhttp/src/main/kotlin/okhttp3/internal/-NormalizeJvm.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/-RequestBodyCommon.kt b/okhttp/src/main/kotlin/okhttp3/internal/-RequestBodyCommon.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/-RequestBodyCommon.kt rename to okhttp/src/main/kotlin/okhttp3/internal/-RequestBodyCommon.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/-RequestCommon.kt b/okhttp/src/main/kotlin/okhttp3/internal/-RequestCommon.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/-RequestCommon.kt rename to okhttp/src/main/kotlin/okhttp3/internal/-RequestCommon.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/-ResponseBodyCommon.kt b/okhttp/src/main/kotlin/okhttp3/internal/-ResponseBodyCommon.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/-ResponseBodyCommon.kt rename to okhttp/src/main/kotlin/okhttp3/internal/-ResponseBodyCommon.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/-ResponseCommon.kt b/okhttp/src/main/kotlin/okhttp3/internal/-ResponseCommon.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/-ResponseCommon.kt rename to okhttp/src/main/kotlin/okhttp3/internal/-ResponseCommon.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/-UtilCommon.kt b/okhttp/src/main/kotlin/okhttp3/internal/-UtilCommon.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/-UtilCommon.kt rename to okhttp/src/main/kotlin/okhttp3/internal/-UtilCommon.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/-UtilJvm.kt b/okhttp/src/main/kotlin/okhttp3/internal/-UtilJvm.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/-UtilJvm.kt rename to okhttp/src/main/kotlin/okhttp3/internal/-UtilJvm.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/NativeImageTestsAccessors.kt b/okhttp/src/main/kotlin/okhttp3/internal/NativeImageTestsAccessors.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/NativeImageTestsAccessors.kt rename to okhttp/src/main/kotlin/okhttp3/internal/NativeImageTestsAccessors.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/SuppressSignatureCheck.kt b/okhttp/src/main/kotlin/okhttp3/internal/SuppressSignatureCheck.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/SuppressSignatureCheck.kt rename to okhttp/src/main/kotlin/okhttp3/internal/SuppressSignatureCheck.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/authenticator/JavaNetAuthenticator.kt b/okhttp/src/main/kotlin/okhttp3/internal/authenticator/JavaNetAuthenticator.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/authenticator/JavaNetAuthenticator.kt rename to okhttp/src/main/kotlin/okhttp3/internal/authenticator/JavaNetAuthenticator.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/cache/CacheInterceptor.kt b/okhttp/src/main/kotlin/okhttp3/internal/cache/CacheInterceptor.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/cache/CacheInterceptor.kt rename to okhttp/src/main/kotlin/okhttp3/internal/cache/CacheInterceptor.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/cache/CacheRequest.kt b/okhttp/src/main/kotlin/okhttp3/internal/cache/CacheRequest.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/cache/CacheRequest.kt rename to okhttp/src/main/kotlin/okhttp3/internal/cache/CacheRequest.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/cache/CacheStrategy.kt b/okhttp/src/main/kotlin/okhttp3/internal/cache/CacheStrategy.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/cache/CacheStrategy.kt rename to okhttp/src/main/kotlin/okhttp3/internal/cache/CacheStrategy.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/cache/DiskLruCache.kt b/okhttp/src/main/kotlin/okhttp3/internal/cache/DiskLruCache.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/cache/DiskLruCache.kt rename to okhttp/src/main/kotlin/okhttp3/internal/cache/DiskLruCache.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/cache/FaultHidingSink.kt b/okhttp/src/main/kotlin/okhttp3/internal/cache/FaultHidingSink.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/cache/FaultHidingSink.kt rename to okhttp/src/main/kotlin/okhttp3/internal/cache/FaultHidingSink.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/cache2/FileOperator.kt b/okhttp/src/main/kotlin/okhttp3/internal/cache2/FileOperator.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/cache2/FileOperator.kt rename to okhttp/src/main/kotlin/okhttp3/internal/cache2/FileOperator.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/cache2/Relay.kt b/okhttp/src/main/kotlin/okhttp3/internal/cache2/Relay.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/cache2/Relay.kt rename to okhttp/src/main/kotlin/okhttp3/internal/cache2/Relay.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/concurrent/Task.kt b/okhttp/src/main/kotlin/okhttp3/internal/concurrent/Task.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/concurrent/Task.kt rename to okhttp/src/main/kotlin/okhttp3/internal/concurrent/Task.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/concurrent/TaskLogger.kt b/okhttp/src/main/kotlin/okhttp3/internal/concurrent/TaskLogger.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/concurrent/TaskLogger.kt rename to okhttp/src/main/kotlin/okhttp3/internal/concurrent/TaskLogger.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/concurrent/TaskQueue.kt b/okhttp/src/main/kotlin/okhttp3/internal/concurrent/TaskQueue.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/concurrent/TaskQueue.kt rename to okhttp/src/main/kotlin/okhttp3/internal/concurrent/TaskQueue.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/concurrent/TaskRunner.kt b/okhttp/src/main/kotlin/okhttp3/internal/concurrent/TaskRunner.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/concurrent/TaskRunner.kt rename to okhttp/src/main/kotlin/okhttp3/internal/concurrent/TaskRunner.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/ConnectInterceptor.kt b/okhttp/src/main/kotlin/okhttp3/internal/connection/ConnectInterceptor.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/ConnectInterceptor.kt rename to okhttp/src/main/kotlin/okhttp3/internal/connection/ConnectInterceptor.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/ConnectPlan.kt b/okhttp/src/main/kotlin/okhttp3/internal/connection/ConnectPlan.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/ConnectPlan.kt rename to okhttp/src/main/kotlin/okhttp3/internal/connection/ConnectPlan.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/ConnectionSpecSelector.kt b/okhttp/src/main/kotlin/okhttp3/internal/connection/ConnectionSpecSelector.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/ConnectionSpecSelector.kt rename to okhttp/src/main/kotlin/okhttp3/internal/connection/ConnectionSpecSelector.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/Exchange.kt b/okhttp/src/main/kotlin/okhttp3/internal/connection/Exchange.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/Exchange.kt rename to okhttp/src/main/kotlin/okhttp3/internal/connection/Exchange.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/ExchangeFinder.kt b/okhttp/src/main/kotlin/okhttp3/internal/connection/ExchangeFinder.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/ExchangeFinder.kt rename to okhttp/src/main/kotlin/okhttp3/internal/connection/ExchangeFinder.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/FailedPlan.kt b/okhttp/src/main/kotlin/okhttp3/internal/connection/FailedPlan.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/FailedPlan.kt rename to okhttp/src/main/kotlin/okhttp3/internal/connection/FailedPlan.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/FastFallbackExchangeFinder.kt b/okhttp/src/main/kotlin/okhttp3/internal/connection/FastFallbackExchangeFinder.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/FastFallbackExchangeFinder.kt rename to okhttp/src/main/kotlin/okhttp3/internal/connection/FastFallbackExchangeFinder.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/InetAddressOrder.kt b/okhttp/src/main/kotlin/okhttp3/internal/connection/InetAddressOrder.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/InetAddressOrder.kt rename to okhttp/src/main/kotlin/okhttp3/internal/connection/InetAddressOrder.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/RealCall.kt b/okhttp/src/main/kotlin/okhttp3/internal/connection/RealCall.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/RealCall.kt rename to okhttp/src/main/kotlin/okhttp3/internal/connection/RealCall.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/RealConnection.kt b/okhttp/src/main/kotlin/okhttp3/internal/connection/RealConnection.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/RealConnection.kt rename to okhttp/src/main/kotlin/okhttp3/internal/connection/RealConnection.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/RealConnectionPool.kt b/okhttp/src/main/kotlin/okhttp3/internal/connection/RealConnectionPool.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/RealConnectionPool.kt rename to okhttp/src/main/kotlin/okhttp3/internal/connection/RealConnectionPool.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/RealRoutePlanner.kt b/okhttp/src/main/kotlin/okhttp3/internal/connection/RealRoutePlanner.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/RealRoutePlanner.kt rename to okhttp/src/main/kotlin/okhttp3/internal/connection/RealRoutePlanner.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/ReusePlan.kt b/okhttp/src/main/kotlin/okhttp3/internal/connection/ReusePlan.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/ReusePlan.kt rename to okhttp/src/main/kotlin/okhttp3/internal/connection/ReusePlan.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/RouteDatabase.kt b/okhttp/src/main/kotlin/okhttp3/internal/connection/RouteDatabase.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/RouteDatabase.kt rename to okhttp/src/main/kotlin/okhttp3/internal/connection/RouteDatabase.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/RoutePlanner.kt b/okhttp/src/main/kotlin/okhttp3/internal/connection/RoutePlanner.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/RoutePlanner.kt rename to okhttp/src/main/kotlin/okhttp3/internal/connection/RoutePlanner.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/RouteSelector.kt b/okhttp/src/main/kotlin/okhttp3/internal/connection/RouteSelector.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/RouteSelector.kt rename to okhttp/src/main/kotlin/okhttp3/internal/connection/RouteSelector.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/SequentialExchangeFinder.kt b/okhttp/src/main/kotlin/okhttp3/internal/connection/SequentialExchangeFinder.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/SequentialExchangeFinder.kt rename to okhttp/src/main/kotlin/okhttp3/internal/connection/SequentialExchangeFinder.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/tlsHandshake.kt b/okhttp/src/main/kotlin/okhttp3/internal/connection/tlsHandshake.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/tlsHandshake.kt rename to okhttp/src/main/kotlin/okhttp3/internal/connection/tlsHandshake.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/graal/OkHttpFeature.kt b/okhttp/src/main/kotlin/okhttp3/internal/graal/OkHttpFeature.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/graal/OkHttpFeature.kt rename to okhttp/src/main/kotlin/okhttp3/internal/graal/OkHttpFeature.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/graal/svm.kt b/okhttp/src/main/kotlin/okhttp3/internal/graal/svm.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/graal/svm.kt rename to okhttp/src/main/kotlin/okhttp3/internal/graal/svm.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http/BridgeInterceptor.kt b/okhttp/src/main/kotlin/okhttp3/internal/http/BridgeInterceptor.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http/BridgeInterceptor.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http/BridgeInterceptor.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http/CallServerInterceptor.kt b/okhttp/src/main/kotlin/okhttp3/internal/http/CallServerInterceptor.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http/CallServerInterceptor.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http/CallServerInterceptor.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http/ExchangeCodec.kt b/okhttp/src/main/kotlin/okhttp3/internal/http/ExchangeCodec.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http/ExchangeCodec.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http/ExchangeCodec.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http/HttpHeaders.kt b/okhttp/src/main/kotlin/okhttp3/internal/http/HttpHeaders.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http/HttpHeaders.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http/HttpHeaders.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http/HttpMethod.kt b/okhttp/src/main/kotlin/okhttp3/internal/http/HttpMethod.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http/HttpMethod.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http/HttpMethod.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http/HttpStatusCodes.kt b/okhttp/src/main/kotlin/okhttp3/internal/http/HttpStatusCodes.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http/HttpStatusCodes.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http/HttpStatusCodes.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http/RealInterceptorChain.kt b/okhttp/src/main/kotlin/okhttp3/internal/http/RealInterceptorChain.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http/RealInterceptorChain.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http/RealInterceptorChain.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http/RealResponseBody.kt b/okhttp/src/main/kotlin/okhttp3/internal/http/RealResponseBody.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http/RealResponseBody.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http/RealResponseBody.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http/RequestLine.kt b/okhttp/src/main/kotlin/okhttp3/internal/http/RequestLine.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http/RequestLine.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http/RequestLine.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http/RetryAndFollowUpInterceptor.kt b/okhttp/src/main/kotlin/okhttp3/internal/http/RetryAndFollowUpInterceptor.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http/RetryAndFollowUpInterceptor.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http/RetryAndFollowUpInterceptor.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http/StatusLine.kt b/okhttp/src/main/kotlin/okhttp3/internal/http/StatusLine.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http/StatusLine.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http/StatusLine.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http/dates.kt b/okhttp/src/main/kotlin/okhttp3/internal/http/dates.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http/dates.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http/dates.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http1/HeadersReader.kt b/okhttp/src/main/kotlin/okhttp3/internal/http1/HeadersReader.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http1/HeadersReader.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http1/HeadersReader.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http1/Http1ExchangeCodec.kt b/okhttp/src/main/kotlin/okhttp3/internal/http1/Http1ExchangeCodec.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http1/Http1ExchangeCodec.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http1/Http1ExchangeCodec.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/ConnectionShutdownException.kt b/okhttp/src/main/kotlin/okhttp3/internal/http2/ConnectionShutdownException.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/ConnectionShutdownException.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http2/ConnectionShutdownException.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/ErrorCode.kt b/okhttp/src/main/kotlin/okhttp3/internal/http2/ErrorCode.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/ErrorCode.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http2/ErrorCode.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/FlowControlListener.kt b/okhttp/src/main/kotlin/okhttp3/internal/http2/FlowControlListener.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/FlowControlListener.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http2/FlowControlListener.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/Header.kt b/okhttp/src/main/kotlin/okhttp3/internal/http2/Header.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/Header.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http2/Header.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/Hpack.kt b/okhttp/src/main/kotlin/okhttp3/internal/http2/Hpack.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/Hpack.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http2/Hpack.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/Http2.kt b/okhttp/src/main/kotlin/okhttp3/internal/http2/Http2.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/Http2.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http2/Http2.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/Http2Connection.kt b/okhttp/src/main/kotlin/okhttp3/internal/http2/Http2Connection.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/Http2Connection.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http2/Http2Connection.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/Http2ExchangeCodec.kt b/okhttp/src/main/kotlin/okhttp3/internal/http2/Http2ExchangeCodec.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/Http2ExchangeCodec.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http2/Http2ExchangeCodec.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/Http2Reader.kt b/okhttp/src/main/kotlin/okhttp3/internal/http2/Http2Reader.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/Http2Reader.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http2/Http2Reader.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/Http2Stream.kt b/okhttp/src/main/kotlin/okhttp3/internal/http2/Http2Stream.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/Http2Stream.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http2/Http2Stream.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/Http2Writer.kt b/okhttp/src/main/kotlin/okhttp3/internal/http2/Http2Writer.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/Http2Writer.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http2/Http2Writer.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/Huffman.kt b/okhttp/src/main/kotlin/okhttp3/internal/http2/Huffman.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/Huffman.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http2/Huffman.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/PushObserver.kt b/okhttp/src/main/kotlin/okhttp3/internal/http2/PushObserver.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/PushObserver.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http2/PushObserver.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/Settings.kt b/okhttp/src/main/kotlin/okhttp3/internal/http2/Settings.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/Settings.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http2/Settings.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/StreamResetException.kt b/okhttp/src/main/kotlin/okhttp3/internal/http2/StreamResetException.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/StreamResetException.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http2/StreamResetException.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/flowcontrol/WindowCounter.kt b/okhttp/src/main/kotlin/okhttp3/internal/http2/flowcontrol/WindowCounter.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/flowcontrol/WindowCounter.kt rename to okhttp/src/main/kotlin/okhttp3/internal/http2/flowcontrol/WindowCounter.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/idn/IdnaMappingTable.kt b/okhttp/src/main/kotlin/okhttp3/internal/idn/IdnaMappingTable.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/idn/IdnaMappingTable.kt rename to okhttp/src/main/kotlin/okhttp3/internal/idn/IdnaMappingTable.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/idn/Punycode.kt b/okhttp/src/main/kotlin/okhttp3/internal/idn/Punycode.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/idn/Punycode.kt rename to okhttp/src/main/kotlin/okhttp3/internal/idn/Punycode.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/internal.kt b/okhttp/src/main/kotlin/okhttp3/internal/internal.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/internal.kt rename to okhttp/src/main/kotlin/okhttp3/internal/internal.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/Android10Platform.kt b/okhttp/src/main/kotlin/okhttp3/internal/platform/Android10Platform.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/Android10Platform.kt rename to okhttp/src/main/kotlin/okhttp3/internal/platform/Android10Platform.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/AndroidPlatform.kt b/okhttp/src/main/kotlin/okhttp3/internal/platform/AndroidPlatform.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/AndroidPlatform.kt rename to okhttp/src/main/kotlin/okhttp3/internal/platform/AndroidPlatform.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/BouncyCastlePlatform.kt b/okhttp/src/main/kotlin/okhttp3/internal/platform/BouncyCastlePlatform.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/BouncyCastlePlatform.kt rename to okhttp/src/main/kotlin/okhttp3/internal/platform/BouncyCastlePlatform.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/ConscryptPlatform.kt b/okhttp/src/main/kotlin/okhttp3/internal/platform/ConscryptPlatform.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/ConscryptPlatform.kt rename to okhttp/src/main/kotlin/okhttp3/internal/platform/ConscryptPlatform.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/Jdk8WithJettyBootPlatform.kt b/okhttp/src/main/kotlin/okhttp3/internal/platform/Jdk8WithJettyBootPlatform.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/Jdk8WithJettyBootPlatform.kt rename to okhttp/src/main/kotlin/okhttp3/internal/platform/Jdk8WithJettyBootPlatform.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/Jdk9Platform.kt b/okhttp/src/main/kotlin/okhttp3/internal/platform/Jdk9Platform.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/Jdk9Platform.kt rename to okhttp/src/main/kotlin/okhttp3/internal/platform/Jdk9Platform.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/OpenJSSEPlatform.kt b/okhttp/src/main/kotlin/okhttp3/internal/platform/OpenJSSEPlatform.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/OpenJSSEPlatform.kt rename to okhttp/src/main/kotlin/okhttp3/internal/platform/OpenJSSEPlatform.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/Platform.kt b/okhttp/src/main/kotlin/okhttp3/internal/platform/Platform.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/Platform.kt rename to okhttp/src/main/kotlin/okhttp3/internal/platform/Platform.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/android/Android10SocketAdapter.kt b/okhttp/src/main/kotlin/okhttp3/internal/platform/android/Android10SocketAdapter.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/android/Android10SocketAdapter.kt rename to okhttp/src/main/kotlin/okhttp3/internal/platform/android/Android10SocketAdapter.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/android/AndroidCertificateChainCleaner.kt b/okhttp/src/main/kotlin/okhttp3/internal/platform/android/AndroidCertificateChainCleaner.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/android/AndroidCertificateChainCleaner.kt rename to okhttp/src/main/kotlin/okhttp3/internal/platform/android/AndroidCertificateChainCleaner.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/android/AndroidLog.kt b/okhttp/src/main/kotlin/okhttp3/internal/platform/android/AndroidLog.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/android/AndroidLog.kt rename to okhttp/src/main/kotlin/okhttp3/internal/platform/android/AndroidLog.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/android/AndroidSocketAdapter.kt b/okhttp/src/main/kotlin/okhttp3/internal/platform/android/AndroidSocketAdapter.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/android/AndroidSocketAdapter.kt rename to okhttp/src/main/kotlin/okhttp3/internal/platform/android/AndroidSocketAdapter.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/android/BouncyCastleSocketAdapter.kt b/okhttp/src/main/kotlin/okhttp3/internal/platform/android/BouncyCastleSocketAdapter.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/android/BouncyCastleSocketAdapter.kt rename to okhttp/src/main/kotlin/okhttp3/internal/platform/android/BouncyCastleSocketAdapter.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/android/ConscryptSocketAdapter.kt b/okhttp/src/main/kotlin/okhttp3/internal/platform/android/ConscryptSocketAdapter.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/android/ConscryptSocketAdapter.kt rename to okhttp/src/main/kotlin/okhttp3/internal/platform/android/ConscryptSocketAdapter.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/android/DeferredSocketAdapter.kt b/okhttp/src/main/kotlin/okhttp3/internal/platform/android/DeferredSocketAdapter.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/android/DeferredSocketAdapter.kt rename to okhttp/src/main/kotlin/okhttp3/internal/platform/android/DeferredSocketAdapter.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/android/SocketAdapter.kt b/okhttp/src/main/kotlin/okhttp3/internal/platform/android/SocketAdapter.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/android/SocketAdapter.kt rename to okhttp/src/main/kotlin/okhttp3/internal/platform/android/SocketAdapter.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/android/StandardAndroidSocketAdapter.kt b/okhttp/src/main/kotlin/okhttp3/internal/platform/android/StandardAndroidSocketAdapter.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/platform/android/StandardAndroidSocketAdapter.kt rename to okhttp/src/main/kotlin/okhttp3/internal/platform/android/StandardAndroidSocketAdapter.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/proxy/NullProxySelector.kt b/okhttp/src/main/kotlin/okhttp3/internal/proxy/NullProxySelector.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/proxy/NullProxySelector.kt rename to okhttp/src/main/kotlin/okhttp3/internal/proxy/NullProxySelector.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/publicsuffix/PublicSuffixDatabase.kt b/okhttp/src/main/kotlin/okhttp3/internal/publicsuffix/PublicSuffixDatabase.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/publicsuffix/PublicSuffixDatabase.kt rename to okhttp/src/main/kotlin/okhttp3/internal/publicsuffix/PublicSuffixDatabase.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/tls/BasicCertificateChainCleaner.kt b/okhttp/src/main/kotlin/okhttp3/internal/tls/BasicCertificateChainCleaner.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/tls/BasicCertificateChainCleaner.kt rename to okhttp/src/main/kotlin/okhttp3/internal/tls/BasicCertificateChainCleaner.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/tls/BasicTrustRootIndex.kt b/okhttp/src/main/kotlin/okhttp3/internal/tls/BasicTrustRootIndex.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/tls/BasicTrustRootIndex.kt rename to okhttp/src/main/kotlin/okhttp3/internal/tls/BasicTrustRootIndex.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/tls/CertificateChainCleaner.kt b/okhttp/src/main/kotlin/okhttp3/internal/tls/CertificateChainCleaner.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/tls/CertificateChainCleaner.kt rename to okhttp/src/main/kotlin/okhttp3/internal/tls/CertificateChainCleaner.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/tls/OkHostnameVerifier.kt b/okhttp/src/main/kotlin/okhttp3/internal/tls/OkHostnameVerifier.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/tls/OkHostnameVerifier.kt rename to okhttp/src/main/kotlin/okhttp3/internal/tls/OkHostnameVerifier.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/tls/TrustRootIndex.kt b/okhttp/src/main/kotlin/okhttp3/internal/tls/TrustRootIndex.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/tls/TrustRootIndex.kt rename to okhttp/src/main/kotlin/okhttp3/internal/tls/TrustRootIndex.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/ws/MessageDeflater.kt b/okhttp/src/main/kotlin/okhttp3/internal/ws/MessageDeflater.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/ws/MessageDeflater.kt rename to okhttp/src/main/kotlin/okhttp3/internal/ws/MessageDeflater.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/ws/MessageInflater.kt b/okhttp/src/main/kotlin/okhttp3/internal/ws/MessageInflater.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/ws/MessageInflater.kt rename to okhttp/src/main/kotlin/okhttp3/internal/ws/MessageInflater.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/ws/RealWebSocket.kt b/okhttp/src/main/kotlin/okhttp3/internal/ws/RealWebSocket.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/ws/RealWebSocket.kt rename to okhttp/src/main/kotlin/okhttp3/internal/ws/RealWebSocket.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/ws/WebSocketExtensions.kt b/okhttp/src/main/kotlin/okhttp3/internal/ws/WebSocketExtensions.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/ws/WebSocketExtensions.kt rename to okhttp/src/main/kotlin/okhttp3/internal/ws/WebSocketExtensions.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/ws/WebSocketProtocol.kt b/okhttp/src/main/kotlin/okhttp3/internal/ws/WebSocketProtocol.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/ws/WebSocketProtocol.kt rename to okhttp/src/main/kotlin/okhttp3/internal/ws/WebSocketProtocol.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/ws/WebSocketReader.kt b/okhttp/src/main/kotlin/okhttp3/internal/ws/WebSocketReader.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/ws/WebSocketReader.kt rename to okhttp/src/main/kotlin/okhttp3/internal/ws/WebSocketReader.kt diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/ws/WebSocketWriter.kt b/okhttp/src/main/kotlin/okhttp3/internal/ws/WebSocketWriter.kt similarity index 100% rename from okhttp/src/jvmMain/kotlin/okhttp3/internal/ws/WebSocketWriter.kt rename to okhttp/src/main/kotlin/okhttp3/internal/ws/WebSocketWriter.kt diff --git a/okhttp/src/jvmMain/kotlinTemplates/okhttp3/internal/-InternalVersion.kt b/okhttp/src/main/kotlinTemplates/okhttp3/internal/-InternalVersion.kt similarity index 100% rename from okhttp/src/jvmMain/kotlinTemplates/okhttp3/internal/-InternalVersion.kt rename to okhttp/src/main/kotlinTemplates/okhttp3/internal/-InternalVersion.kt diff --git a/okhttp/src/jvmMain/resources/META-INF/native-image/okhttp/okhttp/native-image.properties b/okhttp/src/main/resources/META-INF/native-image/okhttp/okhttp/native-image.properties similarity index 100% rename from okhttp/src/jvmMain/resources/META-INF/native-image/okhttp/okhttp/native-image.properties rename to okhttp/src/main/resources/META-INF/native-image/okhttp/okhttp/native-image.properties diff --git a/okhttp/src/jvmMain/resources/META-INF/native-image/okhttp/okhttp/reflect-config.json b/okhttp/src/main/resources/META-INF/native-image/okhttp/okhttp/reflect-config.json similarity index 100% rename from okhttp/src/jvmMain/resources/META-INF/native-image/okhttp/okhttp/reflect-config.json rename to okhttp/src/main/resources/META-INF/native-image/okhttp/okhttp/reflect-config.json diff --git a/okhttp/src/jvmMain/resources/META-INF/native-image/okhttp/okhttp/resource-config.json b/okhttp/src/main/resources/META-INF/native-image/okhttp/okhttp/resource-config.json similarity index 100% rename from okhttp/src/jvmMain/resources/META-INF/native-image/okhttp/okhttp/resource-config.json rename to okhttp/src/main/resources/META-INF/native-image/okhttp/okhttp/resource-config.json diff --git a/okhttp/src/jvmMain/resources/META-INF/proguard/okhttp3.pro b/okhttp/src/main/resources/META-INF/proguard/okhttp3.pro similarity index 100% rename from okhttp/src/jvmMain/resources/META-INF/proguard/okhttp3.pro rename to okhttp/src/main/resources/META-INF/proguard/okhttp3.pro diff --git a/okhttp/src/jvmMain/resources/okhttp3/internal/publicsuffix/NOTICE b/okhttp/src/main/resources/okhttp3/internal/publicsuffix/NOTICE similarity index 100% rename from okhttp/src/jvmMain/resources/okhttp3/internal/publicsuffix/NOTICE rename to okhttp/src/main/resources/okhttp3/internal/publicsuffix/NOTICE diff --git a/okhttp/src/jvmMain/resources/okhttp3/internal/publicsuffix/PublicSuffixDatabase.gz b/okhttp/src/main/resources/okhttp3/internal/publicsuffix/PublicSuffixDatabase.gz similarity index 100% rename from okhttp/src/jvmMain/resources/okhttp3/internal/publicsuffix/PublicSuffixDatabase.gz rename to okhttp/src/main/resources/okhttp3/internal/publicsuffix/PublicSuffixDatabase.gz diff --git a/okhttp/src/jvmTest/java/okhttp3/AddressTest.kt b/okhttp/src/test/java/okhttp3/AddressTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/AddressTest.kt rename to okhttp/src/test/java/okhttp3/AddressTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/AutobahnTester.kt b/okhttp/src/test/java/okhttp3/AutobahnTester.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/AutobahnTester.kt rename to okhttp/src/test/java/okhttp3/AutobahnTester.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/BouncyCastleTest.kt b/okhttp/src/test/java/okhttp3/BouncyCastleTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/BouncyCastleTest.kt rename to okhttp/src/test/java/okhttp3/BouncyCastleTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/CacheControlJvmTest.kt b/okhttp/src/test/java/okhttp3/CacheControlJvmTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/CacheControlJvmTest.kt rename to okhttp/src/test/java/okhttp3/CacheControlJvmTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/CacheControlTest.kt b/okhttp/src/test/java/okhttp3/CacheControlTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/CacheControlTest.kt rename to okhttp/src/test/java/okhttp3/CacheControlTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/CacheCorruptionTest.kt b/okhttp/src/test/java/okhttp3/CacheCorruptionTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/CacheCorruptionTest.kt rename to okhttp/src/test/java/okhttp3/CacheCorruptionTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/CacheTest.java b/okhttp/src/test/java/okhttp3/CacheTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/CacheTest.java rename to okhttp/src/test/java/okhttp3/CacheTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/CallHandshakeTest.kt b/okhttp/src/test/java/okhttp3/CallHandshakeTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/CallHandshakeTest.kt rename to okhttp/src/test/java/okhttp3/CallHandshakeTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/CallKotlinTest.kt b/okhttp/src/test/java/okhttp3/CallKotlinTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/CallKotlinTest.kt rename to okhttp/src/test/java/okhttp3/CallKotlinTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/CallTest.kt b/okhttp/src/test/java/okhttp3/CallTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/CallTest.kt rename to okhttp/src/test/java/okhttp3/CallTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/CertificateChainCleanerTest.java b/okhttp/src/test/java/okhttp3/CertificateChainCleanerTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/CertificateChainCleanerTest.java rename to okhttp/src/test/java/okhttp3/CertificateChainCleanerTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/CertificatePinnerKotlinTest.kt b/okhttp/src/test/java/okhttp3/CertificatePinnerKotlinTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/CertificatePinnerKotlinTest.kt rename to okhttp/src/test/java/okhttp3/CertificatePinnerKotlinTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/CertificatePinnerTest.java b/okhttp/src/test/java/okhttp3/CertificatePinnerTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/CertificatePinnerTest.java rename to okhttp/src/test/java/okhttp3/CertificatePinnerTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/ChannelSocketFactory.kt b/okhttp/src/test/java/okhttp3/ChannelSocketFactory.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/ChannelSocketFactory.kt rename to okhttp/src/test/java/okhttp3/ChannelSocketFactory.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/CipherSuiteTest.java b/okhttp/src/test/java/okhttp3/CipherSuiteTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/CipherSuiteTest.java rename to okhttp/src/test/java/okhttp3/CipherSuiteTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/CommonRequestBodyTest.kt b/okhttp/src/test/java/okhttp3/CommonRequestBodyTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/CommonRequestBodyTest.kt rename to okhttp/src/test/java/okhttp3/CommonRequestBodyTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/ConnectionCoalescingTest.java b/okhttp/src/test/java/okhttp3/ConnectionCoalescingTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/ConnectionCoalescingTest.java rename to okhttp/src/test/java/okhttp3/ConnectionCoalescingTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/ConnectionListenerTest.kt b/okhttp/src/test/java/okhttp3/ConnectionListenerTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/ConnectionListenerTest.kt rename to okhttp/src/test/java/okhttp3/ConnectionListenerTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/ConnectionReuseTest.kt b/okhttp/src/test/java/okhttp3/ConnectionReuseTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/ConnectionReuseTest.kt rename to okhttp/src/test/java/okhttp3/ConnectionReuseTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/ConnectionSpecTest.java b/okhttp/src/test/java/okhttp3/ConnectionSpecTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/ConnectionSpecTest.java rename to okhttp/src/test/java/okhttp3/ConnectionSpecTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/ConscryptTest.kt b/okhttp/src/test/java/okhttp3/ConscryptTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/ConscryptTest.kt rename to okhttp/src/test/java/okhttp3/ConscryptTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/CookieTest.kt b/okhttp/src/test/java/okhttp3/CookieTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/CookieTest.kt rename to okhttp/src/test/java/okhttp3/CookieTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/CookiesTest.java b/okhttp/src/test/java/okhttp3/CookiesTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/CookiesTest.java rename to okhttp/src/test/java/okhttp3/CookiesTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/CorrettoTest.kt b/okhttp/src/test/java/okhttp3/CorrettoTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/CorrettoTest.kt rename to okhttp/src/test/java/okhttp3/CorrettoTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/DispatcherCleanupTest.kt b/okhttp/src/test/java/okhttp3/DispatcherCleanupTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/DispatcherCleanupTest.kt rename to okhttp/src/test/java/okhttp3/DispatcherCleanupTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/DispatcherTest.java b/okhttp/src/test/java/okhttp3/DispatcherTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/DispatcherTest.java rename to okhttp/src/test/java/okhttp3/DispatcherTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/DuplexTest.java b/okhttp/src/test/java/okhttp3/DuplexTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/DuplexTest.java rename to okhttp/src/test/java/okhttp3/DuplexTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/EventListenerTest.java b/okhttp/src/test/java/okhttp3/EventListenerTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/EventListenerTest.java rename to okhttp/src/test/java/okhttp3/EventListenerTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/FakeRoutePlanner.kt b/okhttp/src/test/java/okhttp3/FakeRoutePlanner.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/FakeRoutePlanner.kt rename to okhttp/src/test/java/okhttp3/FakeRoutePlanner.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/FallbackTestClientSocketFactory.java b/okhttp/src/test/java/okhttp3/FallbackTestClientSocketFactory.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/FallbackTestClientSocketFactory.java rename to okhttp/src/test/java/okhttp3/FallbackTestClientSocketFactory.java diff --git a/okhttp/src/jvmTest/java/okhttp3/FastFallbackTest.kt b/okhttp/src/test/java/okhttp3/FastFallbackTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/FastFallbackTest.kt rename to okhttp/src/test/java/okhttp3/FastFallbackTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/FormBodyTest.java b/okhttp/src/test/java/okhttp3/FormBodyTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/FormBodyTest.java rename to okhttp/src/test/java/okhttp3/FormBodyTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/HandshakeTest.kt b/okhttp/src/test/java/okhttp3/HandshakeTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/HandshakeTest.kt rename to okhttp/src/test/java/okhttp3/HandshakeTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/HeadersChallengesTest.kt b/okhttp/src/test/java/okhttp3/HeadersChallengesTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/HeadersChallengesTest.kt rename to okhttp/src/test/java/okhttp3/HeadersChallengesTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/HeadersJvmTest.kt b/okhttp/src/test/java/okhttp3/HeadersJvmTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/HeadersJvmTest.kt rename to okhttp/src/test/java/okhttp3/HeadersJvmTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/HeadersKotlinTest.kt b/okhttp/src/test/java/okhttp3/HeadersKotlinTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/HeadersKotlinTest.kt rename to okhttp/src/test/java/okhttp3/HeadersKotlinTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/HeadersRequestTest.kt b/okhttp/src/test/java/okhttp3/HeadersRequestTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/HeadersRequestTest.kt rename to okhttp/src/test/java/okhttp3/HeadersRequestTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/HeadersTest.kt b/okhttp/src/test/java/okhttp3/HeadersTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/HeadersTest.kt rename to okhttp/src/test/java/okhttp3/HeadersTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/HttpUrlJvmTest.kt b/okhttp/src/test/java/okhttp3/HttpUrlJvmTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/HttpUrlJvmTest.kt rename to okhttp/src/test/java/okhttp3/HttpUrlJvmTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/HttpUrlTest.kt b/okhttp/src/test/java/okhttp3/HttpUrlTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/HttpUrlTest.kt rename to okhttp/src/test/java/okhttp3/HttpUrlTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/InsecureForHostTest.kt b/okhttp/src/test/java/okhttp3/InsecureForHostTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/InsecureForHostTest.kt rename to okhttp/src/test/java/okhttp3/InsecureForHostTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/InterceptorTest.java b/okhttp/src/test/java/okhttp3/InterceptorTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/InterceptorTest.java rename to okhttp/src/test/java/okhttp3/InterceptorTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/JSSETest.kt b/okhttp/src/test/java/okhttp3/JSSETest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/JSSETest.kt rename to okhttp/src/test/java/okhttp3/JSSETest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/KotlinDeprecationErrorTest.kt b/okhttp/src/test/java/okhttp3/KotlinDeprecationErrorTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/KotlinDeprecationErrorTest.kt rename to okhttp/src/test/java/okhttp3/KotlinDeprecationErrorTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/KotlinSourceModernTest.kt b/okhttp/src/test/java/okhttp3/KotlinSourceModernTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/KotlinSourceModernTest.kt rename to okhttp/src/test/java/okhttp3/KotlinSourceModernTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/LoomTest.kt b/okhttp/src/test/java/okhttp3/LoomTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/LoomTest.kt rename to okhttp/src/test/java/okhttp3/LoomTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/MediaTypeGetTest.kt b/okhttp/src/test/java/okhttp3/MediaTypeGetTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/MediaTypeGetTest.kt rename to okhttp/src/test/java/okhttp3/MediaTypeGetTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/MediaTypeJvmTest.kt b/okhttp/src/test/java/okhttp3/MediaTypeJvmTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/MediaTypeJvmTest.kt rename to okhttp/src/test/java/okhttp3/MediaTypeJvmTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/MediaTypeTest.kt b/okhttp/src/test/java/okhttp3/MediaTypeTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/MediaTypeTest.kt rename to okhttp/src/test/java/okhttp3/MediaTypeTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/MultipartBodyTest.java b/okhttp/src/test/java/okhttp3/MultipartBodyTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/MultipartBodyTest.java rename to okhttp/src/test/java/okhttp3/MultipartBodyTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/MultipartReaderTest.kt b/okhttp/src/test/java/okhttp3/MultipartReaderTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/MultipartReaderTest.kt rename to okhttp/src/test/java/okhttp3/MultipartReaderTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/OkHttpClientTest.kt b/okhttp/src/test/java/okhttp3/OkHttpClientTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/OkHttpClientTest.kt rename to okhttp/src/test/java/okhttp3/OkHttpClientTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/OkHttpTest.kt b/okhttp/src/test/java/okhttp3/OkHttpTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/OkHttpTest.kt rename to okhttp/src/test/java/okhttp3/OkHttpTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/OpenJSSETest.kt b/okhttp/src/test/java/okhttp3/OpenJSSETest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/OpenJSSETest.kt rename to okhttp/src/test/java/okhttp3/OpenJSSETest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/ProtocolTest.java b/okhttp/src/test/java/okhttp3/ProtocolTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/ProtocolTest.java rename to okhttp/src/test/java/okhttp3/ProtocolTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/PublicInternalApiTest.java b/okhttp/src/test/java/okhttp3/PublicInternalApiTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/PublicInternalApiTest.java rename to okhttp/src/test/java/okhttp3/PublicInternalApiTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/RecordedResponse.java b/okhttp/src/test/java/okhttp3/RecordedResponse.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/RecordedResponse.java rename to okhttp/src/test/java/okhttp3/RecordedResponse.java diff --git a/okhttp/src/jvmTest/java/okhttp3/RecordingCallback.java b/okhttp/src/test/java/okhttp3/RecordingCallback.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/RecordingCallback.java rename to okhttp/src/test/java/okhttp3/RecordingCallback.java diff --git a/okhttp/src/jvmTest/java/okhttp3/RecordingExecutor.kt b/okhttp/src/test/java/okhttp3/RecordingExecutor.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/RecordingExecutor.kt rename to okhttp/src/test/java/okhttp3/RecordingExecutor.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/RecordingWebSocketListener.java b/okhttp/src/test/java/okhttp3/RecordingWebSocketListener.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/RecordingWebSocketListener.java rename to okhttp/src/test/java/okhttp3/RecordingWebSocketListener.java diff --git a/okhttp/src/jvmTest/java/okhttp3/RequestBodyTest.kt b/okhttp/src/test/java/okhttp3/RequestBodyTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/RequestBodyTest.kt rename to okhttp/src/test/java/okhttp3/RequestBodyTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/RequestCommonTest.kt b/okhttp/src/test/java/okhttp3/RequestCommonTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/RequestCommonTest.kt rename to okhttp/src/test/java/okhttp3/RequestCommonTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/RequestTest.kt b/okhttp/src/test/java/okhttp3/RequestTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/RequestTest.kt rename to okhttp/src/test/java/okhttp3/RequestTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/ResponseBodyJvmTest.kt b/okhttp/src/test/java/okhttp3/ResponseBodyJvmTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/ResponseBodyJvmTest.kt rename to okhttp/src/test/java/okhttp3/ResponseBodyJvmTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/ResponseBodyTest.kt b/okhttp/src/test/java/okhttp3/ResponseBodyTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/ResponseBodyTest.kt rename to okhttp/src/test/java/okhttp3/ResponseBodyTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/ResponseCommonTest.kt b/okhttp/src/test/java/okhttp3/ResponseCommonTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/ResponseCommonTest.kt rename to okhttp/src/test/java/okhttp3/ResponseCommonTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/ResponseJvmTest.kt b/okhttp/src/test/java/okhttp3/ResponseJvmTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/ResponseJvmTest.kt rename to okhttp/src/test/java/okhttp3/ResponseJvmTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/RouteFailureTest.kt b/okhttp/src/test/java/okhttp3/RouteFailureTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/RouteFailureTest.kt rename to okhttp/src/test/java/okhttp3/RouteFailureTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/ServerTruncatesRequestTest.kt b/okhttp/src/test/java/okhttp3/ServerTruncatesRequestTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/ServerTruncatesRequestTest.kt rename to okhttp/src/test/java/okhttp3/ServerTruncatesRequestTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/SessionReuseTest.kt b/okhttp/src/test/java/okhttp3/SessionReuseTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/SessionReuseTest.kt rename to okhttp/src/test/java/okhttp3/SessionReuseTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/SocketChannelTest.kt b/okhttp/src/test/java/okhttp3/SocketChannelTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/SocketChannelTest.kt rename to okhttp/src/test/java/okhttp3/SocketChannelTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/SocksProxy.kt b/okhttp/src/test/java/okhttp3/SocksProxy.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/SocksProxy.kt rename to okhttp/src/test/java/okhttp3/SocksProxy.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/SocksProxyTest.java b/okhttp/src/test/java/okhttp3/SocksProxyTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/SocksProxyTest.java rename to okhttp/src/test/java/okhttp3/SocksProxyTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/TestLogHandler.java b/okhttp/src/test/java/okhttp3/TestLogHandler.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/TestLogHandler.java rename to okhttp/src/test/java/okhttp3/TestLogHandler.java diff --git a/okhttp/src/jvmTest/java/okhttp3/TestTls13Request.java b/okhttp/src/test/java/okhttp3/TestTls13Request.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/TestTls13Request.java rename to okhttp/src/test/java/okhttp3/TestTls13Request.java diff --git a/okhttp/src/jvmTest/java/okhttp3/URLConnectionTest.kt b/okhttp/src/test/java/okhttp3/URLConnectionTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/URLConnectionTest.kt rename to okhttp/src/test/java/okhttp3/URLConnectionTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/UrlComponentEncodingTester.kt b/okhttp/src/test/java/okhttp3/UrlComponentEncodingTester.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/UrlComponentEncodingTester.kt rename to okhttp/src/test/java/okhttp3/UrlComponentEncodingTester.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/UrlComponentEncodingTesterJvm.kt b/okhttp/src/test/java/okhttp3/UrlComponentEncodingTesterJvm.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/UrlComponentEncodingTesterJvm.kt rename to okhttp/src/test/java/okhttp3/UrlComponentEncodingTesterJvm.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/WebPlatformToAsciiData.kt b/okhttp/src/test/java/okhttp3/WebPlatformToAsciiData.kt similarity index 93% rename from okhttp/src/jvmTest/java/okhttp3/WebPlatformToAsciiData.kt rename to okhttp/src/test/java/okhttp3/WebPlatformToAsciiData.kt index 1912ae0c7442..474862b25444 100644 --- a/okhttp/src/jvmTest/java/okhttp3/WebPlatformToAsciiData.kt +++ b/okhttp/src/test/java/okhttp3/WebPlatformToAsciiData.kt @@ -34,7 +34,7 @@ class WebPlatformToAsciiData { companion object { fun load(): List { - val path = okHttpRoot / "okhttp/src/jvmTest/resources/web-platform-test-toascii.json" + val path = okHttpRoot / "okhttp/src/test/resources/web-platform-test-toascii.json" return SYSTEM_FILE_SYSTEM.read(path) { Json.decodeFromString>(readUtf8()) } diff --git a/okhttp/src/jvmTest/java/okhttp3/WebPlatformToAsciiTest.kt b/okhttp/src/test/java/okhttp3/WebPlatformToAsciiTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/WebPlatformToAsciiTest.kt rename to okhttp/src/test/java/okhttp3/WebPlatformToAsciiTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/WebPlatformUrlTest.kt b/okhttp/src/test/java/okhttp3/WebPlatformUrlTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/WebPlatformUrlTest.kt rename to okhttp/src/test/java/okhttp3/WebPlatformUrlTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/WebPlatformUrlTestData.kt b/okhttp/src/test/java/okhttp3/WebPlatformUrlTestData.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/WebPlatformUrlTestData.kt rename to okhttp/src/test/java/okhttp3/WebPlatformUrlTestData.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/WholeOperationTimeoutTest.java b/okhttp/src/test/java/okhttp3/WholeOperationTimeoutTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/WholeOperationTimeoutTest.java rename to okhttp/src/test/java/okhttp3/WholeOperationTimeoutTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/DoubleInetAddressDns.java b/okhttp/src/test/java/okhttp3/internal/DoubleInetAddressDns.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/DoubleInetAddressDns.java rename to okhttp/src/test/java/okhttp3/internal/DoubleInetAddressDns.java diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/HostnamesTest.kt b/okhttp/src/test/java/okhttp3/internal/HostnamesTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/HostnamesTest.kt rename to okhttp/src/test/java/okhttp3/internal/HostnamesTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/RecordingAuthenticator.java b/okhttp/src/test/java/okhttp3/internal/RecordingAuthenticator.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/RecordingAuthenticator.java rename to okhttp/src/test/java/okhttp3/internal/RecordingAuthenticator.java diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/SocketRecorder.java b/okhttp/src/test/java/okhttp3/internal/SocketRecorder.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/SocketRecorder.java rename to okhttp/src/test/java/okhttp3/internal/SocketRecorder.java diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/UtilTest.kt b/okhttp/src/test/java/okhttp3/internal/UtilTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/UtilTest.kt rename to okhttp/src/test/java/okhttp3/internal/UtilTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/authenticator/JavaNetAuthenticatorTest.kt b/okhttp/src/test/java/okhttp3/internal/authenticator/JavaNetAuthenticatorTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/authenticator/JavaNetAuthenticatorTest.kt rename to okhttp/src/test/java/okhttp3/internal/authenticator/JavaNetAuthenticatorTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/cache/DiskLruCacheTest.kt b/okhttp/src/test/java/okhttp3/internal/cache/DiskLruCacheTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/cache/DiskLruCacheTest.kt rename to okhttp/src/test/java/okhttp3/internal/cache/DiskLruCacheTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/cache2/FileOperatorTest.java b/okhttp/src/test/java/okhttp3/internal/cache2/FileOperatorTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/cache2/FileOperatorTest.java rename to okhttp/src/test/java/okhttp3/internal/cache2/FileOperatorTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/cache2/RelayTest.java b/okhttp/src/test/java/okhttp3/internal/cache2/RelayTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/cache2/RelayTest.java rename to okhttp/src/test/java/okhttp3/internal/cache2/RelayTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/concurrent/TaskLoggerTest.kt b/okhttp/src/test/java/okhttp3/internal/concurrent/TaskLoggerTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/concurrent/TaskLoggerTest.kt rename to okhttp/src/test/java/okhttp3/internal/concurrent/TaskLoggerTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/concurrent/TaskRunnerRealBackendTest.kt b/okhttp/src/test/java/okhttp3/internal/concurrent/TaskRunnerRealBackendTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/concurrent/TaskRunnerRealBackendTest.kt rename to okhttp/src/test/java/okhttp3/internal/concurrent/TaskRunnerRealBackendTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/concurrent/TaskRunnerTest.kt b/okhttp/src/test/java/okhttp3/internal/concurrent/TaskRunnerTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/concurrent/TaskRunnerTest.kt rename to okhttp/src/test/java/okhttp3/internal/concurrent/TaskRunnerTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/connection/ConnectionPoolTest.kt b/okhttp/src/test/java/okhttp3/internal/connection/ConnectionPoolTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/connection/ConnectionPoolTest.kt rename to okhttp/src/test/java/okhttp3/internal/connection/ConnectionPoolTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/connection/FastFallbackExchangeFinderTest.kt b/okhttp/src/test/java/okhttp3/internal/connection/FastFallbackExchangeFinderTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/connection/FastFallbackExchangeFinderTest.kt rename to okhttp/src/test/java/okhttp3/internal/connection/FastFallbackExchangeFinderTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/connection/InetAddressOrderTest.kt b/okhttp/src/test/java/okhttp3/internal/connection/InetAddressOrderTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/connection/InetAddressOrderTest.kt rename to okhttp/src/test/java/okhttp3/internal/connection/InetAddressOrderTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/connection/RetryConnectionTest.kt b/okhttp/src/test/java/okhttp3/internal/connection/RetryConnectionTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/connection/RetryConnectionTest.kt rename to okhttp/src/test/java/okhttp3/internal/connection/RetryConnectionTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/connection/RouteSelectorTest.kt b/okhttp/src/test/java/okhttp3/internal/connection/RouteSelectorTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/connection/RouteSelectorTest.kt rename to okhttp/src/test/java/okhttp3/internal/connection/RouteSelectorTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/http/CancelTest.kt b/okhttp/src/test/java/okhttp3/internal/http/CancelTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/http/CancelTest.kt rename to okhttp/src/test/java/okhttp3/internal/http/CancelTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/http/ExternalHttp2Example.kt b/okhttp/src/test/java/okhttp3/internal/http/ExternalHttp2Example.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/http/ExternalHttp2Example.kt rename to okhttp/src/test/java/okhttp3/internal/http/ExternalHttp2Example.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/http/HttpDateTest.kt b/okhttp/src/test/java/okhttp3/internal/http/HttpDateTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/http/HttpDateTest.kt rename to okhttp/src/test/java/okhttp3/internal/http/HttpDateTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/http/StatusLineTest.java b/okhttp/src/test/java/okhttp3/internal/http/StatusLineTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/http/StatusLineTest.java rename to okhttp/src/test/java/okhttp3/internal/http/StatusLineTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/http/ThreadInterruptTest.java b/okhttp/src/test/java/okhttp3/internal/http/ThreadInterruptTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/http/ThreadInterruptTest.java rename to okhttp/src/test/java/okhttp3/internal/http/ThreadInterruptTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/http2/BaseTestHandler.java b/okhttp/src/test/java/okhttp3/internal/http2/BaseTestHandler.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/http2/BaseTestHandler.java rename to okhttp/src/test/java/okhttp3/internal/http2/BaseTestHandler.java diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/http2/FrameLogTest.kt b/okhttp/src/test/java/okhttp3/internal/http2/FrameLogTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/http2/FrameLogTest.kt rename to okhttp/src/test/java/okhttp3/internal/http2/FrameLogTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/http2/HpackTest.java b/okhttp/src/test/java/okhttp3/internal/http2/HpackTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/http2/HpackTest.java rename to okhttp/src/test/java/okhttp3/internal/http2/HpackTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/http2/Http2ConnectionTest.kt b/okhttp/src/test/java/okhttp3/internal/http2/Http2ConnectionTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/http2/Http2ConnectionTest.kt rename to okhttp/src/test/java/okhttp3/internal/http2/Http2ConnectionTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/http2/Http2Test.kt b/okhttp/src/test/java/okhttp3/internal/http2/Http2Test.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/http2/Http2Test.kt rename to okhttp/src/test/java/okhttp3/internal/http2/Http2Test.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/http2/HttpOverHttp2Test.kt b/okhttp/src/test/java/okhttp3/internal/http2/HttpOverHttp2Test.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/http2/HttpOverHttp2Test.kt rename to okhttp/src/test/java/okhttp3/internal/http2/HttpOverHttp2Test.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/http2/HuffmanTest.java b/okhttp/src/test/java/okhttp3/internal/http2/HuffmanTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/http2/HuffmanTest.java rename to okhttp/src/test/java/okhttp3/internal/http2/HuffmanTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/http2/MockHttp2Peer.kt b/okhttp/src/test/java/okhttp3/internal/http2/MockHttp2Peer.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/http2/MockHttp2Peer.kt rename to okhttp/src/test/java/okhttp3/internal/http2/MockHttp2Peer.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/http2/SettingsTest.java b/okhttp/src/test/java/okhttp3/internal/http2/SettingsTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/http2/SettingsTest.java rename to okhttp/src/test/java/okhttp3/internal/http2/SettingsTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/idn/IdnaMappingTableTest.kt b/okhttp/src/test/java/okhttp3/internal/idn/IdnaMappingTableTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/idn/IdnaMappingTableTest.kt rename to okhttp/src/test/java/okhttp3/internal/idn/IdnaMappingTableTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/idn/PunycodeTest.kt b/okhttp/src/test/java/okhttp3/internal/idn/PunycodeTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/idn/PunycodeTest.kt rename to okhttp/src/test/java/okhttp3/internal/idn/PunycodeTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/idn/StringprepTablesReaderTest.kt b/okhttp/src/test/java/okhttp3/internal/idn/StringprepTablesReaderTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/idn/StringprepTablesReaderTest.kt rename to okhttp/src/test/java/okhttp3/internal/idn/StringprepTablesReaderTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/idn/StringprepTest.kt b/okhttp/src/test/java/okhttp3/internal/idn/StringprepTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/idn/StringprepTest.kt rename to okhttp/src/test/java/okhttp3/internal/idn/StringprepTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/idn/stringprep.kt b/okhttp/src/test/java/okhttp3/internal/idn/stringprep.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/idn/stringprep.kt rename to okhttp/src/test/java/okhttp3/internal/idn/stringprep.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/idn/stringprepTablesReader.kt b/okhttp/src/test/java/okhttp3/internal/idn/stringprepTablesReader.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/idn/stringprepTablesReader.kt rename to okhttp/src/test/java/okhttp3/internal/idn/stringprepTablesReader.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/io/FaultyFileSystem.kt b/okhttp/src/test/java/okhttp3/internal/io/FaultyFileSystem.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/io/FaultyFileSystem.kt rename to okhttp/src/test/java/okhttp3/internal/io/FaultyFileSystem.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/platform/Jdk8WithJettyBootPlatformTest.java b/okhttp/src/test/java/okhttp3/internal/platform/Jdk8WithJettyBootPlatformTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/platform/Jdk8WithJettyBootPlatformTest.java rename to okhttp/src/test/java/okhttp3/internal/platform/Jdk8WithJettyBootPlatformTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/platform/Jdk9PlatformTest.java b/okhttp/src/test/java/okhttp3/internal/platform/Jdk9PlatformTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/platform/Jdk9PlatformTest.java rename to okhttp/src/test/java/okhttp3/internal/platform/Jdk9PlatformTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/platform/PlatformTest.java b/okhttp/src/test/java/okhttp3/internal/platform/PlatformTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/platform/PlatformTest.java rename to okhttp/src/test/java/okhttp3/internal/platform/PlatformTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/platform/android/AndroidSocketAdapterTest.kt b/okhttp/src/test/java/okhttp3/internal/platform/android/AndroidSocketAdapterTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/platform/android/AndroidSocketAdapterTest.kt rename to okhttp/src/test/java/okhttp3/internal/platform/android/AndroidSocketAdapterTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/publicsuffix/PublicSuffixDatabaseTest.kt b/okhttp/src/test/java/okhttp3/internal/publicsuffix/PublicSuffixDatabaseTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/publicsuffix/PublicSuffixDatabaseTest.kt rename to okhttp/src/test/java/okhttp3/internal/publicsuffix/PublicSuffixDatabaseTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/publicsuffix/PublicSuffixListGenerator.kt b/okhttp/src/test/java/okhttp3/internal/publicsuffix/PublicSuffixListGenerator.kt similarity index 96% rename from okhttp/src/jvmTest/java/okhttp3/internal/publicsuffix/PublicSuffixListGenerator.kt rename to okhttp/src/test/java/okhttp3/internal/publicsuffix/PublicSuffixListGenerator.kt index c02e7b14a330..9d41a1df1742 100644 --- a/okhttp/src/jvmTest/java/okhttp3/internal/publicsuffix/PublicSuffixListGenerator.kt +++ b/okhttp/src/test/java/okhttp3/internal/publicsuffix/PublicSuffixListGenerator.kt @@ -49,8 +49,8 @@ class PublicSuffixListGenerator( val fileSystem: FileSystem = FileSystem.SYSTEM, val client: OkHttpClient = OkHttpClient() ) { - private val resources = projectRoot / "okhttp/src/jvmMain/resources/okhttp3/internal/publicsuffix" - private val testResources = projectRoot / "okhttp/src/jvmTest/resources/okhttp3/internal/publicsuffix" + private val resources = projectRoot / "okhttp/src/main/resources/okhttp3/internal/publicsuffix" + private val testResources = projectRoot / "okhttp/src/test/resources/okhttp3/internal/publicsuffix" private val publicSuffixListDotDat = testResources / "public_suffix_list.dat" private val outputFile = resources / PUBLIC_SUFFIX_RESOURCE diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/tls/CertificatePinnerChainValidationTest.java b/okhttp/src/test/java/okhttp3/internal/tls/CertificatePinnerChainValidationTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/tls/CertificatePinnerChainValidationTest.java rename to okhttp/src/test/java/okhttp3/internal/tls/CertificatePinnerChainValidationTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/tls/ClientAuthTest.java b/okhttp/src/test/java/okhttp3/internal/tls/ClientAuthTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/tls/ClientAuthTest.java rename to okhttp/src/test/java/okhttp3/internal/tls/ClientAuthTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/tls/HostnameVerifierTest.kt b/okhttp/src/test/java/okhttp3/internal/tls/HostnameVerifierTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/tls/HostnameVerifierTest.kt rename to okhttp/src/test/java/okhttp3/internal/tls/HostnameVerifierTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/ws/MessageDeflaterInflaterTest.kt b/okhttp/src/test/java/okhttp3/internal/ws/MessageDeflaterInflaterTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/ws/MessageDeflaterInflaterTest.kt rename to okhttp/src/test/java/okhttp3/internal/ws/MessageDeflaterInflaterTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/ws/RealWebSocketTest.java b/okhttp/src/test/java/okhttp3/internal/ws/RealWebSocketTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/ws/RealWebSocketTest.java rename to okhttp/src/test/java/okhttp3/internal/ws/RealWebSocketTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/ws/WebSocketExtensionsTest.kt b/okhttp/src/test/java/okhttp3/internal/ws/WebSocketExtensionsTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/ws/WebSocketExtensionsTest.kt rename to okhttp/src/test/java/okhttp3/internal/ws/WebSocketExtensionsTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/ws/WebSocketHttpTest.java b/okhttp/src/test/java/okhttp3/internal/ws/WebSocketHttpTest.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/ws/WebSocketHttpTest.java rename to okhttp/src/test/java/okhttp3/internal/ws/WebSocketHttpTest.java diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/ws/WebSocketReaderTest.kt b/okhttp/src/test/java/okhttp3/internal/ws/WebSocketReaderTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/ws/WebSocketReaderTest.kt rename to okhttp/src/test/java/okhttp3/internal/ws/WebSocketReaderTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/ws/WebSocketRecorder.java b/okhttp/src/test/java/okhttp3/internal/ws/WebSocketRecorder.java similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/ws/WebSocketRecorder.java rename to okhttp/src/test/java/okhttp3/internal/ws/WebSocketRecorder.java diff --git a/okhttp/src/jvmTest/java/okhttp3/internal/ws/WebSocketWriterTest.kt b/okhttp/src/test/java/okhttp3/internal/ws/WebSocketWriterTest.kt similarity index 100% rename from okhttp/src/jvmTest/java/okhttp3/internal/ws/WebSocketWriterTest.kt rename to okhttp/src/test/java/okhttp3/internal/ws/WebSocketWriterTest.kt diff --git a/okhttp/src/jvmTest/java/okhttp3/osgi/OsgiTest.java b/okhttp/src/test/java/okhttp3/osgi/OsgiTest.java similarity index 98% rename from okhttp/src/jvmTest/java/okhttp3/osgi/OsgiTest.java rename to okhttp/src/test/java/okhttp3/osgi/OsgiTest.java index 39e8794ed049..60bb0925918e 100644 --- a/okhttp/src/jvmTest/java/okhttp3/osgi/OsgiTest.java +++ b/okhttp/src/test/java/okhttp3/osgi/OsgiTest.java @@ -58,7 +58,7 @@ public final class OsgiTest { @BeforeEach public void setUp() throws Exception { - testResourceDir = new File("./build/resources/jvmTest/okhttp3/osgi"); + testResourceDir = new File("./build/resources/test/okhttp3/osgi"); workspaceDir = new File(testResourceDir, "workspace"); // Ensure we start from scratch. diff --git a/okhttp/src/jvmTest/resources/okhttp3/internal/idn/README.md b/okhttp/src/test/resources/okhttp3/internal/idn/README.md similarity index 91% rename from okhttp/src/jvmTest/resources/okhttp3/internal/idn/README.md rename to okhttp/src/test/resources/okhttp3/internal/idn/README.md index 15217c4c9a5b..49882e158746 100644 --- a/okhttp/src/jvmTest/resources/okhttp3/internal/idn/README.md +++ b/okhttp/src/test/resources/okhttp3/internal/idn/README.md @@ -8,7 +8,7 @@ In order to implement Nameprep (RFC 3491), OkHttp uses Unicode tables specified This format is chosen to make it easy to validate that these tables are consistent with the RFC. ``` -cd okhttp/src/jvmTest/resources/okhttp3/internal/idn/ +cd okhttp/src/test/resources/okhttp3/internal/idn/ ls rfc3454.*.txt | xargs -n 1 -I {} bash -c "echo {} ; cat {}" > okhttp_tables.txt curl https://www.rfc-editor.org/rfc/rfc3454.txt > rfc3454.txt diff rfc3454.txt okhttp_tables.txt | less diff --git a/okhttp/src/jvmTest/resources/okhttp3/internal/idn/rfc3454.A.1.txt b/okhttp/src/test/resources/okhttp3/internal/idn/rfc3454.A.1.txt similarity index 100% rename from okhttp/src/jvmTest/resources/okhttp3/internal/idn/rfc3454.A.1.txt rename to okhttp/src/test/resources/okhttp3/internal/idn/rfc3454.A.1.txt diff --git a/okhttp/src/jvmTest/resources/okhttp3/internal/idn/rfc3454.B.1.txt b/okhttp/src/test/resources/okhttp3/internal/idn/rfc3454.B.1.txt similarity index 100% rename from okhttp/src/jvmTest/resources/okhttp3/internal/idn/rfc3454.B.1.txt rename to okhttp/src/test/resources/okhttp3/internal/idn/rfc3454.B.1.txt diff --git a/okhttp/src/jvmTest/resources/okhttp3/internal/idn/rfc3454.B.2.txt b/okhttp/src/test/resources/okhttp3/internal/idn/rfc3454.B.2.txt similarity index 100% rename from okhttp/src/jvmTest/resources/okhttp3/internal/idn/rfc3454.B.2.txt rename to okhttp/src/test/resources/okhttp3/internal/idn/rfc3454.B.2.txt diff --git a/okhttp/src/jvmTest/resources/okhttp3/internal/idn/rfc3454.C.1.2.txt b/okhttp/src/test/resources/okhttp3/internal/idn/rfc3454.C.1.2.txt similarity index 100% rename from okhttp/src/jvmTest/resources/okhttp3/internal/idn/rfc3454.C.1.2.txt rename to okhttp/src/test/resources/okhttp3/internal/idn/rfc3454.C.1.2.txt diff --git a/okhttp/src/jvmTest/resources/okhttp3/internal/idn/rfc3454.C.2.2.txt b/okhttp/src/test/resources/okhttp3/internal/idn/rfc3454.C.2.2.txt similarity index 100% rename from okhttp/src/jvmTest/resources/okhttp3/internal/idn/rfc3454.C.2.2.txt rename to okhttp/src/test/resources/okhttp3/internal/idn/rfc3454.C.2.2.txt diff --git a/okhttp/src/jvmTest/resources/okhttp3/internal/idn/rfc3454.C.3.txt b/okhttp/src/test/resources/okhttp3/internal/idn/rfc3454.C.3.txt similarity index 100% rename from okhttp/src/jvmTest/resources/okhttp3/internal/idn/rfc3454.C.3.txt rename to okhttp/src/test/resources/okhttp3/internal/idn/rfc3454.C.3.txt diff --git a/okhttp/src/jvmTest/resources/okhttp3/internal/idn/rfc3454.C.4.txt b/okhttp/src/test/resources/okhttp3/internal/idn/rfc3454.C.4.txt similarity index 100% rename from okhttp/src/jvmTest/resources/okhttp3/internal/idn/rfc3454.C.4.txt rename to okhttp/src/test/resources/okhttp3/internal/idn/rfc3454.C.4.txt diff --git a/okhttp/src/jvmTest/resources/okhttp3/internal/idn/rfc3454.C.5.txt b/okhttp/src/test/resources/okhttp3/internal/idn/rfc3454.C.5.txt similarity index 100% rename from okhttp/src/jvmTest/resources/okhttp3/internal/idn/rfc3454.C.5.txt rename to okhttp/src/test/resources/okhttp3/internal/idn/rfc3454.C.5.txt diff --git a/okhttp/src/jvmTest/resources/okhttp3/internal/idn/rfc3454.C.6.txt b/okhttp/src/test/resources/okhttp3/internal/idn/rfc3454.C.6.txt similarity index 100% rename from okhttp/src/jvmTest/resources/okhttp3/internal/idn/rfc3454.C.6.txt rename to okhttp/src/test/resources/okhttp3/internal/idn/rfc3454.C.6.txt diff --git a/okhttp/src/jvmTest/resources/okhttp3/internal/idn/rfc3454.C.7.txt b/okhttp/src/test/resources/okhttp3/internal/idn/rfc3454.C.7.txt similarity index 100% rename from okhttp/src/jvmTest/resources/okhttp3/internal/idn/rfc3454.C.7.txt rename to okhttp/src/test/resources/okhttp3/internal/idn/rfc3454.C.7.txt diff --git a/okhttp/src/jvmTest/resources/okhttp3/internal/idn/rfc3454.C.8.txt b/okhttp/src/test/resources/okhttp3/internal/idn/rfc3454.C.8.txt similarity index 100% rename from okhttp/src/jvmTest/resources/okhttp3/internal/idn/rfc3454.C.8.txt rename to okhttp/src/test/resources/okhttp3/internal/idn/rfc3454.C.8.txt diff --git a/okhttp/src/jvmTest/resources/okhttp3/internal/idn/rfc3454.C.9.txt b/okhttp/src/test/resources/okhttp3/internal/idn/rfc3454.C.9.txt similarity index 100% rename from okhttp/src/jvmTest/resources/okhttp3/internal/idn/rfc3454.C.9.txt rename to okhttp/src/test/resources/okhttp3/internal/idn/rfc3454.C.9.txt diff --git a/okhttp/src/jvmTest/resources/okhttp3/internal/idn/rfc3454.D.1.txt b/okhttp/src/test/resources/okhttp3/internal/idn/rfc3454.D.1.txt similarity index 100% rename from okhttp/src/jvmTest/resources/okhttp3/internal/idn/rfc3454.D.1.txt rename to okhttp/src/test/resources/okhttp3/internal/idn/rfc3454.D.1.txt diff --git a/okhttp/src/jvmTest/resources/okhttp3/internal/idn/rfc3454.D.2.txt b/okhttp/src/test/resources/okhttp3/internal/idn/rfc3454.D.2.txt similarity index 100% rename from okhttp/src/jvmTest/resources/okhttp3/internal/idn/rfc3454.D.2.txt rename to okhttp/src/test/resources/okhttp3/internal/idn/rfc3454.D.2.txt diff --git a/okhttp/src/jvmTest/resources/okhttp3/internal/publicsuffix/public_suffix_list.dat b/okhttp/src/test/resources/okhttp3/internal/publicsuffix/public_suffix_list.dat similarity index 100% rename from okhttp/src/jvmTest/resources/okhttp3/internal/publicsuffix/public_suffix_list.dat rename to okhttp/src/test/resources/okhttp3/internal/publicsuffix/public_suffix_list.dat diff --git a/okhttp/src/jvmTest/resources/web-platform-test-toascii.json b/okhttp/src/test/resources/web-platform-test-toascii.json similarity index 100% rename from okhttp/src/jvmTest/resources/web-platform-test-toascii.json rename to okhttp/src/test/resources/web-platform-test-toascii.json diff --git a/okhttp/src/jvmTest/resources/web-platform-test-urltestdata.txt b/okhttp/src/test/resources/web-platform-test-urltestdata.txt similarity index 100% rename from okhttp/src/jvmTest/resources/web-platform-test-urltestdata.txt rename to okhttp/src/test/resources/web-platform-test-urltestdata.txt