Skip to content

Commit 1547926

Browse files
authored
chore: kickoff release
2 parents adf5a2e + 038733f commit 1547926

File tree

128 files changed

+5944
-278
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+5944
-278
lines changed

Amplify/Categories/API/Internal/APICategory+CategoryConfigurable.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,10 @@ extension APICategory: CategoryConfigurable {
2525
try configure(using: categoryConfiguration(from: amplifyConfiguration))
2626
}
2727

28+
func configure(using amplifyOutputs: AmplifyOutputsData) throws {
29+
for plugin in Array(plugins.values) {
30+
try plugin.configure(using: amplifyOutputs)
31+
}
32+
isConfigured = true
33+
}
2834
}

Amplify/Categories/Analytics/Internal/AnalyticsCategory+CategoryConfigurable.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,10 @@ extension AnalyticsCategory: CategoryConfigurable {
2525
try configure(using: categoryConfiguration(from: amplifyConfiguration))
2626
}
2727

28+
func configure(using amplifyOutputs: AmplifyOutputsData) throws {
29+
for plugin in Array(plugins.values) {
30+
try plugin.configure(using: amplifyOutputs)
31+
}
32+
isConfigured = true
33+
}
2834
}

Amplify/Categories/Auth/Internal/AuthCategory+CategoryConfigurable.swift

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,11 @@ extension AuthCategory: CategoryConfigurable {
2626
func configure(using amplifyConfiguration: AmplifyConfiguration) throws {
2727
try configure(using: categoryConfiguration(from: amplifyConfiguration))
2828
}
29+
30+
func configure(using amplifyOutputs: AmplifyOutputsData) throws {
31+
for plugin in Array(plugins.values) {
32+
try plugin.configure(using: amplifyOutputs)
33+
}
34+
isConfigured = true
35+
}
2936
}

Amplify/Categories/DataStore/Internal/DataStoreCategory+Configurable.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ extension DataStoreCategory: CategoryConfigurable {
1515
}
1616
}
1717

18+
func configure(using amplifyConfiguration: AmplifyOutputsData) throws {
19+
try configureFirstWithEmptyConfiguration()
20+
}
21+
1822
func configure(using configuration: CategoryConfiguration?) throws {
1923
guard !isConfigured else {
2024
let error = ConfigurationError.amplifyAlreadyConfigured(

Amplify/Categories/Geo/Internal/GeoCategory+CategoryConfigurable.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,10 @@ extension GeoCategory: CategoryConfigurable {
2525
try configure(using: categoryConfiguration(from: amplifyConfiguration))
2626
}
2727

28+
func configure(using amplifyOutputs: AmplifyOutputsData) throws {
29+
for plugin in Array(plugins.values) {
30+
try plugin.configure(using: amplifyOutputs)
31+
}
32+
isConfigured = true
33+
}
2834
}

Amplify/Categories/Hub/Internal/HubCategory+CategoryConfigurable.swift

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,19 @@ extension HubCategory: CategoryConfigurable {
2727
try configure(using: categoryConfiguration(from: amplifyConfiguration))
2828
}
2929

30+
func configure(using amplifyOutputs: AmplifyOutputsData) throws {
31+
guard configurationState.get() != .configured else {
32+
let error = ConfigurationError.amplifyAlreadyConfigured(
33+
"\(categoryType.displayName) has already been configured.",
34+
"Remove the duplicate call to `Amplify.configure()`"
35+
)
36+
throw error
37+
}
38+
39+
for plugin in Array(plugins.values) {
40+
try plugin.configure(using: amplifyOutputs)
41+
}
42+
configurationState.set(.configured)
43+
}
44+
3045
}

Amplify/Categories/Logging/Internal/LoggingCategory+CategoryConfigurable.swift

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,30 @@ extension LoggingCategory: CategoryConfigurable {
3939
try configure(using: categoryConfiguration(from: amplifyConfiguration))
4040
}
4141

42+
func configure(using amplifyOutputs: AmplifyOutputsData) throws {
43+
let plugin: LoggingCategoryPlugin
44+
switch configurationState {
45+
case .default:
46+
// Default plugin is already assigned, and no configuration is applicable, exit early
47+
configurationState = .configured
48+
return
49+
case .pendingConfiguration(let pendingPlugin):
50+
plugin = pendingPlugin
51+
case .configured:
52+
let error = ConfigurationError.amplifyAlreadyConfigured(
53+
"\(categoryType.displayName) has already been configured.",
54+
"Remove the duplicate call to `Amplify.configure()`"
55+
)
56+
throw error
57+
}
58+
59+
try plugin.configure(using: amplifyOutputs)
60+
self.plugins[plugin.key] = plugin
61+
62+
if plugin.key != AWSUnifiedLoggingPlugin.key, let consolePlugin = try? self.getPlugin(for: AWSUnifiedLoggingPlugin.key) {
63+
try consolePlugin.configure(using: amplifyOutputs)
64+
}
65+
66+
configurationState = .configured
67+
}
4268
}

Amplify/Categories/Notifications/PushNotifications/Internal/PushNotificationsCategory+CategoryConfigurable.swift

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,11 @@ extension PushNotificationsCategory: CategoryConfigurable {
2323
func configure(using amplifyConfiguration: AmplifyConfiguration) throws {
2424
try configure(using: categoryConfiguration(from: amplifyConfiguration))
2525
}
26+
27+
func configure(using amplifyOutputs: AmplifyOutputsData) throws {
28+
for plugin in Array(plugins.values) {
29+
try plugin.configure(using: amplifyOutputs)
30+
}
31+
isConfigured = true
32+
}
2633
}

Amplify/Categories/Predictions/Internal/PredictionsCategory+CategoryConfigurable.swift

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,11 @@ extension PredictionsCategory: CategoryConfigurable {
2525
try configure(using: categoryConfiguration(from: amplifyConfiguration))
2626
}
2727

28+
func configure(using amplifyOutputs: AmplifyOutputsData) throws {
29+
for plugin in Array(plugins.values) {
30+
try plugin.configure(using: amplifyOutputs)
31+
}
32+
isConfigured = true
33+
}
34+
2835
}

Amplify/Categories/Storage/Internal/StorageCategory+CategoryConfigurable.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,10 @@ extension StorageCategory: CategoryConfigurable {
2525
try configure(using: categoryConfiguration(from: amplifyConfiguration))
2626
}
2727

28+
func configure(using amplifyOutputs: AmplifyOutputsData) throws {
29+
for plugin in Array(plugins.values) {
30+
try plugin.configure(using: amplifyOutputs)
31+
}
32+
isConfigured = true
33+
}
2834
}

0 commit comments

Comments
 (0)