update native plugins to pass Gen 2 config to Amplify.configure()

aws-amplify · Jun 24, 2024 · a9cb8f8 · a9cb8f8
1 parent 9dc9c24
commit a9cb8f8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/packages/amplify_datastore/android/build.gradle b/packages/amplify_datastore/android/build.gradle
@@ -73,10 +73,10 @@ android {
 }
 
 dependencies {
-    implementation 'com.amplifyframework:aws-auth-cognito:2.19.0'
-    implementation "com.amplifyframework:aws-api:2.19.0"
-    implementation "com.amplifyframework:aws-datastore:2.19.0"
-    implementation "com.amplifyframework:aws-api-appsync:2.19.0"
+    implementation 'com.amplifyframework:aws-auth-cognito:2.19.1'
+    implementation "com.amplifyframework:aws-api:2.19.1"
+    implementation "com.amplifyframework:aws-datastore:2.19.1"
+    implementation "com.amplifyframework:aws-api-appsync:2.19.1"
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1'
 

diff --git a/...android/src/main/kotlin/com/amazonaws/amplify/amplify_datastore/AmplifyDataStorePlugin.kt b/...android/src/main/kotlin/com/amazonaws/amplify/amplify_datastore/AmplifyDataStorePlugin.kt
@@ -31,13 +31,15 @@ import com.amazonaws.amplify.amplify_datastore.util.cast
 import com.amazonaws.amplify.amplify_datastore.util.safeCastToList
 import com.amazonaws.amplify.amplify_datastore.util.safeCastToMap
 import com.amplifyframework.AmplifyException
+import com.amplifyframework.annotations.AmplifyFlutterApi
 import com.amplifyframework.api.aws.AWSApiPlugin
 import com.amplifyframework.api.aws.AuthModeStrategyType
 import com.amplifyframework.api.aws.AuthorizationType
 import com.amplifyframework.auth.AuthUser
 import com.amplifyframework.core.Amplify
 import com.amplifyframework.core.AmplifyConfiguration
 import com.amplifyframework.core.async.Cancelable
+import com.amplifyframework.core.configuration.AmplifyOutputs
 import com.amplifyframework.core.model.CustomTypeSchema
 import com.amplifyframework.core.model.Model
 import com.amplifyframework.core.model.ModelSchema
@@ -937,11 +939,9 @@ class AmplifyDataStorePlugin :
     ) {
         coroutineScope.launch(dispatcher) {
             try {
-                val configuration = AmplifyConfiguration.builder(JSONObject(config))
-                    .addPlatform(UserAgent.Platform.FLUTTER, "$version /datastore")
-                    .devMenuEnabled(false)
-                    .build()
-                Amplify.configure(configuration, context)
+                @OptIn(AmplifyFlutterApi::class)
+                Amplify.addUserAgentPlatform(UserAgent.Platform.FLUTTER, "$version /datastore")
+                Amplify.configure(AmplifyOutputs(config), context)
                 withContext(Dispatchers.Main) {
                     callback(kotlin.Result.success(Unit))
                 }

diff --git a/packages/amplify_datastore/ios/Classes/SwiftAmplifyDataStorePlugin.swift b/packages/amplify_datastore/ios/Classes/SwiftAmplifyDataStorePlugin.swift
@@ -145,11 +145,9 @@ public class SwiftAmplifyDataStorePlugin: NSObject, FlutterPlugin, NativeAmplify
                     nil
                 )
             }
-            let amplifyConfiguration = try JSONDecoder().decode(AmplifyConfiguration.self,
-                                                                from: data)
             // TODO: Migrate to Async Swift v2
             //            AmplifyAWSServiceConfiguration.addUserAgentPlatform(.flutter, version: "\(version) /datastore")
-            try Amplify.configure(amplifyConfiguration)
+            try Amplify.configure(with : .data(data))
             return completion(.success(()))
         } catch let error as ConfigurationError {
             switch error {

diff --git a/packages/notifications/push/amplify_push_notifications/android/build.gradle b/packages/notifications/push/amplify_push_notifications/android/build.gradle
@@ -65,7 +65,7 @@ android {
 dependencies {
     api "com.google.firebase:firebase-messaging:23.2.0"
     // Import support library for Amplify push utils
-    implementation 'com.amplifyframework:aws-push-notifications-pinpoint-common:2.19.0'
+    implementation 'com.amplifyframework:aws-push-notifications-pinpoint-common:2.19.1'
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1"
     implementation project(path: ':flutter_plugin_android_lifecycle')
     implementation 'androidx.test:core-ktx:1.5.0'