Skip to content

Fix Square.OkHttp3 5.0.0+ by creating separate okhttp-android package with type forwarders for backward compatibility #1239

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 12, 2025
Merged

Fix Square.OkHttp3 5.0.0+ by creating separate okhttp-android package with type forwarders for backward compatibility #1239

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
21f9f94
Initial plan
Copilot Aug 4, 2025
1c0fc4a
Fix Square.OkHttp3 5.0.0+ by switching to okhttp-android artifact
Copilot Aug 4, 2025
dc5482d
Create separate okhttp-android package and restore okhttp for depende…
Copilot Aug 4, 2025
986e6a4
Update okhttp version from 4.12.0 to 5.1.0 to match okhttp-android
Copilot Aug 4, 2025
f434939
Add extraDependencies to Square.OkHttp3 to depend on Square.OkHttp3.A…
Copilot Aug 11, 2025
1f006a2
Bump nugetVersion for all okhttp3 packages and add type forwarders
Copilot Aug 12, 2025
fadf803
Update config.json
jonathanpeppers Aug 12, 2025
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
10 changes: 10 additions & 0 deletions config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4304,6 +4304,16 @@
"version": "5.1.0",
"nugetVersion": "5.1.0",
"nugetId": "Square.OkHttp3",
"dependencyOnly": true,
"type": "androidlibrary",
"mavenRepositoryType": "MavenCentral"
},
{
"groupId": "com.squareup.okhttp3",
"artifactId": "okhttp-android",
"version": "5.1.0",
"nugetVersion": "5.1.0",
"nugetId": "Square.OkHttp3.Android",
"type": "androidlibrary",
"mavenRepositoryType": "MavenCentral"
},
Expand Down
10 changes: 10 additions & 0 deletions source/com.google.firebase/firebase-perf/PublicAPI/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,9 @@ Firebase.Perf.Network.InstrHttpsURLConnection
Firebase.Perf.Network.InstrumentApacheHttpResponseHandler
Firebase.Perf.Network.InstrumentApacheHttpResponseHandler.InstrumentApacheHttpResponseHandler(Org.Apache.Http.Client.IResponseHandler? responseHandler, Firebase.Perf.Util.Timer? timer, Firebase.Perf.Metrics.NetworkRequestMetricBuilder? builder) -> void
Firebase.Perf.Network.InstrumentApacheHttpResponseHandler.InstrumentApacheHttpResponseHandler(nint javaReference, Android.Runtime.JniHandleOwnership transfer) -> void
Firebase.Perf.Network.InstrumentOkHttpEnqueueCallback
Firebase.Perf.Network.InstrumentOkHttpEnqueueCallback.InstrumentOkHttpEnqueueCallback(Square.OkHttp3.ICallback? callback, Firebase.Perf.Transport.TransportManager? transportManager, Firebase.Perf.Util.Timer? timer, long startTime) -> void
Firebase.Perf.Network.InstrumentOkHttpEnqueueCallback.InstrumentOkHttpEnqueueCallback(nint javaReference, Android.Runtime.JniHandleOwnership transfer) -> void
Firebase.Perf.Network.NetworkRequestMetricBuilderUtil
Firebase.Perf.PerformanceKt
Firebase.Perf.Session.Gauges.CpuGaugeCollector
Expand Down Expand Up @@ -1138,6 +1141,9 @@ override Firebase.Perf.Network.InstrHttpsURLConnection.UsingProxy() -> bool
override Firebase.Perf.Network.InstrumentApacheHttpResponseHandler.JniPeerMembers.get -> Java.Interop.JniPeerMembers!
override Firebase.Perf.Network.InstrumentApacheHttpResponseHandler.ThresholdClass.get -> nint
override Firebase.Perf.Network.InstrumentApacheHttpResponseHandler.ThresholdType.get -> System.Type!
override Firebase.Perf.Network.InstrumentOkHttpEnqueueCallback.JniPeerMembers.get -> Java.Interop.JniPeerMembers!
override Firebase.Perf.Network.InstrumentOkHttpEnqueueCallback.ThresholdClass.get -> nint
override Firebase.Perf.Network.InstrumentOkHttpEnqueueCallback.ThresholdType.get -> System.Type!
override Firebase.Perf.Network.NetworkRequestMetricBuilderUtil.JniPeerMembers.get -> Java.Interop.JniPeerMembers!
override Firebase.Perf.PerformanceKt.JniPeerMembers.get -> Java.Interop.JniPeerMembers!
override Firebase.Perf.Session.Gauges.CpuGaugeCollector.JniPeerMembers.get -> Java.Interop.JniPeerMembers!
Expand Down Expand Up @@ -1268,6 +1274,8 @@ static Firebase.Perf.Network.FirebasePerfHttpClient.Execute(Org.Apache.Http.Clie
static Firebase.Perf.Network.FirebasePerfHttpClient.Execute(Org.Apache.Http.Client.IHttpClient? client, Org.Apache.Http.HttpHost? target, Org.Apache.Http.IHttpRequest? request, Org.Apache.Http.Client.IResponseHandler? responseHandler) -> Java.Lang.Object?
static Firebase.Perf.Network.FirebasePerfHttpClient.Execute(Org.Apache.Http.Client.IHttpClient? client, Org.Apache.Http.HttpHost? target, Org.Apache.Http.IHttpRequest? request, Org.Apache.Http.Client.IResponseHandler? responseHandler, Org.Apache.Http.Protocol.IHttpContext? context) -> Java.Lang.Object?
static Firebase.Perf.Network.FirebasePerfHttpClient.Execute(Org.Apache.Http.Client.IHttpClient? client, Org.Apache.Http.HttpHost? target, Org.Apache.Http.IHttpRequest? request, Org.Apache.Http.Protocol.IHttpContext? context) -> Org.Apache.Http.IHttpResponse?
static Firebase.Perf.Network.FirebasePerfOkHttpClient.Enqueue(Square.OkHttp3.ICall? call, Square.OkHttp3.ICallback? callback) -> void
static Firebase.Perf.Network.FirebasePerfOkHttpClient.Execute(Square.OkHttp3.ICall? call) -> Square.OkHttp3.Response?
static Firebase.Perf.Network.FirebasePerfUrlConnection.GetContent(Java.Net.URL? url) -> Java.Lang.Object?
static Firebase.Perf.Network.FirebasePerfUrlConnection.GetContent(Java.Net.URL? url, Java.Lang.Class![]? types) -> Java.Lang.Object?
static Firebase.Perf.Network.FirebasePerfUrlConnection.Instrument(Java.Lang.Object? connection) -> Java.Lang.Object?
Expand Down Expand Up @@ -1767,6 +1775,8 @@ virtual Firebase.Perf.Metrics.Trace.Stop() -> void
virtual Firebase.Perf.Metrics.Trace.UpdateSession(Firebase.Perf.Session.PerfSession? session) -> void
virtual Firebase.Perf.Metrics.Trace.WriteToParcel(Android.OS.Parcel! out, Android.OS.ParcelableWriteFlags flags) -> void
virtual Firebase.Perf.Network.InstrumentApacheHttpResponseHandler.HandleResponse(Org.Apache.Http.IHttpResponse? httpResponse) -> Java.Lang.Object?
virtual Firebase.Perf.Network.InstrumentOkHttpEnqueueCallback.OnFailure(Square.OkHttp3.ICall? call, Java.IO.IOException? e) -> void
virtual Firebase.Perf.Network.InstrumentOkHttpEnqueueCallback.OnResponse(Square.OkHttp3.ICall? call, Square.OkHttp3.Response? response) -> void
virtual Firebase.Perf.Session.Gauges.CpuGaugeCollector.CollectOnce(Firebase.Perf.Util.Timer? referenceTime) -> void
virtual Firebase.Perf.Session.Gauges.CpuGaugeCollector.StartCollecting(long cpuMetricCollectionRateMs, Firebase.Perf.Util.Timer? referenceTime) -> void
virtual Firebase.Perf.Session.Gauges.CpuGaugeCollector.StopCollecting() -> void
Expand Down
0 ...p3/okhttp/PublicAPI/PublicAPI.Shipped.txt → ...p-android/PublicAPI/PublicAPI.Shipped.txt
View file
Open in desktop
File renamed without changes.
Loading
Loading