rename package name to InternalAmplifyNetwork

aws-amplify · May 17, 2024 · a2cf85a · a2cf85a
1 parent 633a8f0
commit a2cf85a
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 25 deletions.
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/Amplify-Package.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/Amplify-Package.xcscheme
@@ -751,6 +751,16 @@
                ReferencedContainer = "container:">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "InternalAmplifyNetworkUnitTests"
+               BuildableName = "InternalAmplifyNetworkUnitTests"
+               BlueprintName = "InternalAmplifyNetworkUnitTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
@@ -777,15 +787,6 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "Amplify"
-            BuildableName = "Amplify"
-            BlueprintName = "Amplify"
-            ReferencedContainer = "container:">
-         </BuildableReference>
-      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

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) @_spi(RetryWithJitter) import AmplifyNetwork
+@_spi(WebSocket) @_spi(RetryWithJitter) import InternalAmplifyNetwork
 
 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(RetryWithJitter) import AmplifyNetwork
+@_spi(RetryWithJitter) import InternalAmplifyNetwork
 
 /**
  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
+@_spi(WebSocket) import InternalAmplifyNetwork
 
 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) import AmplifyNetwork
+@_spi(WebSocket) import InternalAmplifyNetwork
 
 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) import AmplifyNetwork
+@_spi(WebSocket) import InternalAmplifyNetwork
 
 /// 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) import AmplifyNetwork
+@_spi(WebSocket) import InternalAmplifyNetwork
 
 class IAMAuthInterceptor {
 

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) import AmplifyNetwork
+@_spi(WebSocket) import InternalAmplifyNetwork
 
 
 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
-@_spi(WebSocket) import AmplifyNetwork
+@_spi(WebSocket) import InternalAmplifyNetwork
 
 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
+@_spi(WebSocket) import InternalAmplifyNetwork
 
 class AppSyncRealTimeClientTests: 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
-@_spi(WebSocket) import AmplifyNetwork
+@_spi(WebSocket) import InternalAmplifyNetwork
 
 struct MockSubscriptionConnectionFactory: AppSyncRealTimeClientFactoryProtocol {
 

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

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

diff --git a/Package.swift b/Package.swift
@@ -116,7 +116,7 @@ let apiTargets: [Target] = [
         dependencies: [
             .target(name: "Amplify"),
             .target(name: "AWSPluginsCore"),
-            .target(name: "AmplifyNetwork")
+            .target(name: "InternalAmplifyNetwork")
         ],
         path: "AmplifyPlugins/API/Sources/AWSAPIPlugin",
         exclude: [
@@ -318,17 +318,17 @@ let internalPinpointTargets: [Target] = [
 
 let internalNetworkingTargets: [Target] = [
     .target(
-        name: "AmplifyNetwork",
+        name: "InternalAmplifyNetwork",
         dependencies: [
             .target(name: "Amplify")
         ],
         path: "AmplifyPlugins/Internal/Sources/Network"
     ),
     .testTarget(
-        name: "AmplifyNetworkUnitTests",
+        name: "InternalAmplifyNetworkUnitTests",
         dependencies: [
             "AmplifyTestCommon",
-            "AmplifyNetwork"
+            "InternalAmplifyNetwork"
         ],
         path: "AmplifyPlugins/Internal/Tests/NetworkTests"
     )