Flatten some common HttpUrl internals

Trying to reduce the number of indirections that were only necessary when we were attempting to support multiplatform.
square · Jan 9, 2024 · 153d08c · 153d08c
1 parent d1b4734
commit 153d08c
Show file tree

Hide file tree

Showing 8 changed files with 1,074 additions and 1,316 deletions.
diff --git a/okhttp/src/main/kotlin/okhttp3/-JvmPlatform.kt b/okhttp/src/main/kotlin/okhttp3/-JvmPlatform.kt
diff --git a/okhttp/src/main/kotlin/okhttp3/FormBody.kt b/okhttp/src/main/kotlin/okhttp3/FormBody.kt
@@ -18,10 +18,10 @@ package okhttp3
 import java.io.IOException
 import java.nio.charset.Charset
 import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.internal.CommonHttpUrl.FORM_ENCODE_SET
-import okhttp3.internal.CommonHttpUrl.percentDecode
-import okhttp3.internal.JvmHttpUrl.canonicalizeWithCharset
 import okhttp3.internal.toImmutableList
+import okhttp3.internal.url.FORM_ENCODE_SET
+import okhttp3.internal.url.canonicalizeWithCharset
+import okhttp3.internal.url.percentDecode
 import okio.Buffer
 import okio.BufferedSink