From 5e669fc1beb761585f0d980f82b95d4bc20a8db1 Mon Sep 17 00:00:00 2001 From: Elijah Quartey Date: Thu, 18 Jul 2024 12:48:56 -0500 Subject: [PATCH 1/7] fix(secure_storage): Add plugin platform entry. --- .../lib/src/amplify_secure_storage_dart.dart | 4 ++++ .../amplify_secure_storage_dart/pubspec.yaml | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/packages/secure_storage/amplify_secure_storage_dart/lib/src/amplify_secure_storage_dart.dart b/packages/secure_storage/amplify_secure_storage_dart/lib/src/amplify_secure_storage_dart.dart index 4a905ba53e..afc62bc7fe 100644 --- a/packages/secure_storage/amplify_secure_storage_dart/lib/src/amplify_secure_storage_dart.dart +++ b/packages/secure_storage/amplify_secure_storage_dart/lib/src/amplify_secure_storage_dart.dart @@ -64,6 +64,10 @@ class AmplifySecureStorageDart extends AmplifySecureStorageInterface ); }; } + + // Required to register the plugin on windows and linux platforms. + // https://docs.flutter.dev/packages-and-plugins/developing-packages#plugin-platforms + static void registerWith() {} } /// {@template amplify_secure_storage_dart.amplify_secure_storage_worker} diff --git a/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml b/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml index a460008f28..c926906142 100644 --- a/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml +++ b/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml @@ -48,3 +48,10 @@ flutter: assets: - lib/src/worker/workers.min.js - lib/src/worker/workers.min.js.map + plugin: + implements: amplify_secure_storage_dart + platforms: + linux: + dartPluginClass: AmplifySecureStorageDart + windows: + dartPluginClass: AmplifySecureStorageDart From a2b7e43359aeafe67e463293cfc80a713816f5aa Mon Sep 17 00:00:00 2001 From: Elijah Quartey Date: Thu, 18 Jul 2024 13:14:33 -0500 Subject: [PATCH 2/7] fix: alternative approach --- .../lib/src/amplify_secure_storage_dart.dart | 4 ---- .../secure_storage/amplify_secure_storage_dart/pubspec.yaml | 5 ++--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/secure_storage/amplify_secure_storage_dart/lib/src/amplify_secure_storage_dart.dart b/packages/secure_storage/amplify_secure_storage_dart/lib/src/amplify_secure_storage_dart.dart index afc62bc7fe..4a905ba53e 100644 --- a/packages/secure_storage/amplify_secure_storage_dart/lib/src/amplify_secure_storage_dart.dart +++ b/packages/secure_storage/amplify_secure_storage_dart/lib/src/amplify_secure_storage_dart.dart @@ -64,10 +64,6 @@ class AmplifySecureStorageDart extends AmplifySecureStorageInterface ); }; } - - // Required to register the plugin on windows and linux platforms. - // https://docs.flutter.dev/packages-and-plugins/developing-packages#plugin-platforms - static void registerWith() {} } /// {@template amplify_secure_storage_dart.amplify_secure_storage_worker} diff --git a/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml b/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml index c926906142..aedd559d22 100644 --- a/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml +++ b/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml @@ -49,9 +49,8 @@ flutter: - lib/src/worker/workers.min.js - lib/src/worker/workers.min.js.map plugin: - implements: amplify_secure_storage_dart platforms: linux: - dartPluginClass: AmplifySecureStorageDart + default_package: amplify_secure_storage_dart windows: - dartPluginClass: AmplifySecureStorageDart + default_package: amplify_secure_storage_dart From f6b49e8efc976b323d6e340456a1ed06eb5b3563 Mon Sep 17 00:00:00 2001 From: Elijah Quartey Date: Fri, 19 Jul 2024 14:06:16 -0500 Subject: [PATCH 3/7] fix: based on flutter team guidance. --- .../lib/src/amplify_secure_storage.vm.dart | 6 ++++++ packages/secure_storage/amplify_secure_storage/pubspec.yaml | 6 +++--- .../secure_storage/amplify_secure_storage_dart/pubspec.yaml | 6 ------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/secure_storage/amplify_secure_storage/lib/src/amplify_secure_storage.vm.dart b/packages/secure_storage/amplify_secure_storage/lib/src/amplify_secure_storage.vm.dart index d55e84e6be..c43b121203 100644 --- a/packages/secure_storage/amplify_secure_storage/lib/src/amplify_secure_storage.vm.dart +++ b/packages/secure_storage/amplify_secure_storage/lib/src/amplify_secure_storage.vm.dart @@ -161,4 +161,10 @@ class AmplifySecureStorage extends AmplifySecureStorageInterface { } } } + + // Required to method for endorse dartPluginClass from the pubspec.yaml plugin definition + // https://github.com/flutter/flutter/issues/152037#issuecomment-2239909463 + static void register() { + // no-op + } } diff --git a/packages/secure_storage/amplify_secure_storage/pubspec.yaml b/packages/secure_storage/amplify_secure_storage/pubspec.yaml index c3a40643d6..ca918705d2 100644 --- a/packages/secure_storage/amplify_secure_storage/pubspec.yaml +++ b/packages/secure_storage/amplify_secure_storage/pubspec.yaml @@ -37,8 +37,8 @@ flutter: macos: pluginClass: AmplifySecureStoragePlugin windows: - default_package: amplify_secure_storage_dart + dartPluginClass: AmplifySecureStoragePlugin linux: - default_package: amplify_secure_storage_dart + dartPluginClass: AmplifySecureStoragePlugin web: - default_package: amplify_secure_storage_dart + pluginClass: AmplifySecureStoragePlugin diff --git a/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml b/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml index aedd559d22..a460008f28 100644 --- a/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml +++ b/packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml @@ -48,9 +48,3 @@ flutter: assets: - lib/src/worker/workers.min.js - lib/src/worker/workers.min.js.map - plugin: - platforms: - linux: - default_package: amplify_secure_storage_dart - windows: - default_package: amplify_secure_storage_dart From 4ab66bf49b9560ac39563f819de71301f9054314 Mon Sep 17 00:00:00 2001 From: Elijah Quartey Date: Mon, 22 Jul 2024 10:10:14 -0500 Subject: [PATCH 4/7] added missing fileName --- packages/secure_storage/amplify_secure_storage/pubspec.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/secure_storage/amplify_secure_storage/pubspec.yaml b/packages/secure_storage/amplify_secure_storage/pubspec.yaml index ca918705d2..e55816cdb2 100644 --- a/packages/secure_storage/amplify_secure_storage/pubspec.yaml +++ b/packages/secure_storage/amplify_secure_storage/pubspec.yaml @@ -42,3 +42,4 @@ flutter: dartPluginClass: AmplifySecureStoragePlugin web: pluginClass: AmplifySecureStoragePlugin + fileName: amplify_secure_storage.dart From 84a5e0109479d44998ab907b32abc7b115112012 Mon Sep 17 00:00:00 2001 From: Elijah Quartey Date: Mon, 22 Jul 2024 10:32:44 -0500 Subject: [PATCH 5/7] fix: build --- .../lib/src/amplify_secure_storage.vm.dart | 2 +- packages/secure_storage/amplify_secure_storage/pubspec.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/secure_storage/amplify_secure_storage/lib/src/amplify_secure_storage.vm.dart b/packages/secure_storage/amplify_secure_storage/lib/src/amplify_secure_storage.vm.dart index c43b121203..2dbb58a5e7 100644 --- a/packages/secure_storage/amplify_secure_storage/lib/src/amplify_secure_storage.vm.dart +++ b/packages/secure_storage/amplify_secure_storage/lib/src/amplify_secure_storage.vm.dart @@ -164,7 +164,7 @@ class AmplifySecureStorage extends AmplifySecureStorageInterface { // Required to method for endorse dartPluginClass from the pubspec.yaml plugin definition // https://github.com/flutter/flutter/issues/152037#issuecomment-2239909463 - static void register() { + static void registerWith() { // no-op } } diff --git a/packages/secure_storage/amplify_secure_storage/pubspec.yaml b/packages/secure_storage/amplify_secure_storage/pubspec.yaml index e55816cdb2..ca362113ac 100644 --- a/packages/secure_storage/amplify_secure_storage/pubspec.yaml +++ b/packages/secure_storage/amplify_secure_storage/pubspec.yaml @@ -37,9 +37,9 @@ flutter: macos: pluginClass: AmplifySecureStoragePlugin windows: - dartPluginClass: AmplifySecureStoragePlugin + pluginClass: AmplifySecureStoragePlugin linux: - dartPluginClass: AmplifySecureStoragePlugin + pluginClass: AmplifySecureStoragePlugin web: pluginClass: AmplifySecureStoragePlugin fileName: amplify_secure_storage.dart From 8c4732edcaed1c891f595db134846fd6ac773a23 Mon Sep 17 00:00:00 2001 From: Elijah Quartey Date: Mon, 22 Jul 2024 10:52:28 -0500 Subject: [PATCH 6/7] remove plugin def --- .../lib/src/amplify_secure_storage.vm.dart | 6 ------ .../amplify_secure_storage/pubspec.yaml | 18 ------------------ 2 files changed, 24 deletions(-) diff --git a/packages/secure_storage/amplify_secure_storage/lib/src/amplify_secure_storage.vm.dart b/packages/secure_storage/amplify_secure_storage/lib/src/amplify_secure_storage.vm.dart index 2dbb58a5e7..d55e84e6be 100644 --- a/packages/secure_storage/amplify_secure_storage/lib/src/amplify_secure_storage.vm.dart +++ b/packages/secure_storage/amplify_secure_storage/lib/src/amplify_secure_storage.vm.dart @@ -161,10 +161,4 @@ class AmplifySecureStorage extends AmplifySecureStorageInterface { } } } - - // Required to method for endorse dartPluginClass from the pubspec.yaml plugin definition - // https://github.com/flutter/flutter/issues/152037#issuecomment-2239909463 - static void registerWith() { - // no-op - } } diff --git a/packages/secure_storage/amplify_secure_storage/pubspec.yaml b/packages/secure_storage/amplify_secure_storage/pubspec.yaml index ca362113ac..6fa241d80b 100644 --- a/packages/secure_storage/amplify_secure_storage/pubspec.yaml +++ b/packages/secure_storage/amplify_secure_storage/pubspec.yaml @@ -25,21 +25,3 @@ dev_dependencies: flutter_test: sdk: flutter pigeon: ^11.0.0 - -flutter: - plugin: - platforms: - android: - package: com.amazonaws.amplify.amplify_secure_storage - pluginClass: AmplifySecureStoragePlugin - ios: - pluginClass: AmplifySecureStoragePlugin - macos: - pluginClass: AmplifySecureStoragePlugin - windows: - pluginClass: AmplifySecureStoragePlugin - linux: - pluginClass: AmplifySecureStoragePlugin - web: - pluginClass: AmplifySecureStoragePlugin - fileName: amplify_secure_storage.dart From 5dcfdf398e816c8c0fdeeb575aa08408be251df9 Mon Sep 17 00:00:00 2001 From: Elijah Quartey Date: Mon, 22 Jul 2024 11:24:49 -0500 Subject: [PATCH 7/7] fix: added ios and android plugin def --- .../secure_storage/amplify_secure_storage/pubspec.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/secure_storage/amplify_secure_storage/pubspec.yaml b/packages/secure_storage/amplify_secure_storage/pubspec.yaml index 6fa241d80b..4cb88d5906 100644 --- a/packages/secure_storage/amplify_secure_storage/pubspec.yaml +++ b/packages/secure_storage/amplify_secure_storage/pubspec.yaml @@ -25,3 +25,12 @@ dev_dependencies: flutter_test: sdk: flutter pigeon: ^11.0.0 + +flutter: + plugin: + platforms: + android: + package: com.amazonaws.amplify.amplify_secure_storage + pluginClass: AmplifySecureStoragePlugin + ios: + pluginClass: AmplifySecureStoragePlugin