use incubating network transport

martinbonnin · Mar 11, 2024 · bd3379c · bd3379c
1 parent 095c5ce
commit bd3379c
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 11 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,6 +2,6 @@
 plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.jetbrains.kotlin.android) apply false
-    id("com.apollographql.apollo3").version("3.8.2").apply(false)
+    id("com.apollographql.apollo3").version("4.0.0-beta.5-SNAPSHOT").apply(false)
     id("co.touchlab.skie").version("0.6.1").apply(false)
 }
diff --git a/ios-app/SubscriptionTest.xcodeproj/project.pbxproj b/ios-app/SubscriptionTest.xcodeproj/project.pbxproj
@@ -353,7 +353,8 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
+				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
 				GCC_C_LANGUAGE_STANDARD = gnu17;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -416,7 +417,8 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
+				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
 				GCC_C_LANGUAGE_STANDARD = gnu17;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -443,8 +445,10 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"SubscriptionTest/Preview Content\"";
+				DEVELOPMENT_TEAM = F9RAPYL9T3;
 				ENABLE_PREVIEWS = YES;
-				FRAMEWORK_SEARCH_PATHS = "../shared/build/xcode-frameworks/Debug/iphonesimulator17.2/";
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
+				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -472,8 +476,10 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"SubscriptionTest/Preview Content\"";
+				DEVELOPMENT_TEAM = F9RAPYL9T3;
 				ENABLE_PREVIEWS = YES;
-				FRAMEWORK_SEARCH_PATHS = "../shared/build/xcode-frameworks/Debug/iphonesimulator17.2/";
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
+				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -537,6 +543,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
+				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = net.mbonnin.subscriptiontest.SubscriptionTestUITests;
@@ -554,6 +561,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
+				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = net.mbonnin.subscriptiontest.SubscriptionTestUITests;

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -9,6 +9,7 @@ pluginManagement {
         }
         mavenCentral()
         gradlePluginPortal()
+        maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
     }
 }
 dependencyResolutionManagement {
@@ -17,6 +18,7 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
+        maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
     }
 }
 

diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -26,5 +26,6 @@ kotlin {
 
     sourceSets.getByName("commonMain").dependencies {
         api("com.apollographql.apollo3:apollo-runtime")
+        api("com.apollographql.apollo3:apollo-websocket-network-transport-incubating")
     }
 }
diff --git a/shared/src/commonMain/kotlin/subscriptiontest/Apollo.kt b/shared/src/commonMain/kotlin/subscriptiontest/Apollo.kt
@@ -1,23 +1,25 @@
 package subscriptiontest
 
 import com.apollographql.apollo3.ApolloClient
+import com.apollographql.apollo3.annotations.ApolloExperimental
 import com.apollographql.apollo3.api.ApolloResponse
-import com.apollographql.apollo3.network.ws.WebSocketNetworkTransport
+import com.apollographql.apollo3.api.Subscription
+import com.apollographql.apollo3.network.ws.incubating.SubscriptionWsProtocol
+import com.apollographql.apollo3.network.ws.incubating.WebSocketNetworkTransport
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.onEach
 import subscription.test.GetTimeSubscription
 
+@OptIn(ApolloExperimental::class)
 fun currentTime(): Flow<ApolloResponse<GetTimeSubscription.Data>> {
     return ApolloClient.Builder()
         .serverUrl("https://leonidas-naiwjdzjsq-od.a.run.app/graphql")
+        .retryOnError { it.operation is Subscription<*> }
         .subscriptionNetworkTransport(
             WebSocketNetworkTransport.Builder()
+                .wsProtocol(SubscriptionWsProtocol { null })
                 .serverUrl("https://leonidas-naiwjdzjsq-od.a.run.app/subscription")
-                .reopenWhen { throwable, attempt ->
-                    println("Reopening...")
-                    delay(2000)
-                    true
-                }
                 .build()
         )
         .build()