Skip to content

Commit 50f9762

Browse files
martinbonninmartinbonnin
committed
keep binary compatibility
1 parent da27670 commit 50f9762

File tree

5 files changed

+31
-4
lines changed

5 files changed

+31
-4
lines changed

‎libraries/apollo-annotations/src/commonMain/kotlin/com/apollographql/apollo/annotations/ApolloDeprecatedSince.kt

+1
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,6 @@ annotation class ApolloDeprecatedSince(val version: Version) {
3333
v4_0_0,
3434
v4_0_1,
3535
v4_0_2,
36+
v4_1_1,
3637
}
3738
}

‎libraries/apollo-runtime/api/android/apollo-runtime.api

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public abstract interface class com/apollographql/apollo/network/NetworkTranspor
182182
public final class com/apollographql/apollo/network/OkHttpExtensionsKt {
183183
public static final fun okHttpCallFactory (Lcom/apollographql/apollo/ApolloClient$Builder;Lkotlin/jvm/functions/Function0;)Lcom/apollographql/apollo/ApolloClient$Builder;
184184
public static final fun okHttpCallFactory (Lcom/apollographql/apollo/ApolloClient$Builder;Lokhttp3/Call$Factory;)Lcom/apollographql/apollo/ApolloClient$Builder;
185-
public static final fun okHttpCallFactory (Lcom/apollographql/apollo/network/http/HttpNetworkTransport$Builder;Lkotlin/jvm/functions/Function0;)Lcom/apollographql/apollo/network/http/HttpNetworkTransport$Builder;
185+
public static final fun okHttpCallFactory (Lcom/apollographql/apollo/network/http/HttpNetworkTransport$Builder;Lokhttp3/Call$Factory;)Lcom/apollographql/apollo/network/http/HttpNetworkTransport$Builder;
186186
public static final fun okHttpClient (Lcom/apollographql/apollo/ApolloClient$Builder;Lokhttp3/OkHttpClient;)Lcom/apollographql/apollo/ApolloClient$Builder;
187187
public static final fun okHttpClient (Lcom/apollographql/apollo/network/http/HttpNetworkTransport$Builder;Lokhttp3/OkHttpClient;)Lcom/apollographql/apollo/network/http/HttpNetworkTransport$Builder;
188188
public static final fun okHttpClient (Lcom/apollographql/apollo/network/ws/WebSocketNetworkTransport$Builder;Lokhttp3/OkHttpClient;)Lcom/apollographql/apollo/network/ws/WebSocketNetworkTransport$Builder;

‎libraries/apollo-runtime/api/jvm/apollo-runtime.api

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public abstract interface class com/apollographql/apollo/network/NetworkTranspor
182182
public final class com/apollographql/apollo/network/OkHttpExtensionsKt {
183183
public static final fun okHttpCallFactory (Lcom/apollographql/apollo/ApolloClient$Builder;Lkotlin/jvm/functions/Function0;)Lcom/apollographql/apollo/ApolloClient$Builder;
184184
public static final fun okHttpCallFactory (Lcom/apollographql/apollo/ApolloClient$Builder;Lokhttp3/Call$Factory;)Lcom/apollographql/apollo/ApolloClient$Builder;
185-
public static final fun okHttpCallFactory (Lcom/apollographql/apollo/network/http/HttpNetworkTransport$Builder;Lkotlin/jvm/functions/Function0;)Lcom/apollographql/apollo/network/http/HttpNetworkTransport$Builder;
185+
public static final fun okHttpCallFactory (Lcom/apollographql/apollo/network/http/HttpNetworkTransport$Builder;Lokhttp3/Call$Factory;)Lcom/apollographql/apollo/network/http/HttpNetworkTransport$Builder;
186186
public static final fun okHttpClient (Lcom/apollographql/apollo/ApolloClient$Builder;Lokhttp3/OkHttpClient;)Lcom/apollographql/apollo/ApolloClient$Builder;
187187
public static final fun okHttpClient (Lcom/apollographql/apollo/network/http/HttpNetworkTransport$Builder;Lokhttp3/OkHttpClient;)Lcom/apollographql/apollo/network/http/HttpNetworkTransport$Builder;
188188
public static final fun okHttpClient (Lcom/apollographql/apollo/network/ws/WebSocketNetworkTransport$Builder;Lokhttp3/OkHttpClient;)Lcom/apollographql/apollo/network/ws/WebSocketNetworkTransport$Builder;

‎libraries/apollo-runtime/src/commonMain/kotlin/com/apollographql/apollo/ApolloClient.kt

+21
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,7 @@ private constructor(
353353

354354
private val _httpInterceptors: MutableList<HttpInterceptor> = mutableListOf()
355355
@Deprecated("HTTP properties should be set on HttpNetworkTransport directly")
356+
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v4_1_1)
356357
val httpInterceptors: List<HttpInterceptor> = _httpInterceptors
357358

358359
private val _listeners: MutableList<ApolloClientListener> = mutableListOf()
@@ -381,27 +382,35 @@ private constructor(
381382
var httpServerUrl: String? = null
382383
private set
383384
@Deprecated("HTTP properties should be set on HttpNetworkTransport directly")
385+
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v4_1_1)
384386
var httpEngine: HttpEngine? = null
385387
private set
386388
@Deprecated("WebSockets properties should be set on WebSocketNetworkTransport directly")
389+
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v4_1_1)
387390
var webSocketServerUrl: String? = null
388391
private set
389392
@Deprecated("WebSockets properties should be set on WebSocketNetworkTransport directly")
393+
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v4_1_1)
390394
var webSocketIdleTimeoutMillis: Long? = null
391395
private set
392396
@Deprecated("WebSockets properties should be set on WebSocketNetworkTransport directly")
397+
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v4_1_1)
393398
var wsProtocolFactory: WsProtocol.Factory? = null
394399
private set
395400
@Deprecated("HTTP properties should be set on HttpNetworkTransport directly")
401+
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v4_1_1)
396402
var httpExposeErrorBody: Boolean? = null
397403
private set
398404
@Deprecated("WebSockets properties should be set on WebSocketNetworkTransport directly")
405+
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v4_1_1)
399406
var webSocketEngine: WebSocketEngine? = null
400407
private set
401408
@Deprecated("WebSockets properties should be set on WebSocketNetworkTransport directly")
409+
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v4_1_1)
402410
var webSocketReopenWhen: (suspend (Throwable, attempt: Long) -> Boolean)? = null
403411
private set
404412
@Deprecated("WebSockets properties should be set on WebSocketNetworkTransport directly")
413+
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v4_1_1)
405414
var webSocketReopenServerUrl: (suspend () -> String)? = null
406415
private set
407416

