Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Flatten some common HttpUrl internals #8185

Merged
merged 2 commits into from
Jan 9, 2024
Merged

Flatten some common HttpUrl internals #8185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
153d08c
Flatten some common HttpUrl internals
squarejesse Jan 9, 2024
2690e50
Add a synthetic API
squarejesse Jan 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions okhttp/api/okhttp.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,6 +677,7 @@ public final class okhttp3/HttpUrl {
public final fun -deprecated_uri ()Ljava/net/URI;
public final fun -deprecated_url ()Ljava/net/URL;
public final fun -deprecated_username ()Ljava/lang/String;
public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/util/List;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
public static final fun defaultPort (Ljava/lang/String;)I
public final fun encodedFragment ()Ljava/lang/String;
public final fun encodedPassword ()Ljava/lang/String;
Expand Down
21 changes: 0 additions & 21 deletions okhttp/src/main/kotlin/okhttp3/-JvmPlatform.kt
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions okhttp/src/main/kotlin/okhttp3/FormBody.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading