diff --git a/.github/workflows/integ-test.yml b/.github/workflows/integ-test.yml index b38398fad1c..054e8572a5c 100644 --- a/.github/workflows/integ-test.yml +++ b/.github/workflows/integ-test.yml @@ -62,7 +62,7 @@ jobs: - project: AWSAuthSDK/AWSAuthSDK.xcodeproj scheme: AWSMobileClient - runs-on: macos-12 + runs-on: macos-13 steps: - name: Checkout code uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 diff --git a/.github/workflows/kick-off-release.yml b/.github/workflows/kick-off-release.yml index b3ced0c334d..ea1db80efbf 100644 --- a/.github/workflows/kick-off-release.yml +++ b/.github/workflows/kick-off-release.yml @@ -34,7 +34,7 @@ jobs: create-release-pr: name: Create release PR for ${{ github.event.inputs.release-version }} - runs-on: macos-12 + runs-on: macos-13 needs: - validate-version-format env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 67d3878c1d0..9f67a6eaa5a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -55,7 +55,7 @@ jobs: build-xcframeworks: name: Build xcframeworks - runs-on: macos-12 + runs-on: macos-13 needs: - extract-release-version - unit-test @@ -82,7 +82,7 @@ jobs: release-xcframeworks: name: Release xcframeworks - runs-on: macos-12 + runs-on: macos-13 environment: ReleaseArtifacts needs: - extract-release-version @@ -135,7 +135,7 @@ jobs: release-spm: name: Release SPM - runs-on: macos-12 + runs-on: macos-13 environment: Release needs: - extract-release-version @@ -179,7 +179,7 @@ jobs: release-combined-xcframeworks: name: Release combine xcframeworks - runs-on: macos-12 + runs-on: macos-13 environment: ReleaseArtifacts needs: - extract-release-version @@ -251,7 +251,7 @@ jobs: release-tag: name: Rlease tag - runs-on: macos-12 + runs-on: macos-13 needs: - extract-release-version - release-combined-xcframeworks @@ -324,7 +324,7 @@ jobs: release-doc: name: Release docs - runs-on: macos-12 + runs-on: macos-13 needs: - extract-release-version - update-main-branch @@ -372,7 +372,7 @@ jobs: add-doc-tag: name: Add doc tag - runs-on: macos-12 + runs-on: macos-13 needs: - extract-release-version - release-doc @@ -400,7 +400,7 @@ jobs: release-cocoapods: name: Release Cocoapods - runs-on: macos-12 + runs-on: macos-13 needs: - add-doc-tag environment: Release @@ -432,7 +432,7 @@ jobs: release-carthage: name: Release Carthage - runs-on: macos-12 + runs-on: macos-13 needs: - extract-release-version - add-doc-tag @@ -463,7 +463,7 @@ jobs: bump-ios-sampleapp-version: name: 'Bump iOS sample App version' - runs-on: macos-12 + runs-on: macos-13 needs: - release-xcframeworks - release-cocoapods diff --git a/.github/workflows/report-code-coverage.yml b/.github/workflows/report-code-coverage.yml index 29ae72a351d..0de2e3bc501 100644 --- a/.github/workflows/report-code-coverage.yml +++ b/.github/workflows/report-code-coverage.yml @@ -7,7 +7,7 @@ on: jobs: unit-tests: name: All SDK Unit Tests - runs-on: macos-12 + runs-on: macos-13 continue-on-error: true steps: - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 1b8350d18f5..334ce7b1f1b 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -70,7 +70,7 @@ jobs: - project: AWSAuthSDK/AWSAuthSDK.xcodeproj scheme: AWSMobileClient - runs-on: macos-12 + runs-on: macos-13 steps: - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 diff --git a/AWSAuthSDK/Sources/AWSMobileClient/Internal/_AWSMobileClient.h b/AWSAuthSDK/Sources/AWSMobileClient/Internal/_AWSMobileClient.h index ed963bdb4d1..bd3479371c8 100644 --- a/AWSAuthSDK/Sources/AWSMobileClient/Internal/_AWSMobileClient.h +++ b/AWSAuthSDK/Sources/AWSMobileClient/Internal/_AWSMobileClient.h @@ -94,60 +94,6 @@ NS_ASSUME_NONNULL_BEGIN sourceApplication:(nullable NSString *)sourceApplication annotation:(id)annotation; -/** - Configures the different AWSMobile SDK Clientsfrom application delegate with options. - - @param application instance from application delegate. - @param launchOptions from application delegate. - @param completionHandler completion handler for resuming auth session. - - *Swift* - - AWSMobileClient - .sharedInstance() - .interceptApplication(application, - didFinishLaunchingWithOptions:launchOptions, - resumeSessionWithCompletionHandler:completionHandler) - - *Objective-C* - - AWSMobileClient *mobileClient = [AWSMobileClient sharedInstance]; - [mobileClient interceptApplication:application - didFinishLaunchingWithOptions:launchOptions - resumeSessionWithCompletionHandler:completionHandler]; - */ -- (BOOL)interceptApplication:(UIApplication *)application -didFinishLaunchingWithOptions:(nullable NSDictionary *)launchOptions -resumeSessionWithCompletionHandler:(void (^)(id result, NSError *error))completionHandler; - -/** - Configures the different AWSMobile SDK Clientsfrom application delegate with options. - - @param application instance from application delegate. - @param launchOptions from application delegate. - - *Swift* - - AWSMobileClient - .sharedInstance() - .interceptApplication(application, didFinishLaunchingWithOptions:launchOptions) - - *Objective-C* - - AWSMobileClient *mobileClient = [AWSMobileClient sharedInstance]; - [mobileClient interceptApplication:application - didFinishLaunchingWithOptions:launchOptions]; - */ -- (BOOL)interceptApplication:(UIApplication *)application -didFinishLaunchingWithOptions:(nullable NSDictionary *)launchOptions; - -/** - Set the signInProviderConfig - - @param signInProviderConfig the signInProviderConfiguration with permissions. - **/ -- (void)setSignInProviders:(nullable NSArray *)signInProviderConfig; - -(void)showSignInScreen:(UINavigationController *)navController signInUIConfiguration:(SignInUIOptions *)signInUIConfiguration @@ -159,12 +105,6 @@ didFinishLaunchingWithOptions:(nullable NSDictionary *)launchOptions; */ - (void)setCredentialsProvider:(AWSCognitoCredentialsProvider *)credentialsProvider; -/** - * Retrieve the Credentials Provider. - * @return AWSCognitoCredentialsProvider - */ -- (AWSCognitoCredentialsProvider *)getCredentialsProvider; - /** * Indicates whether the user is signed-in or not. * @return true if user is signed-in diff --git a/AWSAuthSDK/Sources/AWSMobileClient/Internal/_AWSMobileClient.m b/AWSAuthSDK/Sources/AWSMobileClient/Internal/_AWSMobileClient.m index 4ca2970b328..136cf9a8bbc 100644 --- a/AWSAuthSDK/Sources/AWSMobileClient/Internal/_AWSMobileClient.m +++ b/AWSAuthSDK/Sources/AWSMobileClient/Internal/_AWSMobileClient.m @@ -111,31 +111,6 @@ - (BOOL)interceptApplication:(UIApplication *)application annotation:annotation]; } -- (BOOL)interceptApplication:(UIApplication *)application -didFinishLaunchingWithOptions:(nullable NSDictionary *)launchOptions -resumeSessionWithCompletionHandler:(void (^)(id result, NSError *error))completionHandler { - - AWSDDLogInfo(@"didFinishLaunching:withOptions:resumeSessionWithCompletionHandler:"); - - if (self.signInProviderConfig == nil) { - [self registerConfigSignInProviders]; - } else { - [self registerUserSignInProviders:self.signInProviderConfig]; - } - - BOOL didFinishLaunching = [[AWSSignInManager sharedInstance] - interceptApplication:application - didFinishLaunchingWithOptions:launchOptions];; - - if (!_isInitialized) { - AWSDDLogInfo(@"Resuming any previously signed-in session"); - [[AWSSignInManager sharedInstance] resumeSessionWithCompletionHandler:completionHandler]; - _isInitialized = YES; - } - - return didFinishLaunching; -} - -(void)showSignInScreen:(UINavigationController *)navController signInUIConfiguration:(SignInUIOptions *)signInUIConfiguration completionHandler:(void (^)(NSString * _Nullable signInProviderKey, NSString * _Nullable signInProviderToken, NSError * _Nullable error))completionHandler { @@ -293,25 +268,6 @@ - (BOOL)isLoggedIn { return [[AWSSignInManager sharedInstance] isLoggedIn]; } -- (AWSCognitoCredentialsProvider *)getCredentialsProvider { - return [[AWSIdentityManager defaultIdentityManager] credentialsProvider]; -} - -- (void)setSignInProviders:(nullable NSArray *)signInProviderConfig { - self.signInProviderConfig = signInProviderConfig; -} - -- (BOOL)interceptApplication:(UIApplication *)application -didFinishLaunchingWithOptions:(nullable NSDictionary *)launchOptions { - - return [self interceptApplication:application - didFinishLaunchingWithOptions:launchOptions - resumeSessionWithCompletionHandler:^(id result, NSError *error) { - AWSDDLogInfo(@"Welcome to AWS! You are connected successfully."); - AWSDDLogInfo(@"result = %@,error = %@", result, error); - }]; -} - @end diff --git a/AWSAuthSDK/Tests/AWSMobileClientCustomEndpointTest/AWSMobileClientCustomEndpointTest.swift b/AWSAuthSDK/Tests/AWSMobileClientCustomEndpointTest/AWSMobileClientCustomEndpointTest.swift index bb8056ff66c..7dc5697f2f3 100644 --- a/AWSAuthSDK/Tests/AWSMobileClientCustomEndpointTest/AWSMobileClientCustomEndpointTest.swift +++ b/AWSAuthSDK/Tests/AWSMobileClientCustomEndpointTest/AWSMobileClientCustomEndpointTest.swift @@ -16,7 +16,6 @@ class AWSMobileClientCustomEndpointTest: AWSMobileClientTestBase { } override func setUp() { - _ = AWSMobileClient.default().getCredentialsProvider() continueAfterFailure = false } diff --git a/AWSiOSSDKv2.xcodeproj/project.pbxproj b/AWSiOSSDKv2.xcodeproj/project.pbxproj index 12b0392368e..88f71373dc7 100644 --- a/AWSiOSSDKv2.xcodeproj/project.pbxproj +++ b/AWSiOSSDKv2.xcodeproj/project.pbxproj @@ -15367,7 +15367,10 @@ "$(inherited)", "$(PROJECT_DIR)/AWSLex/Bluefront", ); - OTHER_LDFLAGS = "-ObjC"; + OTHER_LDFLAGS = ( + "-ObjC", + "-ld64", + ); PRODUCT_BUNDLE_IDENTIFIER = com.amazonaws.sdk.ios.AWSLex; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -15393,7 +15396,10 @@ "$(inherited)", "$(PROJECT_DIR)/AWSLex/Bluefront", ); - OTHER_LDFLAGS = "-ObjC"; + OTHER_LDFLAGS = ( + "-ObjC", + "-ld64", + ); PRODUCT_BUNDLE_IDENTIFIER = com.amazonaws.sdk.ios.AWSLex; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; diff --git a/CHANGELOG.md b/CHANGELOG.md index e9243c0731d..1899e762b51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,13 @@ ## Unreleased --Features for next release +### Misc. Updates +- **AWSMobileClient** + - **Breaking API change** Removing the following deprecated methods: + - `interceptApplication(_:didFinishLaunchingWithOptions:)` + - `interceptApplication(_:didFinishLaunchingWithOptions:resumeSessionWithCompletionHandler:)` + - `setSignInProviders(_:)` + - `getCredentialsProvider()` ## 2.37.2