@@ -594,6 +603,7 @@ private constructor(
594603
"com.apollographql.apollo.network.http.HttpNetworkTransport"
595604
)
596605
)
606+
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v4_1_1)
597607
fun httpServerUrl(httpServerUrl: String?) = apply {
598608
this.httpServerUrl = httpServerUrl
599609
}
@@ -612,6 +622,7 @@ private constructor(
612622
"com.apollographql.apollo.network.http.HttpNetworkTransport"
613623
)
614624
)
625+
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v4_1_1)
615626
fun httpEngine(httpEngine: HttpEngine?) = apply {
616627
this.httpEngine = httpEngine
617628
}
@@ -633,6 +644,7 @@ private constructor(
633644
"com.apollographql.apollo.network.http.HttpNetworkTransport"
634645
)
635646
)
647+
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v4_1_1)
636648
fun httpExposeErrorBody(httpExposeErrorBody: Boolean?) = apply {
637649
this.httpExposeErrorBody = httpExposeErrorBody
638650
}
@@ -651,6 +663,7 @@ private constructor(
651663
"com.apollographql.apollo.network.http.HttpNetworkTransport"
652664
)
653665
)
666+
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v4_1_1)
654667
fun httpInterceptors(httpInterceptors: List<HttpInterceptor>) = apply {
655668
_httpInterceptors.clear()
656669
_httpInterceptors.addAll(httpInterceptors)
@@ -670,6 +683,7 @@ private constructor(
670683
"com.apollographql.apollo.network.http.HttpNetworkTransport"
671684
)
672685
)
686+
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v4_1_1)
673687
fun addHttpInterceptor(httpInterceptor: HttpInterceptor) = apply {
674688
_httpInterceptors += httpInterceptor
675689
}
@@ -680,6 +694,7 @@ private constructor(
680694
@Deprecated(
681695
"Use networkTransport() instead",
682696
)
697+
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v4_1_1)
683698
fun removeHttpInterceptor(httpInterceptor: HttpInterceptor) = apply {
684699
_httpInterceptors -= httpInterceptor
685700
}
@@ -699,6 +714,7 @@ private constructor(
699714
"com.apollographql.apollo.network.ws.WebSocketNetworkTransport"
700715
)
701716
)
717+
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v4_1_1)
702718
fun webSocketServerUrl(webSocketServerUrl: String?) = apply {
703719
this.webSocketServerUrl = webSocketServerUrl
704720
}
@@ -724,6 +740,7 @@ private constructor(
724740
"com.apollographql.apollo.network.ws.WebSocketNetworkTransport"
725741
)
726742
)
743+
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v4_1_1)
727744
fun webSocketServerUrl(webSocketServerUrl: (suspend () -> String)?) = apply {
728745
this.webSocketReopenServerUrl = webSocketServerUrl
729746
}
@@ -744,6 +761,7 @@ private constructor(
744761
"com.apollographql.apollo.network.ws.WebSocketNetworkTransport"
745762
)
746763
)
764+
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v4_1_1)
747765
fun webSocketIdleTimeoutMillis(webSocketIdleTimeoutMillis: Long?) = apply {
748766
this.webSocketIdleTimeoutMillis = webSocketIdleTimeoutMillis
749767
}
@@ -762,6 +780,7 @@ private constructor(
762780
"com.apollographql.apollo.network.ws.WebSocketNetworkTransport"
763781
)
764782
)
783+
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v4_1_1)
765784
fun wsProtocol(wsProtocolFactory: WsProtocol.Factory?) = apply {
766785
this.wsProtocolFactory = wsProtocolFactory
767786
}
@@ -780,6 +799,7 @@ private constructor(
780799
"com.apollographql.apollo.network.ws.WebSocketNetworkTransport"
781800
)
782801
)
802+
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v4_1_1)
783803
fun webSocketEngine(webSocketEngine: WebSocketEngine?) = apply {
784804
this.webSocketEngine = webSocketEngine
785805
}
@@ -805,6 +825,7 @@ private constructor(
805825
"com.apollographql.apollo.network.ws.WebSocketNetworkTransport"
806826
)
807827
)
828+
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v4_1_1)
808829
fun webSocketReopenWhen(webSocketReopenWhen: (suspend (Throwable, attempt: Long) -> Boolean)?) = apply {
809830
this.webSocketReopenWhen = webSocketReopenWhen
810831
}

