Skip to content

Commit d47d87f

Browse files
thisisabhashthisisabhash
authored
chore: kickoff release
2 parents 7b1d5ee + 1732349 commit d47d87f

33 files changed

+1368
-2093
lines changed

‎.github/composite_actions/get_platform_parameters/action.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ runs:
4141

4242
- id: get-xcode-version
4343
run: |
44-
LATEST_XCODE_VERSION=16.0.0
44+
LATEST_XCODE_VERSION=16.2.0
4545
MINIMUM_XCODE_VERSION=15.0.1
4646
4747
INPUT_XCODE_VERSION=${{ inputs.xcode_version }}
@@ -67,31 +67,31 @@ runs:
6767
case $INPUT_PLATFORM/$INPUT_XCODE_VERSION in
6868
iOS/latest)
6969
DEVICE="iPhone 16"
70-
OS_VERSION="18.0"
70+
OS_VERSION="18.2"
7171
;;
7272
iOS/*)
73-
DEVICE="iPhone 14"
74-
OS_VERSION="17.0.1"
73+
DEVICE="iPhone 15"
74+
OS_VERSION="17.0"
7575
;;
7676
tvOS/latest)
7777
DEVICE="Apple TV 4K (3rd generation)"
78-
OS_VERSION="18.0"
78+
OS_VERSION="18.2"
7979
;;
8080
tvOS/*)
8181
DEVICE="Apple TV 4K (3rd generation)"
8282
OS_VERSION="17.0"
8383
;;
8484
watchOS/latest)
8585
DEVICE="Apple Watch Series 10 (46mm)"
86-
OS_VERSION="11.0"
86+
OS_VERSION="11.2"
8787
;;
8888
watchOS/*)
89-
DEVICE="Apple Watch Series 8 (45mm)"
89+
DEVICE="Apple Watch Series 7 (45mm)"
9090
OS_VERSION="10.0"
9191
;;
9292
visionOS/latest)
9393
DEVICE="Apple Vision Pro"
94-
OS_VERSION="2.0"
94+
OS_VERSION="2.2"
9595
;;
9696
visionOS/*)
9797
DEVICE="Apple Vision Pro"

‎.github/workflows/build_scheme.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ jobs:
5656
5757
- name: Attempt to restore the build cache from main
5858
id: build-cache
59+
if: steps.dependencies-cache.outputs.cache-hit
5960
timeout-minutes: 4
6061
continue-on-error: true
6162
uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1

‎.github/workflows/codeql.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ jobs:
4747
with:
4848
languages: ${{ matrix.language }}
4949
config-file: ./.github/codeql/config.yml
50-
debug: true
5150

5251
- name: Perform CodeQL Analysis
5352
uses: github/codeql-action/analyze@822fe5ef9a15bd752ef127e9ff6eac38ec37dd9c

‎.github/workflows/integ_test_auth_webauthn.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ jobs:
5656
5757
- name: Attempt to restore the build cache
5858
id: build-cache
59+
if: steps.dependencies-cache.outputs.cache-hit
5960
timeout-minutes: 4
6061
continue-on-error: true
6162
uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1

‎.github/workflows/integ_test_push_notifications.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ permissions:
2626
jobs:
2727
push-notification-integration-tests:
2828
name: ${{ matrix.platform }} Tests | PushNotificationHostApp
29-
runs-on: macos-latest
29+
runs-on: macos-15
3030
timeout-minutes: 30
3131
environment: IntegrationTest
3232
strategy:
@@ -79,6 +79,7 @@ jobs:
7979
8080
- name: Attempt to restore the build cache
8181
id: build-cache
82+
if: steps.dependencies-cache.outputs.cache-hit
8283
timeout-minutes: 4
8384
continue-on-error: true
8485
uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1

‎.github/workflows/run_integration_tests.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ jobs:
8282
8383
- name: Attempt to restore the build cache
8484
id: build-cache
85+
if: steps.dependencies-cache.outputs.cache-hit
8586
timeout-minutes: 4
8687
continue-on-error: true
8788
uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1

‎.github/workflows/run_unit_tests.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ jobs:
7070
7171
- name: Attempt to restore the build cache
7272
id: build-cache
73+
if: steps.dependencies-cache.outputs.cache-hit
7374
timeout-minutes: 4
7475
continue-on-error: true
7576
uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1

‎.github/workflows/stress_test.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ concurrency:
1414

1515
jobs:
1616
prepare-for-test:
17-
runs-on: macos-latest
17+
runs-on: macos-15
1818
environment: IntegrationTest
1919
outputs:
2020
destination: ${{ steps.platform.outputs.destination }}
@@ -40,7 +40,7 @@ jobs:
4040

4141
auth-stress-test:
4242
needs: prepare-for-test
43-
runs-on: macos-latest
43+
runs-on: macos-15
4444
environment: IntegrationTest
4545
env:
4646
DESTINATION: ${{ needs.prepare-for-test.outputs.destination }}
@@ -71,7 +71,7 @@ jobs:
7171

7272
geo-stress-test:
7373
needs: prepare-for-test
74-
runs-on: macos-latest
74+
runs-on: macos-15
7575
environment: IntegrationTest
7676
env:
7777
DESTINATION: ${{ needs.prepare-for-test.outputs.destination }}
@@ -102,7 +102,7 @@ jobs:
102102

103103
storage-stress-test:
104104
needs: prepare-for-test
105-
runs-on: macos-latest
105+
runs-on: macos-15
106106
environment: IntegrationTest
107107
env:
108108
DESTINATION: ${{ needs.prepare-for-test.outputs.destination }}
@@ -133,7 +133,7 @@ jobs:
133133

134134
datastore-stress-test:
135135
needs: prepare-for-test
136-
runs-on: macos-latest
136+
runs-on: macos-15
137137
environment: IntegrationTest
138138
env:
139139
DESTINATION: ${{ needs.prepare-for-test.outputs.destination }}
@@ -164,7 +164,7 @@ jobs:
164164

165165
graphql-api-stress-test:
166166
needs: prepare-for-test
167-
runs-on: macos-latest
167+
runs-on: macos-15
168168
environment: IntegrationTest
169169
env:
170170
DESTINATION: ${{ needs.prepare-for-test.outputs.destination }}

‎Amplify/Categories/Auth/Models/AccessGroup.swift‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
//
2+
// Copyright Amazon.com Inc. or its affiliates.
3+
// All Rights Reserved.
4+
//
5+
// SPDX-License-Identifier: Apache-2.0
6+
//
7+
8+
import Foundation
9+
10+
/// A structure representing an access group for managing keychain items.
11+
public struct AccessGroup {
12+
/// The name of the access group.
13+
public let name: String?
14+
15+
/// A flag indicating whether to migrate keychain items.
16+
public let migrateKeychainItems: Bool
17+
18+
/**
19+
Initializes an `AccessGroup` with the specified name and migration option.
20+
21+
- Parameter name: The name of the access group.
22+
- Parameter migrateKeychainItemsOfUserSession: A flag indicating whether to migrate keychain items. Defaults to `false`.
23+
*/
24+
public init(name: String, migrateKeychainItemsOfUserSession: Bool = false) {
25+
self.init(name: name, migrateKeychainItems: migrateKeychainItemsOfUserSession)
26+
}
27+
28+
/**
29+
Creates an `AccessGroup` instance with no specified name.
30+
31+
- Parameter migrateKeychainItemsOfUserSession: A flag indicating whether to migrate keychain items.
32+
- Returns: An `AccessGroup` instance with the migration option set.
33+
*/
34+
public static func none(migrateKeychainItemsOfUserSession: Bool) -> AccessGroup {
35+
return .init(migrateKeychainItems: migrateKeychainItemsOfUserSession)
36+
}
37+
38+
/**
39+
A static property representing an `AccessGroup` with no name and no migration.
40+
41+
- Returns: An `AccessGroup` instance with no name and the migration option set to `false`.
42+
*/
43+
public static var none: AccessGroup {
44+
return .none(migrateKeychainItemsOfUserSession: false)
45+
}
46+
47+
private init(name: String? = nil, migrateKeychainItems: Bool) {
48+
self.name = name
49+
self.migrateKeychainItems = migrateKeychainItems
50+
}
51+
}

‎AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/AWSCognitoAuthPlugin+Configure.swift‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,11 @@ extension AWSCognitoAuthPlugin {
186186
}
187187

188188
private func makeCredentialStore() -> AmplifyAuthCredentialStoreBehavior {
189-
AWSCognitoAuthCredentialStore(authConfiguration: authConfiguration)
189+
return AWSCognitoAuthCredentialStore(
190+
authConfiguration: authConfiguration,
191+
accessGroup: secureStoragePreferences?.accessGroup?.name,
192+
migrateKeychainItemsOfUserSession: secureStoragePreferences?.accessGroup?.migrateKeychainItems ?? false
193+
)
190194
}
191195

192196
private func makeLegacyKeychainStore(service: String) -> KeychainStoreBehavior {

0 commit comments

Comments
 (0)