change _spi to _implementationOnly

aws-amplify · Mar 28, 2024 · 559147e · 559147e
1 parent 6c99824
commit 559147e
Show file tree

Hide file tree

Showing 26 changed files with 20 additions and 26 deletions.
diff --git a/AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncRealTimeClient.swift b/AmplifyPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncRealTimeClient.swift
@@ -9,7 +9,7 @@
 import Foundation
 import Combine
 import Amplify
-@_spi(WebSocket) import AmplifyNetwork
+@_implementationOnly import AmplifyNetwork
 
 protocol AppSyncRealTimeClientProtocol {
     func connect() async throws

diff --git a/...yPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncRealTimeSubscription.swift b/...yPlugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncRealTimeSubscription.swift
@@ -9,7 +9,7 @@
 import Foundation
 import Combine
 import Amplify
-@_spi(WebSocket) import AmplifyNetwork
+@_implementationOnly import AmplifyNetwork
 
 /**
  AppSyncRealTimeSubscription reprensents one realtime subscription to AppSync realtime server.

diff --git a/...ugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncWebSocketClientProtocol.swift b/...ugins/API/Sources/AWSAPIPlugin/AppSyncRealTimeClient/AppSyncWebSocketClientProtocol.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import Combine
-@_spi(WebSocket) import AmplifyNetwork
+@_implementationOnly import AmplifyNetwork
 
 protocol AppSyncWebSocketClientProtocol: AnyObject {
     var isConnected: Bool { get async }

diff --git a/.../API/Sources/AWSAPIPlugin/Interceptor/SubscriptionInterceptor/APIKeyAuthInterceptor.swift b/.../API/Sources/AWSAPIPlugin/Interceptor/SubscriptionInterceptor/APIKeyAuthInterceptor.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import Amplify
-@_spi(WebSocket) @_spi(AppSyncRTC) import AmplifyNetwork
+@_implementationOnly import AmplifyNetwork
 
 class APIKeyAuthInterceptor {
     private let apiKey: String

diff --git a/...s/API/Sources/AWSAPIPlugin/Interceptor/SubscriptionInterceptor/AuthTokenInterceptor.swift b/...s/API/Sources/AWSAPIPlugin/Interceptor/SubscriptionInterceptor/AuthTokenInterceptor.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 import Amplify
-@_spi(WebSocket) @_spi(AppSyncRTC) import AmplifyNetwork
+@_implementationOnly import AmplifyNetwork
 
 /// General purpose authenticatication subscriptions interceptor for providers whose only
 /// requirement is to provide an authentication token via the "Authorization" header

diff --git a/...ins/API/Sources/AWSAPIPlugin/Interceptor/SubscriptionInterceptor/IAMAuthInterceptor.swift b/...ins/API/Sources/AWSAPIPlugin/Interceptor/SubscriptionInterceptor/IAMAuthInterceptor.swift
@@ -10,7 +10,7 @@ import Amplify
 import AWSClientRuntime
 import ClientRuntime
 import AWSPluginsCore
-@_spi(WebSocket) @_spi(AppSyncRTC) import AmplifyNetwork
+@_implementationOnly import AmplifyNetwork
 
 class IAMAuthInterceptor {
 

diff --git a/AmplifyPlugins/API/Sources/AWSAPIPlugin/Operation/AWSGraphQLSubscriptionTaskRunner.swift b/AmplifyPlugins/API/Sources/AWSAPIPlugin/Operation/AWSGraphQLSubscriptionTaskRunner.swift
@@ -9,7 +9,7 @@ import Amplify
 import Foundation
 import AWSPluginsCore
 import Combine
-@_spi(AppSyncRTC) import AmplifyNetwork
+@_implementationOnly import AmplifyNetwork
 
 public class AWSGraphQLSubscriptionTaskRunner<R: Decodable>: InternalTaskRunner, InternalTaskAsyncThrowingSequence, InternalTaskThrowingChannel {
     public typealias Request = GraphQLOperationRequest<R>

diff --git a/...fyPlugins/API/Sources/AWSAPIPlugin/SubscriptionFactory/AppSyncRealTimeClientFactory.swift b/...fyPlugins/API/Sources/AWSAPIPlugin/SubscriptionFactory/AppSyncRealTimeClientFactory.swift
@@ -10,7 +10,7 @@ import Foundation
 import Amplify
 import Combine
 import AWSPluginsCore
-@_spi(WebSocket) @_spi(AppSyncRTC) import AmplifyNetwork
+@_implementationOnly import AmplifyNetwork
 
 
 protocol AppSyncRealTimeClientFactoryProtocol {

diff --git a/...Plugins/API/Tests/APIHostApp/AWSAPIPluginFunctionalTests/AppSyncRealTimeClientTests.swift b/...Plugins/API/Tests/APIHostApp/AWSAPIPluginFunctionalTests/AppSyncRealTimeClientTests.swift
@@ -11,7 +11,7 @@ import Combine
 @testable import Amplify
 @testable import AWSAPIPlugin
 @testable import AWSPluginsCore
-@testable @_spi(WebSocket) import AmplifyNetwork
+@testable @_implementationOnly import AmplifyNetwork
 
 class AppSyncRealTimeClientTests: XCTestCase {
     let subscriptionRequest = """

diff --git a/...lugins/API/Tests/AWSAPIPluginTests/AppSyncRealTimeClient/AppSyncRealTimeClientTests.swift b/...lugins/API/Tests/AWSAPIPluginTests/AppSyncRealTimeClient/AppSyncRealTimeClientTests.swift
@@ -10,7 +10,7 @@ import XCTest
 import Combine
 import Amplify
 @testable import AWSAPIPlugin
-@_spi(WebSocket) import AmplifyNetwork
+@_implementationOnly import AmplifyNetwork
 
 class AppSyncRealTimeClientTests: XCTestCase {
 

diff --git a/...ts/AWSAPIPluginTests/Interceptor/SubscriptionInterceptor/APIKeyAuthInterceptorTests.swift b/...ts/AWSAPIPluginTests/Interceptor/SubscriptionInterceptor/APIKeyAuthInterceptorTests.swift
@@ -9,7 +9,7 @@
 import XCTest
 import Amplify
 @testable import AWSAPIPlugin
-@testable @_spi(AppSyncRTC) import AmplifyNetwork
+@testable @_implementationOnly import AmplifyNetwork
 
 class APIKeyAuthInterceptorTests: XCTestCase {
 

diff --git a/...s/AWSAPIPluginTests/Interceptor/SubscriptionInterceptor/CognitoAuthInterceptorTests.swift b/...s/AWSAPIPluginTests/Interceptor/SubscriptionInterceptor/CognitoAuthInterceptorTests.swift
@@ -10,7 +10,7 @@ import XCTest
 import Amplify
 @testable import AWSAPIPlugin
 @testable import AWSPluginsCore
-@testable @_spi(WebSocket) @_spi(AppSyncRTC) import AmplifyNetwork
+@testable @_implementationOnly import AmplifyNetwork
 
 class CognitoAuthInterceptorTests: XCTestCase {
 

diff --git a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Mocks/MockSubscription.swift b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Mocks/MockSubscription.swift
@@ -11,7 +11,7 @@ import Amplify
 import Combine
 @testable import AWSAPIPlugin
 @testable import AWSPluginsCore
-@testable @_spi(WebSocket) @_spi(AppSyncRTC) import AmplifyNetwork
+@testable @_implementationOnly import AmplifyNetwork
 
 struct MockSubscriptionConnectionFactory: AppSyncRealTimeClientFactoryProtocol {
 

diff --git a/...ns/API/Tests/AWSAPIPluginTests/Operation/AWSGraphQLSubscriptionOperationCancelTests.swift b/...ns/API/Tests/AWSAPIPluginTests/Operation/AWSGraphQLSubscriptionOperationCancelTests.swift
@@ -10,7 +10,7 @@ import XCTest
 @testable import Amplify
 @testable import AWSAPIPlugin
 @testable import AmplifyTestCommon
-@testable @_spi(WebSocket) import AWSPluginsCore
+@testable import AWSPluginsCore
 @testable import AWSPluginsTestCommon
 
 // swiftlint:disable:next type_name

diff --git a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/GraphQLSubscribeCombineTests.swift b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/GraphQLSubscribeCombineTests.swift
@@ -11,7 +11,7 @@ import XCTest
 import Amplify
 @testable import AmplifyTestCommon
 @testable import AWSAPIPlugin
-@testable @_spi(AppSyncRTC) import AmplifyNetwork
+@testable @_implementationOnly import AmplifyNetwork
 @_implementationOnly import AmplifyAsyncTesting
 
 class GraphQLSubscribeCombineTests: OperationTestBase {

diff --git a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/GraphQLSubscribeTaskTests.swift b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/GraphQLSubscribeTaskTests.swift
@@ -11,7 +11,7 @@ import XCTest
 import Amplify
 @testable import AmplifyTestCommon
 @testable import AWSAPIPlugin
-@testable @_spi(AppSyncRTC) import AmplifyNetwork
+@testable @_implementationOnly import AmplifyNetwork
 @_implementationOnly import AmplifyAsyncTesting
 
 class GraphQLSubscribeTasksTests: OperationTestBase {

diff --git a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/GraphQLSubscribeTests.swift b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/GraphQLSubscribeTests.swift
@@ -9,7 +9,7 @@ import XCTest
 @testable import Amplify
 @testable import AmplifyTestCommon
 @testable import AWSAPIPlugin
-@testable @_spi(AppSyncRTC) import AmplifyNetwork
+@testable @_implementationOnly import AmplifyNetwork
 
 class GraphQLSubscribeTests: OperationTestBase {
 

diff --git a/...tApp/AWSDataStorePluginIntegrationTests/DataStoreLargeNumberModelsSubscriptionTests.swift b/...tApp/AWSDataStorePluginIntegrationTests/DataStoreLargeNumberModelsSubscriptionTests.swift
@@ -10,7 +10,7 @@ import XCTest
 import Combine
 import Amplify
 @testable import AWSAPIPlugin
-@_spi(AppSyncRTC) import AmplifyNetwork
+@_implementationOnly import AmplifyNetwork
 
 class DataStoreLargeNumberModelsSubscriptionTests: SyncEngineIntegrationTestBase {
 

diff --git a/AmplifyPlugins/Internal/Sources/Network/WebSocket/AmplifyNetworkMonitor.swift b/AmplifyPlugins/Internal/Sources/Network/WebSocket/AmplifyNetworkMonitor.swift
@@ -9,7 +9,6 @@
 import Network
 import Combine
 
-@_spi(WebSocket)
 public final class AmplifyNetworkMonitor {
 
     public enum State {

diff --git a/AmplifyPlugins/Internal/Sources/Network/WebSocket/RetryWithJitter.swift b/AmplifyPlugins/Internal/Sources/Network/WebSocket/RetryWithJitter.swift
@@ -8,7 +8,6 @@
 
 import Foundation
 
-@_spi(WebSocket)
 public actor RetryWithJitter {
     public enum Error: Swift.Error {
         case maxRetryExceeded([Swift.Error])

diff --git a/AmplifyPlugins/Internal/Sources/Network/WebSocket/WebSocketClient.swift b/AmplifyPlugins/Internal/Sources/Network/WebSocket/WebSocketClient.swift
@@ -14,7 +14,6 @@ import Combine
  WebSocketClient wraps URLSessionWebSocketTask and offers
  an abstraction of the data stream in the form of WebSocketEvent.
  */
-@_spi(WebSocket)
 public final actor WebSocketClient: NSObject {
     public enum Error: Swift.Error {
         case connectionLost

diff --git a/AmplifyPlugins/Internal/Sources/Network/WebSocket/WebSocketEvent.swift b/AmplifyPlugins/Internal/Sources/Network/WebSocket/WebSocketEvent.swift
@@ -8,7 +8,6 @@
 
 import Foundation
 
-@_spi(WebSocket)
 public enum WebSocketEvent {
     case connected
     case disconnected(URLSessionWebSocketTask.CloseCode, String?)

diff --git a/AmplifyPlugins/Internal/Sources/Network/WebSocket/WebSocketInterceptor.swift b/AmplifyPlugins/Internal/Sources/Network/WebSocket/WebSocketInterceptor.swift
@@ -8,7 +8,6 @@
 
 import Foundation
 
-@_spi(WebSocket)
 public protocol WebSocketInterceptor {
     func interceptConnection(url: URL) async -> URL
 }
diff --git a/AmplifyPlugins/Internal/Sources/Network/WebSocket/WebSocketNetworkMonitorProtocol.swift b/AmplifyPlugins/Internal/Sources/Network/WebSocket/WebSocketNetworkMonitorProtocol.swift
@@ -9,7 +9,6 @@
 import Foundation
 import Combine
 
-@_spi(WebSocket)
 public protocol WebSocketNetworkMonitorProtocol {
     var publisher: AnyPublisher<(AmplifyNetworkMonitor.State, AmplifyNetworkMonitor.State), Never> { get }
     func updateState(_ nextState: AmplifyNetworkMonitor.State) async

diff --git a/AmplifyPlugins/Internal/Tests/NetworkTests/WebSocket/RetryWithJitterTests.swift b/AmplifyPlugins/Internal/Tests/NetworkTests/WebSocket/RetryWithJitterTests.swift
@@ -7,7 +7,7 @@
 
 
 import XCTest
-@testable @_spi(WebSocket) import AWSPluginsCore
+@testable import AWSPluginsCore
 
 class RetryWithJitterTests: XCTestCase {
     struct TestError: Error {

diff --git a/AmplifyPlugins/Internal/Tests/NetworkTests/WebSocket/WebSocketClientTests.swift b/AmplifyPlugins/Internal/Tests/NetworkTests/WebSocket/WebSocketClientTests.swift
@@ -8,7 +8,7 @@
 
 import XCTest
 import Combine
-@testable @_spi(WebSocket) import AWSPluginsCore
+@testable import AWSPluginsCore
 
 fileprivate let timeout: TimeInterval = 5