‎libraries/apollo-runtime/src/jvmCommonMain/kotlin/com/apollographql/apollo/network/OkHttpExtensions.kt

+7-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
package com.apollographql.apollo.network
44

55
import com.apollographql.apollo.ApolloClient
6+
import com.apollographql.apollo.annotations.ApolloDeprecatedSince
67
import com.apollographql.apollo.api.http.HttpHeader
78
import com.apollographql.apollo.network.http.DefaultHttpEngine
89
import com.apollographql.apollo.network.http.HttpNetworkTransport
@@ -11,7 +12,6 @@ import com.apollographql.apollo.network.ws.WebSocketNetworkTransport
1112
import okhttp3.Call
1213
import okhttp3.Headers
1314
import okhttp3.OkHttpClient
14-
import okhttp3.WebSocket
1515

1616
/**
1717
* Configures the [ApolloClient] to use the [OkHttpClient] for network requests.
@@ -30,6 +30,7 @@ import okhttp3.WebSocket
3030
"com.apollographql.apollo.network.ws.WebSocketNetworkTransport"
3131
)
3232
)
33+
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v4_1_1)
3334
fun ApolloClient.Builder.okHttpClient(okHttpClient: OkHttpClient) = apply {
3435
httpEngine(DefaultHttpEngine(okHttpClient))
3536
webSocketEngine(DefaultWebSocketEngine(okHttpClient))
@@ -46,6 +47,7 @@ fun ApolloClient.Builder.okHttpClient(okHttpClient: OkHttpClient) = apply {
4647
"com.apollographql.apollo.network.http.DefaultHttpEngine",
4748
)
4849
)
50+
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v4_1_1)
4951
fun ApolloClient.Builder.okHttpCallFactory(callFactory: Call.Factory) = apply {
5052
httpEngine(DefaultHttpEngine(callFactory))
5153
}
@@ -61,6 +63,7 @@ fun ApolloClient.Builder.okHttpCallFactory(callFactory: Call.Factory) = apply {
6163
"com.apollographql.apollo.network.http.DefaultHttpEngine",
6264
)
6365
)
66+
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v4_1_1)
6467
fun ApolloClient.Builder.okHttpCallFactory(callFactory: () -> Call.Factory) = apply {
6568
httpEngine(DefaultHttpEngine(callFactory))
6669
}
@@ -79,6 +82,7 @@ fun HttpNetworkTransport.Builder.okHttpClient(okHttpClient: OkHttpClient) = appl
7982
* This is the same function as [okHttpCallFactory]
8083
*/
8184
@Deprecated("Use webSocketEngine instead.", ReplaceWith("webSocketEngine(DefaultWebSocketEngine(okHttpClient))"))
85+
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v4_1_1)
8286
fun WebSocketNetworkTransport.Builder.okHttpClient(okHttpClient: OkHttpClient) = apply {
8387
webSocketEngine(DefaultWebSocketEngine(okHttpClient))
8488
}
@@ -87,7 +91,8 @@ fun WebSocketNetworkTransport.Builder.okHttpClient(okHttpClient: OkHttpClient) =
8791
* Configures the [Call.Factory] to use for HTTP requests.
8892
*/
8993
@Deprecated("Use httpEngine instead.", ReplaceWith("httpEngine(DefaultHttpEngine(callFactory))"))
90-
fun HttpNetworkTransport.Builder.okHttpCallFactory(callFactory: () -> Call.Factory) = apply {
94+
@ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v4_1_1)
95+
fun HttpNetworkTransport.Builder.okHttpCallFactory(callFactory: Call.Factory) = apply {
9196
httpEngine(DefaultHttpEngine(callFactory))
9297
}
9398

0 commit comments

Comments
 (0)