Skip to content

Commit 496cc9c

Browse files
authored
Remove ApolloIdlingResource (#6492)
1 parent 3da23e9 commit 496cc9c

File tree

19 files changed

+7
-289
lines changed

19 files changed

+7
-289
lines changed

design-docs/Threading.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,3 @@ nothing so a coroutine is way more efficient there.
4141
## Current state
4242

4343
The dispatcher is changed very early in the chain. On the JVM, everything runs synchronously from that dispatcher.
44-
45-
The only thing happening before the dispatcher change is notification of the ApolloIdlingResources that need to happen from the same call stack. ApolloIdlingResource is deprecated and that should be removed when ApolloIdlingResource goes away.

docs/source/essentials/modules.mdx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,6 @@ This module is deprecated and moved to the Apollo Galaxy. See the [Apollo Galaxy
127127

128128
This module is deprecated and moved to the Apollo Galaxy. See the [Apollo Galaxy page](https://www.apollographql.com/docs/kotlin/advanced/galaxy) for more details.
129129

130-
### apollo-idling-resource (DEPRECATED)
131-
132-
`apollo-idling-resource` contains an [Espresso `IdlingResource`](https://developer.android.com/training/testing/espresso/idling-resource) that monitors calls to your GraphQL API.
133-
134-
This module is deprecated as we recommend you should wait for your UI to change instead. See [this article about ways to do so](https://medium.com/androiddevelopers/alternatives-to-idling-resources-in-compose-tests-8ae71f9fc473).
135-
136130
### apollo-mockserver (DEPRECATED)
137131

138132
`apollo-mockserver` is a HTTP server for your tests. It supports multiplatform and websockets.

gradle/libraries.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ androidx-test-uiautomator = "androidx.test.uiautomator:uiautomator:2.2.0"
5252
androidx-activity = "androidx.activity:activity-ktx:1.7.2"
5353
androidx-annotation = { group = "androidx.annotation", name = "annotation", version = "1.7.1" }
5454
androidx-core = "androidx.core:core-ktx:1.12.0"
55-
androidx-espresso-idlingresource = { group = "androidx.test.espresso", name = "espresso-idling-resource", version = "3.5.1" }
5655
androidx-lint-rules = "androidx.lint:lint-gradle:1.0.0-alpha01"
5756
androidx-lint-gradle-plugin = { module = "com.android.lint:com.android.lint.gradle.plugin", version.ref = "android-plugin" }
5857
androidx-profileinstaller = "androidx.profileinstaller:profileinstaller:1.3.1"
@@ -62,7 +61,6 @@ androidx-startup-runtime = { group = "androidx.startup", name = "startup-runtime
6261
apollo-api = { group = "com.apollographql.apollo", name = "apollo-api", version.ref = "apollo" }
6362
apollo-api-java = { group = "com.apollographql.apollo", name = "apollo-api-java", version.ref = "apollo" }
6463
apollo-httpCache = { group = "com.apollographql.apollo", name = "apollo-http-cache", version.ref = "apollo" }
65-
apollo-idlingresource = { group = "com.apollographql.apollo", name = "apollo-idling-resource", version.ref = "apollo" }
6664
apollo-mockserver = { group = "com.apollographql.mockserver", name = "apollo-mockserver", version = "0.1.0" }
6765
apollo-mpputils = { group = "com.apollographql.apollo", name = "apollo-mpp-utils", version.ref = "apollo" }
6866
apollo-normalizedcache = { group = "com.apollographql.apollo", name = "apollo-normalized-cache", version.ref = "apollo" }

libraries/apollo-idling-resource/README.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

libraries/apollo-idling-resource/api/apollo-idling-resource.api

Lines changed: 0 additions & 13 deletions
This file was deleted.

libraries/apollo-idling-resource/build.gradle.kts

Lines changed: 0 additions & 14 deletions
This file was deleted.

libraries/apollo-idling-resource/gradle.properties

Lines changed: 0 additions & 3 deletions
This file was deleted.

libraries/apollo-idling-resource/src/main/AndroidManifest.xml

Lines changed: 0 additions & 5 deletions
This file was deleted.

libraries/apollo-idling-resource/src/main/java/com/apollographql/apollo/android/ApolloIdlingResource.kt

Lines changed: 0 additions & 73 deletions
This file was deleted.

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ public final class com/apollographql/apollo/ApolloClient$Builder : com/apollogra
7575
public final fun addHttpInterceptor (Lcom/apollographql/apollo/network/http/HttpInterceptor;)Lcom/apollographql/apollo/ApolloClient$Builder;
7676
public final fun addInterceptor (Lcom/apollographql/apollo/interceptor/ApolloInterceptor;)Lcom/apollographql/apollo/ApolloClient$Builder;
7777
public final fun addInterceptors (Ljava/util/List;)Lcom/apollographql/apollo/ApolloClient$Builder;
78-
public final fun addListener (Lcom/apollographql/apollo/internal/ApolloClientListener;)Lcom/apollographql/apollo/ApolloClient$Builder;
7978
public final fun autoPersistedQueries ()Lcom/apollographql/apollo/ApolloClient$Builder;
8079
public final fun autoPersistedQueries (Lcom/apollographql/apollo/api/http/HttpMethod;)Lcom/apollographql/apollo/ApolloClient$Builder;
8180
public final fun autoPersistedQueries (Lcom/apollographql/apollo/api/http/HttpMethod;Lcom/apollographql/apollo/api/http/HttpMethod;)Lcom/apollographql/apollo/ApolloClient$Builder;
@@ -137,7 +136,6 @@ public final class com/apollographql/apollo/ApolloClient$Builder : com/apollogra
137136
public fun ignoreUnknownKeys (Ljava/lang/Boolean;)Lcom/apollographql/apollo/ApolloClient$Builder;
138137
public synthetic fun ignoreUnknownKeys (Ljava/lang/Boolean;)Ljava/lang/Object;
139138
public final fun interceptors (Ljava/util/List;)Lcom/apollographql/apollo/ApolloClient$Builder;
140-
public final fun listeners (Ljava/util/List;)Lcom/apollographql/apollo/ApolloClient$Builder;
141139
public final fun networkTransport (Lcom/apollographql/apollo/network/NetworkTransport;)Lcom/apollographql/apollo/ApolloClient$Builder;
142140
public final fun removeHttpInterceptor (Lcom/apollographql/apollo/network/http/HttpInterceptor;)Lcom/apollographql/apollo/ApolloClient$Builder;
143141
public final fun removeInterceptor (Lcom/apollographql/apollo/interceptor/ApolloInterceptor;)Lcom/apollographql/apollo/ApolloClient$Builder;
@@ -224,11 +222,6 @@ public final class com/apollographql/apollo/interceptor/RetryOnErrorInterceptorK
224222
public static final fun RetryOnErrorInterceptor (Lcom/apollographql/apollo/network/NetworkMonitor;)Lcom/apollographql/apollo/interceptor/ApolloInterceptor;
225223
}
226224

227-
public abstract interface class com/apollographql/apollo/internal/ApolloClientListener {
228-
public abstract fun requestCompleted (Lcom/apollographql/apollo/api/ApolloRequest;)V
229-
public abstract fun requestStarted (Lcom/apollographql/apollo/api/ApolloRequest;)V
230-
}
231-
232225
public final class com/apollographql/apollo/internal/DeferredJsonMerger {
233226
public fun <init> ()V
234227
public final fun getHasNext ()Z

libraries/apollo-runtime/api/apollo-runtime.klib.api

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ abstract interface com.apollographql.apollo.interceptor/ApolloInterceptorChain {
3333
abstract fun <#A1: com.apollographql.apollo.api/Operation.Data> proceed(com.apollographql.apollo.api/ApolloRequest<#A1>): kotlinx.coroutines.flow/Flow<com.apollographql.apollo.api/ApolloResponse<#A1>> // com.apollographql.apollo.interceptor/ApolloInterceptorChain.proceed|proceed(com.apollographql.apollo.api.ApolloRequest<0:0>){0§<com.apollographql.apollo.api.Operation.Data>}[0]
3434
}
3535

36-
abstract interface com.apollographql.apollo.internal/ApolloClientListener { // com.apollographql.apollo.internal/ApolloClientListener|null[0]
37-
abstract fun requestCompleted(com.apollographql.apollo.api/ApolloRequest<*>) // com.apollographql.apollo.internal/ApolloClientListener.requestCompleted|requestCompleted(com.apollographql.apollo.api.ApolloRequest<*>){}[0]
38-
abstract fun requestStarted(com.apollographql.apollo.api/ApolloRequest<*>) // com.apollographql.apollo.internal/ApolloClientListener.requestStarted|requestStarted(com.apollographql.apollo.api.ApolloRequest<*>){}[0]
39-
}
40-
4136
abstract interface com.apollographql.apollo.network.http/HttpEngine : okio/Closeable { // com.apollographql.apollo.network.http/HttpEngine|null[0]
4237
abstract suspend fun execute(com.apollographql.apollo.api.http/HttpRequest): com.apollographql.apollo.api.http/HttpResponse // com.apollographql.apollo.network.http/HttpEngine.execute|execute(com.apollographql.apollo.api.http.HttpRequest){}[0]
4338
open fun close() // com.apollographql.apollo.network.http/HttpEngine.close|close(){}[0]
@@ -690,7 +685,6 @@ final class com.apollographql.apollo/ApolloClient : com.apollographql.apollo.api
690685
final fun addHttpInterceptor(com.apollographql.apollo.network.http/HttpInterceptor): com.apollographql.apollo/ApolloClient.Builder // com.apollographql.apollo/ApolloClient.Builder.addHttpInterceptor|addHttpInterceptor(com.apollographql.apollo.network.http.HttpInterceptor){}[0]
691686
final fun addInterceptor(com.apollographql.apollo.interceptor/ApolloInterceptor): com.apollographql.apollo/ApolloClient.Builder // com.apollographql.apollo/ApolloClient.Builder.addInterceptor|addInterceptor(com.apollographql.apollo.interceptor.ApolloInterceptor){}[0]
692687
final fun addInterceptors(kotlin.collections/List<com.apollographql.apollo.interceptor/ApolloInterceptor>): com.apollographql.apollo/ApolloClient.Builder // com.apollographql.apollo/ApolloClient.Builder.addInterceptors|addInterceptors(kotlin.collections.List<com.apollographql.apollo.interceptor.ApolloInterceptor>){}[0]
693-
final fun addListener(com.apollographql.apollo.internal/ApolloClientListener): com.apollographql.apollo/ApolloClient.Builder // com.apollographql.apollo/ApolloClient.Builder.addListener|addListener(com.apollographql.apollo.internal.ApolloClientListener){}[0]
694688
final fun autoPersistedQueries(com.apollographql.apollo.api.http/HttpMethod = ..., com.apollographql.apollo.api.http/HttpMethod = ..., kotlin/Boolean = ...): com.apollographql.apollo/ApolloClient.Builder // com.apollographql.apollo/ApolloClient.Builder.autoPersistedQueries|autoPersistedQueries(com.apollographql.apollo.api.http.HttpMethod;com.apollographql.apollo.api.http.HttpMethod;kotlin.Boolean){}[0]
695689
final fun autoPersistedQueriesInterceptor(com.apollographql.apollo.interceptor/ApolloInterceptor?): com.apollographql.apollo/ApolloClient.Builder // com.apollographql.apollo/ApolloClient.Builder.autoPersistedQueriesInterceptor|autoPersistedQueriesInterceptor(com.apollographql.apollo.interceptor.ApolloInterceptor?){}[0]
696690
final fun build(): com.apollographql.apollo/ApolloClient // com.apollographql.apollo/ApolloClient.Builder.build|build(){}[0]
@@ -711,7 +705,6 @@ final class com.apollographql.apollo/ApolloClient : com.apollographql.apollo.api
711705
final fun httpServerUrl(kotlin/String?): com.apollographql.apollo/ApolloClient.Builder // com.apollographql.apollo/ApolloClient.Builder.httpServerUrl|httpServerUrl(kotlin.String?){}[0]
712706
final fun ignoreUnknownKeys(kotlin/Boolean?): com.apollographql.apollo/ApolloClient.Builder // com.apollographql.apollo/ApolloClient.Builder.ignoreUnknownKeys|ignoreUnknownKeys(kotlin.Boolean?){}[0]
713707
final fun interceptors(kotlin.collections/List<com.apollographql.apollo.interceptor/ApolloInterceptor>): com.apollographql.apollo/ApolloClient.Builder // com.apollographql.apollo/ApolloClient.Builder.interceptors|interceptors(kotlin.collections.List<com.apollographql.apollo.interceptor.ApolloInterceptor>){}[0]
714-
final fun listeners(kotlin.collections/List<com.apollographql.apollo.internal/ApolloClientListener>): com.apollographql.apollo/ApolloClient.Builder // com.apollographql.apollo/ApolloClient.Builder.listeners|listeners(kotlin.collections.List<com.apollographql.apollo.internal.ApolloClientListener>){}[0]
715708
final fun networkTransport(com.apollographql.apollo.network/NetworkTransport?): com.apollographql.apollo/ApolloClient.Builder // com.apollographql.apollo/ApolloClient.Builder.networkTransport|networkTransport(com.apollographql.apollo.network.NetworkTransport?){}[0]
716709
final fun removeHttpInterceptor(com.apollographql.apollo.network.http/HttpInterceptor): com.apollographql.apollo/ApolloClient.Builder // com.apollographql.apollo/ApolloClient.Builder.removeHttpInterceptor|removeHttpInterceptor(com.apollographql.apollo.network.http.HttpInterceptor){}[0]
717710
final fun removeInterceptor(com.apollographql.apollo.interceptor/ApolloInterceptor): com.apollographql.apollo/ApolloClient.Builder // com.apollographql.apollo/ApolloClient.Builder.removeInterceptor|removeInterceptor(com.apollographql.apollo.interceptor.ApolloInterceptor){}[0]

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ public final class com/apollographql/apollo/ApolloClient$Builder : com/apollogra
7575
public final fun addHttpInterceptor (Lcom/apollographql/apollo/network/http/HttpInterceptor;)Lcom/apollographql/apollo/ApolloClient$Builder;
7676
public final fun addInterceptor (Lcom/apollographql/apollo/interceptor/ApolloInterceptor;)Lcom/apollographql/apollo/ApolloClient$Builder;
7777
public final fun addInterceptors (Ljava/util/List;)Lcom/apollographql/apollo/ApolloClient$Builder;
78-
public final fun addListener (Lcom/apollographql/apollo/internal/ApolloClientListener;)Lcom/apollographql/apollo/ApolloClient$Builder;
7978
public final fun autoPersistedQueries ()Lcom/apollographql/apollo/ApolloClient$Builder;
8079
public final fun autoPersistedQueries (Lcom/apollographql/apollo/api/http/HttpMethod;)Lcom/apollographql/apollo/ApolloClient$Builder;
8180
public final fun autoPersistedQueries (Lcom/apollographql/apollo/api/http/HttpMethod;Lcom/apollographql/apollo/api/http/HttpMethod;)Lcom/apollographql/apollo/ApolloClient$Builder;
@@ -137,7 +136,6 @@ public final class com/apollographql/apollo/ApolloClient$Builder : com/apollogra
137136
public fun ignoreUnknownKeys (Ljava/lang/Boolean;)Lcom/apollographql/apollo/ApolloClient$Builder;
138137
public synthetic fun ignoreUnknownKeys (Ljava/lang/Boolean;)Ljava/lang/Object;
139138
public final fun interceptors (Ljava/util/List;)Lcom/apollographql/apollo/ApolloClient$Builder;
140-
public final fun listeners (Ljava/util/List;)Lcom/apollographql/apollo/ApolloClient$Builder;
141139
public final fun networkTransport (Lcom/apollographql/apollo/network/NetworkTransport;)Lcom/apollographql/apollo/ApolloClient$Builder;
142140
public final fun removeHttpInterceptor (Lcom/apollographql/apollo/network/http/HttpInterceptor;)Lcom/apollographql/apollo/ApolloClient$Builder;
143141
public final fun removeInterceptor (Lcom/apollographql/apollo/interceptor/ApolloInterceptor;)Lcom/apollographql/apollo/ApolloClient$Builder;
@@ -224,11 +222,6 @@ public final class com/apollographql/apollo/interceptor/RetryOnErrorInterceptorK
224222
public static final fun RetryOnErrorInterceptor (Lcom/apollographql/apollo/network/NetworkMonitor;)Lcom/apollographql/apollo/interceptor/ApolloInterceptor;
225223
}
226224

227-
public abstract interface class com/apollographql/apollo/internal/ApolloClientListener {
228-
public abstract fun requestCompleted (Lcom/apollographql/apollo/api/ApolloRequest;)V
229-
public abstract fun requestStarted (Lcom/apollographql/apollo/api/ApolloRequest;)V
230-
}
231-
232225
public final class com/apollographql/apollo/internal/DeferredJsonMerger {
233226
public fun <init> ()V
234227
public final fun getHasNext ()Z

0 commit comments

Comments
 (0)