diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/Amplify-Package.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/Amplify-Package.xcscheme index 77f9846963..5fda4b76eb 100644 --- a/.swiftpm/xcode/xcshareddata/xcschemes/Amplify-Package.xcscheme +++ b/.swiftpm/xcode/xcshareddata/xcschemes/Amplify-Package.xcscheme @@ -496,6 +496,34 @@ ReferencedContainer = "container:"> + + + + + + + + + + + + + + + + + + + + + + + + : InternalTaskRunner, InternalTaskAsyncThrowingSequence, InternalTaskThrowingChannel { diff --git a/AmplifyPlugins/API/Sources/AWSAPIPlugin/SubscriptionFactory/AppSyncRealTimeClientFactory.swift b/AmplifyPlugins/API/Sources/AWSAPIPlugin/SubscriptionFactory/AppSyncRealTimeClientFactory.swift index b9b8d0b396..57a3708e1e 100644 --- a/AmplifyPlugins/API/Sources/AWSAPIPlugin/SubscriptionFactory/AppSyncRealTimeClientFactory.swift +++ b/AmplifyPlugins/API/Sources/AWSAPIPlugin/SubscriptionFactory/AppSyncRealTimeClientFactory.swift @@ -9,7 +9,7 @@ import Foundation import Amplify import Combine -import AWSPluginsSDKCore +import InternalAmplifyCredentials @_spi(WebSocket) import AWSPluginsCore protocol AppSyncRealTimeClientFactoryProtocol { diff --git a/AmplifyPlugins/API/Tests/APIHostApp/AWSAPIPluginFunctionalTests/AppSyncRealTimeClientTests.swift b/AmplifyPlugins/API/Tests/APIHostApp/AWSAPIPluginFunctionalTests/AppSyncRealTimeClientTests.swift index d212211abf..c151f9c50c 100644 --- a/AmplifyPlugins/API/Tests/APIHostApp/AWSAPIPluginFunctionalTests/AppSyncRealTimeClientTests.swift +++ b/AmplifyPlugins/API/Tests/APIHostApp/AWSAPIPluginFunctionalTests/AppSyncRealTimeClientTests.swift @@ -11,7 +11,7 @@ import Combine @testable import Amplify @testable import AWSAPIPlugin @testable @_spi(WebSocket) import AWSPluginsCore -@testable import AWSPluginsSDKCore +@testable import InternalAmplifyCredentials class AppSyncRealTimeClientTests: XCTestCase { let subscriptionRequest = """ diff --git a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/AWSAPICategoryPlugin+InterceptorBehaviorTests.swift b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/AWSAPICategoryPlugin+InterceptorBehaviorTests.swift index 2dc9f136ba..ac458b9992 100644 --- a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/AWSAPICategoryPlugin+InterceptorBehaviorTests.swift +++ b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/AWSAPICategoryPlugin+InterceptorBehaviorTests.swift @@ -8,7 +8,7 @@ import XCTest @testable import AWSAPIPlugin import AWSPluginsCore -import AWSPluginsSDKCore +import InternalAmplifyCredentials // swiftlint:disable:next type_name class AWSAPICategoryPluginInterceptorBehaviorTests: AWSAPICategoryPluginTestBase { diff --git a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Configuration/AWSAPICategoryPluginConfigurationTests.swift b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Configuration/AWSAPICategoryPluginConfigurationTests.swift index a89d89b8c5..b71e5491a8 100644 --- a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Configuration/AWSAPICategoryPluginConfigurationTests.swift +++ b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Configuration/AWSAPICategoryPluginConfigurationTests.swift @@ -12,7 +12,7 @@ import Foundation @testable import AWSAPIPlugin @testable import AWSPluginsTestCommon import AWSPluginsCore -import AWSPluginsSDKCore +import InternalAmplifyCredentials class AWSAPICategoryPluginConfigurationTests: XCTestCase { let graphQLAPI = "graphQLAPI" diff --git a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Configuration/AWSAPIEndpointInterceptorsTests.swift b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Configuration/AWSAPIEndpointInterceptorsTests.swift index d20d4120c4..03520086ef 100644 --- a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Configuration/AWSAPIEndpointInterceptorsTests.swift +++ b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Configuration/AWSAPIEndpointInterceptorsTests.swift @@ -8,7 +8,7 @@ import XCTest import Amplify import AWSPluginsCore -import AWSPluginsSDKCore +import InternalAmplifyCredentials @testable import AmplifyTestCommon @testable import AWSAPIPlugin @testable import AWSPluginsTestCommon diff --git a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Interceptor/AuthTokenURLRequestInterceptorTests.swift b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Interceptor/AuthTokenURLRequestInterceptorTests.swift index 149fc1923b..74e1041f82 100644 --- a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Interceptor/AuthTokenURLRequestInterceptorTests.swift +++ b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Interceptor/AuthTokenURLRequestInterceptorTests.swift @@ -7,7 +7,7 @@ import XCTest import AWSPluginsCore -import AWSPluginsSDKCore +import InternalAmplifyCredentials @testable import Amplify @testable import AmplifyTestCommon @testable import AWSAPIPlugin diff --git a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Mocks/MockSubscription.swift b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Mocks/MockSubscription.swift index 7cea9cf879..51c1feea3e 100644 --- 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 @_spi(WebSocket) import AWSPluginsCore -import AWSPluginsSDKCore +import InternalAmplifyCredentials struct MockSubscriptionConnectionFactory: AppSyncRealTimeClientFactoryProtocol { diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/AWSCognitoAuthPlugin+Configure.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/AWSCognitoAuthPlugin+Configure.swift index d71cc35532..721880d462 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/AWSCognitoAuthPlugin+Configure.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/AWSCognitoAuthPlugin+Configure.swift @@ -13,7 +13,7 @@ import AWSCognitoIdentityProvider import AWSPluginsCore import ClientRuntime import AWSClientRuntime -@_spi(PluginHTTPClientEngine) import AWSPluginsSDKCore +@_spi(PluginHTTPClientEngine) import InternalAmplifyCredentials @_spi(InternalHttpEngineProxy) import AWSPluginsCore extension AWSCognitoAuthPlugin { diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/AWSCognitoAuthPlugin+PluginExtension.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/AWSCognitoAuthPlugin+PluginExtension.swift index 3e0b9e8278..e617062e5c 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/AWSCognitoAuthPlugin+PluginExtension.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/AWSCognitoAuthPlugin+PluginExtension.swift @@ -5,7 +5,7 @@ // SPDX-License-Identifier: Apache-2.0 // -@_spi(InternalAmplifyPluginExtension) import AWSPluginsSDKCore +@_spi(InternalAmplifyPluginExtension) import InternalAmplifyCredentials import Foundation import ClientRuntime diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Support/Utils/HttpClientEngineProxy.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Support/Utils/HttpClientEngineProxy.swift index 258e42fe33..b3a5edf8d2 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Support/Utils/HttpClientEngineProxy.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Support/Utils/HttpClientEngineProxy.swift @@ -5,7 +5,7 @@ // SPDX-License-Identifier: Apache-2.0 // -@_spi(InternalHttpEngineProxy) @_spi(InternalAmplifyPluginExtension) import AWSPluginsSDKCore +@_spi(InternalHttpEngineProxy) @_spi(InternalAmplifyPluginExtension) import InternalAmplifyCredentials import ClientRuntime import Foundation diff --git a/AmplifyPlugins/Core/AWSPluginsTestCommon/MockAWSAuthService.swift b/AmplifyPlugins/Core/AWSPluginsTestCommon/MockAWSAuthService.swift index 9e6a38e77e..7f11328ad1 100644 --- a/AmplifyPlugins/Core/AWSPluginsTestCommon/MockAWSAuthService.swift +++ b/AmplifyPlugins/Core/AWSPluginsTestCommon/MockAWSAuthService.swift @@ -8,7 +8,7 @@ import ClientRuntime import AWSClientRuntime import Amplify -import AWSPluginsSDKCore +import InternalAmplifyCredentials public class MockAWSAuthService: AWSAuthCredentialsProviderBehavior { diff --git a/AmplifyPlugins/Core/AWSPluginsTestCommon/MockAWSSignatureV4Signer.swift b/AmplifyPlugins/Core/AWSPluginsTestCommon/MockAWSSignatureV4Signer.swift index 85c3178277..abeb670efb 100644 --- a/AmplifyPlugins/Core/AWSPluginsTestCommon/MockAWSSignatureV4Signer.swift +++ b/AmplifyPlugins/Core/AWSPluginsTestCommon/MockAWSSignatureV4Signer.swift @@ -8,7 +8,7 @@ import AWSPluginsCore import ClientRuntime import AWSClientRuntime -import AWSPluginsSDKCore +import InternalAmplifyCredentials import Foundation class MockAWSSignatureV4Signer: AWSSignatureV4Signer { diff --git a/AmplifyPlugins/Core/AWSPluginsSDKCore/AWSAuthCredentialsProviderBehavior.swift b/AmplifyPlugins/Core/AmplifyCredentials/AWSAuthCredentialsProviderBehavior.swift similarity index 100% rename from AmplifyPlugins/Core/AWSPluginsSDKCore/AWSAuthCredentialsProviderBehavior.swift rename to AmplifyPlugins/Core/AmplifyCredentials/AWSAuthCredentialsProviderBehavior.swift diff --git a/AmplifyPlugins/Core/AWSPluginsSDKCore/AWSAuthService+CredentialsProvider.swift b/AmplifyPlugins/Core/AmplifyCredentials/AWSAuthService+CredentialsProvider.swift similarity index 100% rename from AmplifyPlugins/Core/AWSPluginsSDKCore/AWSAuthService+CredentialsProvider.swift rename to AmplifyPlugins/Core/AmplifyCredentials/AWSAuthService+CredentialsProvider.swift diff --git a/AmplifyPlugins/Core/AWSPluginsSDKCore/AWSPluginExtension.swift b/AmplifyPlugins/Core/AmplifyCredentials/AWSPluginExtension.swift similarity index 100% rename from AmplifyPlugins/Core/AWSPluginsSDKCore/AWSPluginExtension.swift rename to AmplifyPlugins/Core/AmplifyCredentials/AWSPluginExtension.swift diff --git a/AmplifyPlugins/Core/AWSPluginsSDKCore/AmplifyAWSCredentialsProvider.swift b/AmplifyPlugins/Core/AmplifyCredentials/AmplifyAWSCredentialsProvider.swift similarity index 100% rename from AmplifyPlugins/Core/AWSPluginsSDKCore/AmplifyAWSCredentialsProvider.swift rename to AmplifyPlugins/Core/AmplifyCredentials/AmplifyAWSCredentialsProvider.swift diff --git a/AmplifyPlugins/Core/AWSPluginsSDKCore/AmplifyAWSServiceConfiguration.swift b/AmplifyPlugins/Core/AmplifyCredentials/AmplifyAWSServiceConfiguration.swift similarity index 100% rename from AmplifyPlugins/Core/AWSPluginsSDKCore/AmplifyAWSServiceConfiguration.swift rename to AmplifyPlugins/Core/AmplifyCredentials/AmplifyAWSServiceConfiguration.swift diff --git a/AmplifyPlugins/Core/AWSPluginsSDKCore/AmplifyAWSSignatureV4Signer.swift b/AmplifyPlugins/Core/AmplifyCredentials/AmplifyAWSSignatureV4Signer.swift similarity index 100% rename from AmplifyPlugins/Core/AWSPluginsSDKCore/AmplifyAWSSignatureV4Signer.swift rename to AmplifyPlugins/Core/AmplifyCredentials/AmplifyAWSSignatureV4Signer.swift diff --git a/AmplifyPlugins/Core/AWSPluginsSDKCore/AuthTokenProvider.swift b/AmplifyPlugins/Core/AmplifyCredentials/AuthTokenProvider.swift similarity index 100% rename from AmplifyPlugins/Core/AWSPluginsSDKCore/AuthTokenProvider.swift rename to AmplifyPlugins/Core/AmplifyCredentials/AuthTokenProvider.swift diff --git a/AmplifyPlugins/Core/AWSPluginsSDKCore/CustomHttpClientEngine/ClientRuntimeFoundationBridge.swift b/AmplifyPlugins/Core/AmplifyCredentials/CustomHttpClientEngine/ClientRuntimeFoundationBridge.swift similarity index 100% rename from AmplifyPlugins/Core/AWSPluginsSDKCore/CustomHttpClientEngine/ClientRuntimeFoundationBridge.swift rename to AmplifyPlugins/Core/AmplifyCredentials/CustomHttpClientEngine/ClientRuntimeFoundationBridge.swift diff --git a/AmplifyPlugins/Core/AWSPluginsSDKCore/CustomHttpClientEngine/FoundationClientEngine.swift b/AmplifyPlugins/Core/AmplifyCredentials/CustomHttpClientEngine/FoundationClientEngine.swift similarity index 100% rename from AmplifyPlugins/Core/AWSPluginsSDKCore/CustomHttpClientEngine/FoundationClientEngine.swift rename to AmplifyPlugins/Core/AmplifyCredentials/CustomHttpClientEngine/FoundationClientEngine.swift diff --git a/AmplifyPlugins/Core/AWSPluginsSDKCore/CustomHttpClientEngine/FoundationClientEngineError.swift b/AmplifyPlugins/Core/AmplifyCredentials/CustomHttpClientEngine/FoundationClientEngineError.swift similarity index 100% rename from AmplifyPlugins/Core/AWSPluginsSDKCore/CustomHttpClientEngine/FoundationClientEngineError.swift rename to AmplifyPlugins/Core/AmplifyCredentials/CustomHttpClientEngine/FoundationClientEngineError.swift diff --git a/AmplifyPlugins/Core/AWSPluginsSDKCore/CustomHttpClientEngine/PluginClientEngine.swift b/AmplifyPlugins/Core/AmplifyCredentials/CustomHttpClientEngine/PluginClientEngine.swift similarity index 100% rename from AmplifyPlugins/Core/AWSPluginsSDKCore/CustomHttpClientEngine/PluginClientEngine.swift rename to AmplifyPlugins/Core/AmplifyCredentials/CustomHttpClientEngine/PluginClientEngine.swift diff --git a/AmplifyPlugins/Core/AWSPluginsSDKCore/CustomHttpClientEngine/SdkHttpRequest+updatingUserAgent.swift b/AmplifyPlugins/Core/AmplifyCredentials/CustomHttpClientEngine/SdkHttpRequest+updatingUserAgent.swift similarity index 100% rename from AmplifyPlugins/Core/AWSPluginsSDKCore/CustomHttpClientEngine/SdkHttpRequest+updatingUserAgent.swift rename to AmplifyPlugins/Core/AmplifyCredentials/CustomHttpClientEngine/SdkHttpRequest+updatingUserAgent.swift diff --git a/AmplifyPlugins/Core/AWSPluginsSDKCore/CustomHttpClientEngine/UserAgentSettingClientEngine.swift b/AmplifyPlugins/Core/AmplifyCredentials/CustomHttpClientEngine/UserAgentSettingClientEngine.swift similarity index 100% rename from AmplifyPlugins/Core/AWSPluginsSDKCore/CustomHttpClientEngine/UserAgentSettingClientEngine.swift rename to AmplifyPlugins/Core/AmplifyCredentials/CustomHttpClientEngine/UserAgentSettingClientEngine.swift diff --git a/AmplifyPlugins/Core/AWSPluginsSDKCore/CustomHttpClientEngine/UserAgentSuffixAppender.swift b/AmplifyPlugins/Core/AmplifyCredentials/CustomHttpClientEngine/UserAgentSuffixAppender.swift similarity index 100% rename from AmplifyPlugins/Core/AWSPluginsSDKCore/CustomHttpClientEngine/UserAgentSuffixAppender.swift rename to AmplifyPlugins/Core/AmplifyCredentials/CustomHttpClientEngine/UserAgentSuffixAppender.swift diff --git a/AmplifyPlugins/Core/AWSPluginsSDKCore/IAMCredentialProvider.swift b/AmplifyPlugins/Core/AmplifyCredentials/IAMCredentialProvider.swift similarity index 100% rename from AmplifyPlugins/Core/AWSPluginsSDKCore/IAMCredentialProvider.swift rename to AmplifyPlugins/Core/AmplifyCredentials/IAMCredentialProvider.swift diff --git a/AmplifyPlugins/Core/AWSPluginsSDKCore/Resources/PrivacyInfo.xcprivacy b/AmplifyPlugins/Core/AmplifyCredentials/Resources/PrivacyInfo.xcprivacy similarity index 100% rename from AmplifyPlugins/Core/AWSPluginsSDKCore/Resources/PrivacyInfo.xcprivacy rename to AmplifyPlugins/Core/AmplifyCredentials/Resources/PrivacyInfo.xcprivacy diff --git a/AmplifyPlugins/Core/AWSPluginsSDKCore/ServiceConfiguration/AmplifyAWSServiceConfiguration+Platform.swift b/AmplifyPlugins/Core/AmplifyCredentials/ServiceConfiguration/AmplifyAWSServiceConfiguration+Platform.swift similarity index 100% rename from AmplifyPlugins/Core/AWSPluginsSDKCore/ServiceConfiguration/AmplifyAWSServiceConfiguration+Platform.swift rename to AmplifyPlugins/Core/AmplifyCredentials/ServiceConfiguration/AmplifyAWSServiceConfiguration+Platform.swift diff --git a/AmplifyPlugins/Core/AWSPluginsSDKCoreTests/AWSPluginsSDKCore.xctestplan b/AmplifyPlugins/Core/AmplifyCredentialsTests/AWSPluginsSDKCore.xctestplan similarity index 73% rename from AmplifyPlugins/Core/AWSPluginsSDKCoreTests/AWSPluginsSDKCore.xctestplan rename to AmplifyPlugins/Core/AmplifyCredentialsTests/AWSPluginsSDKCore.xctestplan index ca8fdab70a..8a0c4734d0 100644 --- a/AmplifyPlugins/Core/AWSPluginsSDKCoreTests/AWSPluginsSDKCore.xctestplan +++ b/AmplifyPlugins/Core/AmplifyCredentialsTests/AWSPluginsSDKCore.xctestplan @@ -15,8 +15,8 @@ { "target" : { "containerPath" : "container:", - "identifier" : "AWSPluginsSDKCoreTests", - "name" : "AWSPluginsSDKCoreTests" + "identifier" : "InternalAmplifyCredentialsTests", + "name" : "InternalAmplifyCredentialsTests" } } ], diff --git a/AmplifyPlugins/Core/AWSPluginsSDKCoreTests/Auth/AWSAuthServiceTests.swift b/AmplifyPlugins/Core/AmplifyCredentialsTests/Auth/AWSAuthServiceTests.swift similarity index 99% rename from AmplifyPlugins/Core/AWSPluginsSDKCoreTests/Auth/AWSAuthServiceTests.swift rename to AmplifyPlugins/Core/AmplifyCredentialsTests/Auth/AWSAuthServiceTests.swift index 152a1683d9..abca5ad99c 100644 --- a/AmplifyPlugins/Core/AWSPluginsSDKCoreTests/Auth/AWSAuthServiceTests.swift +++ b/AmplifyPlugins/Core/AmplifyCredentialsTests/Auth/AWSAuthServiceTests.swift @@ -9,7 +9,7 @@ import XCTest @testable import Amplify @testable import AWSPluginsCore -@testable import AWSPluginsSDKCore +@testable import InternalAmplifyCredentials import AWSClientRuntime class AWSAuthServiceTests: XCTestCase { diff --git a/AmplifyPlugins/Core/AWSPluginsSDKCoreTests/Utils/UserAgentSettingClientEngineTests.swift b/AmplifyPlugins/Core/AmplifyCredentialsTests/Utils/UserAgentSettingClientEngineTests.swift similarity index 99% rename from AmplifyPlugins/Core/AWSPluginsSDKCoreTests/Utils/UserAgentSettingClientEngineTests.swift rename to AmplifyPlugins/Core/AmplifyCredentialsTests/Utils/UserAgentSettingClientEngineTests.swift index b141438eb7..a6b2d3a800 100644 --- a/AmplifyPlugins/Core/AWSPluginsSDKCoreTests/Utils/UserAgentSettingClientEngineTests.swift +++ b/AmplifyPlugins/Core/AmplifyCredentialsTests/Utils/UserAgentSettingClientEngineTests.swift @@ -8,7 +8,7 @@ @_spi(InternalAmplifyPluginExtension) @_spi(PluginHTTPClientEngine) @_spi(InternalHttpEngineProxy) -import AWSPluginsSDKCore +import InternalAmplifyCredentials import ClientRuntime import XCTest diff --git a/AmplifyPlugins/Core/AWSPluginsSDKCoreTests/Utils/UserAgentSuffixAppenderTests.swift b/AmplifyPlugins/Core/AmplifyCredentialsTests/Utils/UserAgentSuffixAppenderTests.swift similarity index 98% rename from AmplifyPlugins/Core/AWSPluginsSDKCoreTests/Utils/UserAgentSuffixAppenderTests.swift rename to AmplifyPlugins/Core/AmplifyCredentialsTests/Utils/UserAgentSuffixAppenderTests.swift index 5a03770137..dece4394d4 100644 --- a/AmplifyPlugins/Core/AWSPluginsSDKCoreTests/Utils/UserAgentSuffixAppenderTests.swift +++ b/AmplifyPlugins/Core/AmplifyCredentialsTests/Utils/UserAgentSuffixAppenderTests.swift @@ -5,7 +5,7 @@ // SPDX-License-Identifier: Apache-2.0 // -@_spi(InternalAmplifyPluginExtension) @_spi(InternalHttpEngineProxy) import AWSPluginsSDKCore +@_spi(InternalAmplifyPluginExtension) @_spi(InternalHttpEngineProxy) import InternalAmplifyCredentials import ClientRuntime import XCTest diff --git a/AmplifyPlugins/Geo/Sources/AWSLocationGeoPlugin/AWSLocationGeoPlugin+Configure.swift b/AmplifyPlugins/Geo/Sources/AWSLocationGeoPlugin/AWSLocationGeoPlugin+Configure.swift index acc5d5c3c6..6b194b48af 100644 --- a/AmplifyPlugins/Geo/Sources/AWSLocationGeoPlugin/AWSLocationGeoPlugin+Configure.swift +++ b/AmplifyPlugins/Geo/Sources/AWSLocationGeoPlugin/AWSLocationGeoPlugin+Configure.swift @@ -8,7 +8,7 @@ import Foundation @_spi(InternalAmplifyConfiguration) import Amplify import AWSPluginsCore -@_spi(PluginHTTPClientEngine) import AWSPluginsSDKCore +@_spi(PluginHTTPClientEngine) import InternalAmplifyCredentials import AWSLocation import AWSClientRuntime diff --git a/AmplifyPlugins/Internal/Sources/InternalAWSPinpoint/Analytics/PinpointEvent+PinpointClientTypes.swift b/AmplifyPlugins/Internal/Sources/InternalAWSPinpoint/Analytics/PinpointEvent+PinpointClientTypes.swift index ba9193d111..e2c78b496e 100644 --- a/AmplifyPlugins/Internal/Sources/InternalAWSPinpoint/Analytics/PinpointEvent+PinpointClientTypes.swift +++ b/AmplifyPlugins/Internal/Sources/InternalAWSPinpoint/Analytics/PinpointEvent+PinpointClientTypes.swift @@ -7,7 +7,7 @@ import AWSPinpoint import AWSPluginsCore -import AWSPluginsSDKCore +import InternalAmplifyCredentials import Foundation extension PinpointEvent { diff --git a/AmplifyPlugins/Internal/Sources/InternalAWSPinpoint/Extensions/PinpointClient+CredentialsProvider.swift b/AmplifyPlugins/Internal/Sources/InternalAWSPinpoint/Extensions/PinpointClient+CredentialsProvider.swift index cc5d7c9b22..1d7a9d7cd9 100644 --- a/AmplifyPlugins/Internal/Sources/InternalAWSPinpoint/Extensions/PinpointClient+CredentialsProvider.swift +++ b/AmplifyPlugins/Internal/Sources/InternalAWSPinpoint/Extensions/PinpointClient+CredentialsProvider.swift @@ -8,7 +8,7 @@ import AWSClientRuntime import AWSPluginsCore import AWSPinpoint -@_spi(PluginHTTPClientEngine) import AWSPluginsSDKCore +@_spi(PluginHTTPClientEngine) import InternalAmplifyCredentials extension PinpointClient { convenience init(region: String, credentialsProvider: CredentialsProviding) throws { diff --git a/AmplifyPlugins/Internal/Sources/InternalAWSPinpoint/Support/Utils/PinpointRequestsRegistry.swift b/AmplifyPlugins/Internal/Sources/InternalAWSPinpoint/Support/Utils/PinpointRequestsRegistry.swift index a6de992534..9a2b02fa87 100644 --- a/AmplifyPlugins/Internal/Sources/InternalAWSPinpoint/Support/Utils/PinpointRequestsRegistry.swift +++ b/AmplifyPlugins/Internal/Sources/InternalAWSPinpoint/Support/Utils/PinpointRequestsRegistry.swift @@ -8,7 +8,7 @@ import Foundation import AWSPinpoint import ClientRuntime -@_spi(PluginHTTPClientEngine) import AWSPluginsSDKCore +@_spi(PluginHTTPClientEngine) import InternalAmplifyCredentials @globalActor actor PinpointRequestsRegistry { static let shared = PinpointRequestsRegistry() diff --git a/AmplifyPlugins/Logging/Sources/AWSCloudWatchLoggingPlugin/AWSCloudWatchLoggingSessionController.swift b/AmplifyPlugins/Logging/Sources/AWSCloudWatchLoggingPlugin/AWSCloudWatchLoggingSessionController.swift index a23cc1ffa3..733dc11828 100644 --- a/AmplifyPlugins/Logging/Sources/AWSCloudWatchLoggingPlugin/AWSCloudWatchLoggingSessionController.swift +++ b/AmplifyPlugins/Logging/Sources/AWSCloudWatchLoggingPlugin/AWSCloudWatchLoggingSessionController.swift @@ -6,7 +6,7 @@ // import AWSPluginsCore -@_spi(PluginHTTPClientEngine) import AWSPluginsSDKCore +@_spi(PluginHTTPClientEngine) import InternalAmplifyCredentials import Amplify import Combine import Foundation diff --git a/AmplifyPlugins/Logging/Sources/AWSCloudWatchLoggingPlugin/Configuration/DefaultRemoteLoggingConstraintsProvider.swift b/AmplifyPlugins/Logging/Sources/AWSCloudWatchLoggingPlugin/Configuration/DefaultRemoteLoggingConstraintsProvider.swift index bbfce30e3a..6a11ded903 100644 --- a/AmplifyPlugins/Logging/Sources/AWSCloudWatchLoggingPlugin/Configuration/DefaultRemoteLoggingConstraintsProvider.swift +++ b/AmplifyPlugins/Logging/Sources/AWSCloudWatchLoggingPlugin/Configuration/DefaultRemoteLoggingConstraintsProvider.swift @@ -8,7 +8,7 @@ import Foundation import Amplify import AWSPluginsCore -import AWSPluginsSDKCore +import InternalAmplifyCredentials import AWSClientRuntime import ClientRuntime diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Service/Predictions/AWSPredictionsService.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Service/Predictions/AWSPredictionsService.swift index d336d39552..9470da9c2b 100644 --- a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Service/Predictions/AWSPredictionsService.swift +++ b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Service/Predictions/AWSPredictionsService.swift @@ -12,7 +12,7 @@ import AWSTextract import AWSComprehend import AWSPolly import AWSPluginsCore -@_spi(PluginHTTPClientEngine) import AWSPluginsSDKCore +@_spi(PluginHTTPClientEngine) import InternalAmplifyCredentials import Foundation import ClientRuntime import AWSClientRuntime diff --git a/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Service/Storage/AWSS3StorageService.swift b/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Service/Storage/AWSS3StorageService.swift index 722c5cc066..a930bb2184 100644 --- a/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Service/Storage/AWSS3StorageService.swift +++ b/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Service/Storage/AWSS3StorageService.swift @@ -10,7 +10,7 @@ import AWSS3 import Amplify import AWSPluginsCore import ClientRuntime -@_spi(PluginHTTPClientEngine) import AWSPluginsSDKCore +@_spi(PluginHTTPClientEngine) import InternalAmplifyCredentials /// - Tag: AWSS3StorageService class AWSS3StorageService: AWSS3StorageServiceBehavior, StorageServiceProxy { diff --git a/Package.swift b/Package.swift index 0907b7fd68..c1193ff4eb 100644 --- a/Package.swift +++ b/Package.swift @@ -41,13 +41,13 @@ let amplifyTargets: [Target] = [ ] ), .target( - name: "AWSPluginsSDKCore", + name: "InternalAmplifyCredentials", dependencies: [ "Amplify", "AWSPluginsCore", .product(name: "AWSClientRuntime", package: "aws-sdk-swift") ], - path: "AmplifyPlugins/Core/AWSPluginsSDKCore", + path: "AmplifyPlugins/Core/AmplifyCredentials", resources: [ .copy("Resources/PrivacyInfo.xcprivacy") ] @@ -57,7 +57,7 @@ let amplifyTargets: [Target] = [ dependencies: [ "Amplify", "CwlPreconditionTesting", - "AWSPluginsSDKCore" + "InternalAmplifyCredentials" ], path: "AmplifyTestCommon", exclude: [ @@ -100,7 +100,7 @@ let amplifyTargets: [Target] = [ dependencies: [ "Amplify", "AWSPluginsCore", - "AWSPluginsSDKCore", + "InternalAmplifyCredentials", .product(name: "AWSClientRuntime", package: "aws-sdk-swift") ], path: "AmplifyPlugins/Core/AWSPluginsTestCommon", @@ -120,13 +120,13 @@ let amplifyTargets: [Target] = [ ] ), .testTarget( - name: "AWSPluginsSDKCoreTests", + name: "InternalAmplifyCredentialsTests", dependencies: [ - "AWSPluginsSDKCore", + "InternalAmplifyCredentials", "AmplifyTestCommon", .product(name: "AWSClientRuntime", package: "aws-sdk-swift") ], - path: "AmplifyPlugins/Core/AWSPluginsSDKCoreTests" + path: "AmplifyPlugins/Core/AmplifyCredentialsTests" ) ] @@ -135,7 +135,7 @@ let apiTargets: [Target] = [ name: "AWSAPIPlugin", dependencies: [ .target(name: "Amplify"), - .target(name: "AWSPluginsSDKCore") + .target(name: "InternalAmplifyCredentials") ], path: "AmplifyPlugins/API/Sources/AWSAPIPlugin", exclude: [ @@ -181,7 +181,7 @@ let authTargets: [Target] = [ .target(name: "Amplify"), .target(name: "AmplifySRP"), .target(name: "AWSPluginsCore"), - .target(name: "AWSPluginsSDKCore"), + .target(name: "InternalAmplifyCredentials"), .product(name: "AWSClientRuntime", package: "aws-sdk-swift"), .product(name: "AWSCognitoIdentityProvider", package: "aws-sdk-swift"), .product(name: "AWSCognitoIdentity", package: "aws-sdk-swift") @@ -255,7 +255,7 @@ let storageTargets: [Target] = [ dependencies: [ .target(name: "Amplify"), .target(name: "AWSPluginsCore"), - .target(name: "AWSPluginsSDKCore"), + .target(name: "InternalAmplifyCredentials"), .product(name: "AWSS3", package: "aws-sdk-swift")], path: "AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin", exclude: [ @@ -286,7 +286,7 @@ let geoTargets: [Target] = [ dependencies: [ .target(name: "Amplify"), .target(name: "AWSPluginsCore"), - .target(name: "AWSPluginsSDKCore"), + .target(name: "InternalAmplifyCredentials"), .product(name: "AWSLocation", package: "aws-sdk-swift")], path: "AmplifyPlugins/Geo/Sources/AWSLocationGeoPlugin", exclude: [ @@ -318,7 +318,7 @@ let internalPinpointTargets: [Target] = [ .target(name: "Amplify"), .target(name: "AWSCognitoAuthPlugin"), .target(name: "AWSPluginsCore"), - .target(name: "AWSPluginsSDKCore"), + .target(name: "InternalAmplifyCredentials"), .product(name: "SQLite", package: "SQLite.swift"), .product(name: "AWSPinpoint", package: "aws-sdk-swift"), .product(name: "AmplifyUtilsNotifications", package: "amplify-swift-utils-notifications") @@ -387,7 +387,7 @@ let predictionsTargets: [Target] = [ dependencies: [ .target(name: "Amplify"), .target(name: "AWSPluginsCore"), - .target(name: "AWSPluginsSDKCore"), + .target(name: "InternalAmplifyCredentials"), .target(name: "CoreMLPredictionsPlugin"), .product(name: "AWSComprehend", package: "aws-sdk-swift"), .product(name: "AWSPolly", package: "aws-sdk-swift"), @@ -438,7 +438,7 @@ let loggingTargets: [Target] = [ dependencies: [ .target(name: "Amplify"), .target(name: "AWSPluginsCore"), - .target(name: "AWSPluginsSDKCore"), + .target(name: "InternalAmplifyCredentials"), .product(name: "AWSCloudWatchLogs", package: "aws-sdk-swift"), ], path: "AmplifyPlugins/Logging/Sources/AWSCloudWatchLoggingPlugin", @@ -485,8 +485,8 @@ let package = Package( targets: ["AWSPluginsCore"] ), .library( - name: "AWSPluginsSDKCore", - targets: ["AWSPluginsSDKCore"] + name: "InternalAmplifyCredentials", + targets: ["InternalAmplifyCredentials"] ), .library( name: "AWSAPIPlugin",