From bdd3adbea09f54bb0f1a9c86cf2109182593c554 Mon Sep 17 00:00:00 2001 From: Kha Truong <64438356+khatruong2009@users.noreply.github.com> Date: Wed, 24 Jan 2024 16:19:55 -0800 Subject: [PATCH 01/16] chore: renamed aws_logging_cloudwatch --- .github/dependabot.yaml | 32 ++---- .../workflows/amplify_logging_cloudwatch.yaml | 26 ++--- .../amplify_logging_cloudwatch_dart.yaml | 103 ++++++++++++++++++ .../amplify_logging_cloudwatch_example.yaml | 34 +++--- .../amplify_logging_cloudwatch/.gitignore | 0 .../amplify_logging_cloudwatch/CHANGELOG.md | 0 .../amplify_logging_cloudwatch/LICENSE | 0 .../amplify_logging_cloudwatch/README.md | 0 .../analysis_options.yaml | 0 .../example/.gitignore | 0 .../example/.metadata | 0 .../example/LICENSE | 0 .../example/README.md | 0 .../example/analysis_options.yaml | 0 .../example/android/.gitignore | 0 .../example/android/app/build.gradle | 0 .../android/app/src/debug/AndroidManifest.xml | 0 .../android/app/src/main/AndroidManifest.xml | 0 .../MainActivity.kt | 0 .../res/drawable-v21/launch_background.xml | 0 .../main/res/drawable/launch_background.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../app/src/main/res/values-night/styles.xml | 0 .../app/src/main/res/values/styles.xml | 0 .../app/src/profile/AndroidManifest.xml | 0 .../example/android/build.gradle | 0 .../example/android/gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.properties | 0 .../example/android/settings.gradle | 0 .../example/ios/.gitignore | 0 .../ios/Flutter/AppFrameworkInfo.plist | 0 .../example/ios/Flutter/Debug.xcconfig | 0 .../example/ios/Flutter/Release.xcconfig | 0 .../example/ios/Podfile | 0 .../ios/Runner.xcodeproj/project.pbxproj | 0 .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../xcshareddata/WorkspaceSettings.xcsettings | 0 .../xcshareddata/xcschemes/Runner.xcscheme | 0 .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../xcshareddata/WorkspaceSettings.xcsettings | 0 .../example/ios/Runner/AppDelegate.swift | 0 .../AppIcon.appiconset/Contents.json | 0 .../Icon-App-1024x1024@1x.png | Bin .../AppIcon.appiconset/Icon-App-20x20@1x.png | Bin .../AppIcon.appiconset/Icon-App-20x20@2x.png | Bin .../AppIcon.appiconset/Icon-App-20x20@3x.png | Bin .../AppIcon.appiconset/Icon-App-29x29@1x.png | Bin .../AppIcon.appiconset/Icon-App-29x29@2x.png | Bin .../AppIcon.appiconset/Icon-App-29x29@3x.png | Bin .../AppIcon.appiconset/Icon-App-40x40@1x.png | Bin .../AppIcon.appiconset/Icon-App-40x40@2x.png | Bin .../AppIcon.appiconset/Icon-App-40x40@3x.png | Bin .../AppIcon.appiconset/Icon-App-60x60@2x.png | Bin .../AppIcon.appiconset/Icon-App-60x60@3x.png | Bin .../AppIcon.appiconset/Icon-App-76x76@1x.png | Bin .../AppIcon.appiconset/Icon-App-76x76@2x.png | Bin .../Icon-App-83.5x83.5@2x.png | Bin .../LaunchImage.imageset/Contents.json | 0 .../LaunchImage.imageset/LaunchImage.png | Bin .../LaunchImage.imageset/LaunchImage@2x.png | Bin .../LaunchImage.imageset/LaunchImage@3x.png | Bin .../LaunchImage.imageset/README.md | 0 .../Runner/Base.lproj/LaunchScreen.storyboard | 0 .../ios/Runner/Base.lproj/Main.storyboard | 0 .../example/ios/Runner/Info.plist | 0 .../ios/Runner/Runner-Bridging-Header.h | 0 .../lib/amplifyconfiguration_logging.dart | 0 .../example/lib/homepage.dart | 0 .../example/lib/main.dart | 0 .../example/linux/.gitignore | 0 .../example/linux/CMakeLists.txt | 0 .../example/linux/flutter/CMakeLists.txt | 0 .../flutter/generated_plugin_registrant.cc | 0 .../flutter/generated_plugin_registrant.h | 0 .../linux/flutter/generated_plugins.cmake | 0 .../example/linux/main.cc | 0 .../example/linux/my_application.cc | 0 .../example/linux/my_application.h | 0 .../example/macos/.gitignore | 0 .../macos/Flutter/Flutter-Debug.xcconfig | 0 .../macos/Flutter/Flutter-Release.xcconfig | 0 .../Flutter/GeneratedPluginRegistrant.swift | 2 +- .../example/macos/Podfile | 0 .../macos/Runner.xcodeproj/project.pbxproj | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../xcshareddata/xcschemes/Runner.xcscheme | 0 .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../example/macos/Runner/AppDelegate.swift | 0 .../AppIcon.appiconset/Contents.json | 0 .../AppIcon.appiconset/app_icon_1024.png | Bin .../AppIcon.appiconset/app_icon_128.png | Bin .../AppIcon.appiconset/app_icon_16.png | Bin .../AppIcon.appiconset/app_icon_256.png | Bin .../AppIcon.appiconset/app_icon_32.png | Bin .../AppIcon.appiconset/app_icon_512.png | Bin .../AppIcon.appiconset/app_icon_64.png | Bin .../macos/Runner/Base.lproj/MainMenu.xib | 0 .../macos/Runner/Configs/AppInfo.xcconfig | 0 .../macos/Runner/Configs/Debug.xcconfig | 0 .../macos/Runner/Configs/Release.xcconfig | 0 .../macos/Runner/Configs/Warnings.xcconfig | 0 .../macos/Runner/DebugProfile.entitlements | 0 .../example/macos/Runner/Info.plist | 0 .../macos/Runner/MainFlutterWindow.swift | 0 .../example/macos/Runner/Release.entitlements | 0 .../example/pubspec.yaml | 0 .../example/web/favicon.png | Bin .../example/web/icons/Icon-192.png | Bin .../example/web/icons/Icon-512.png | Bin .../example/web/icons/Icon-maskable-192.png | Bin .../example/web/icons/Icon-maskable-512.png | Bin .../example/web/index.html | 0 .../example/web/manifest.json | 0 .../example/windows/.gitignore | 0 .../example/windows/CMakeLists.txt | 0 .../example/windows/flutter/CMakeLists.txt | 0 .../flutter/generated_plugin_registrant.cc | 0 .../flutter/generated_plugin_registrant.h | 0 .../windows/flutter/generated_plugins.cmake | 0 .../example/windows/runner/CMakeLists.txt | 0 .../example/windows/runner/Runner.rc | 0 .../example/windows/runner/flutter_window.cpp | 0 .../example/windows/runner/flutter_window.h | 0 .../example/windows/runner/main.cpp | 0 .../example/windows/runner/resource.h | 0 .../windows/runner/resources/app_icon.ico | Bin .../windows/runner/runner.exe.manifest | 0 .../example/windows/runner/utils.cpp | 0 .../example/windows/runner/utils.h | 0 .../example/windows/runner/win32_window.cpp | 0 .../example/windows/runner/win32_window.h | 0 .../lib/amplify_logging_cloudwatch.dart | 2 +- .../src/amplify_log_stream_name_provider.dart | 0 .../src/amplify_logging_cloudwatch_impl.dart} | 6 +- .../lib/src/device_info/device_info.dart | 0 .../lib/src/device_info/device_info.stub.dart | 0 .../lib/src/device_info/device_info.vm.dart | 0 .../lib/src/device_info/device_info.web.dart | 0 .../path_provider/flutter_path_provider.dart | 0 .../amplify_logging_cloudwatch/pubspec.yaml | 3 +- .../amplify_log_stream_provider_test.dart | 0 .../.gitignore | 0 .../CHANGELOG.md | 0 .../amplify_logging_cloudwatch_dart}/LICENSE | 0 .../amplify_logging_cloudwatch_dart/README.md | 1 + .../analysis_options.yaml | 0 .../com.amplify.logging_cached_logs.sqlite | Bin .../example/.gitignore | 0 .../example/LICENSE | 0 .../example/README.md | 1 + .../example/analysis_options.yaml | 0 .../example/bin/main.dart | 0 .../example/pubspec.yaml | 6 +- .../example/web/favicon-180x180.png | Bin .../example/web/favicon.png | Bin .../example/web/index.html | 0 .../example/web/main.dart | 0 .../example/web/styles.css | 0 .../lib/amplify_logging_cloudwatch_dart.dart} | 6 +- ...amplify_logging_cloudwatch_dart_impl.dart} | 21 ++-- .../lib/src/file_storage/file_storage.dart | 2 +- .../src/file_storage/file_storage_stub.dart | 2 +- .../lib/src/file_storage/file_storage_vm.dart | 2 +- .../src/file_storage/file_storage_web.dart | 2 +- .../lib/src/log_stream_provider.dart | 10 +- .../src/path_provider/app_path_provider.dart | 0 .../path_provider/app_path_provider_html.dart | 6 +- .../path_provider/app_path_provider_io.dart | 6 +- .../path_provider/app_path_provider_stub.dart | 6 +- .../dart_queued_item_store.dart | 0 .../dart_queued_item_store.stub.dart | 2 +- .../dart_queued_item_store.vm.dart | 4 +- .../dart_queued_item_store.web.dart | 6 +- .../drift/drift_queued_item_store.dart | 2 +- .../drift/drift_queued_item_store.g.dart | 0 .../in_memory_queued_item_store.dart | 6 +- .../index_db/indexed_db_adapter.dart | 2 +- .../queued_item_store/queued_item_store.dart | 4 +- .../lib/src/remote_constraint_provider.dart | 12 +- .../lib/src/sdk/cloud_watch_logs.dart | 28 ++--- .../cloud_watch_logs_client.dart | 17 ++- .../common/endpoint_resolver.dart | 2 +- .../cloud_watch_logs/common/serializers.dart | 53 +++++++++ .../model/create_log_stream_request.dart | 2 +- .../model/create_log_stream_request.g.dart | 0 .../data_already_accepted_exception.dart | 2 +- .../data_already_accepted_exception.g.dart | 0 .../model/input_log_event.dart | 2 +- .../model/input_log_event.g.dart | 0 .../model/invalid_parameter_exception.dart | 2 +- .../model/invalid_parameter_exception.g.dart | 0 .../invalid_sequence_token_exception.dart | 2 +- .../invalid_sequence_token_exception.g.dart | 0 .../model/put_log_events_request.dart | 7 +- .../model/put_log_events_request.g.dart | 0 .../model/put_log_events_response.dart | 5 +- .../model/put_log_events_response.g.dart | 0 .../model/rejected_log_events_info.dart | 2 +- .../model/rejected_log_events_info.g.dart | 0 .../resource_already_exists_exception.dart | 2 +- .../resource_already_exists_exception.g.dart | 0 .../model/resource_not_found_exception.dart | 2 +- .../model/resource_not_found_exception.g.dart | 0 .../model/service_unavailable_exception.dart | 2 +- .../service_unavailable_exception.g.dart | 0 .../model/unrecognized_client_exception.dart | 2 +- .../unrecognized_client_exception.g.dart | 0 .../create_log_stream_operation.dart | 27 +++-- .../operation/put_log_events_operation.dart | 36 +++--- .../lib/src/stoppable_timer.dart | 4 +- .../pubspec.yaml | 2 +- .../amplify_logging_cloudwatch_dart}/sdk.yaml | 0 .../test/aws_logging_cloudwatch_test.dart | 2 +- .../test/cloudwatch_logger_plugin_test.dart | 6 +- .../test/mocks.dart | 6 +- .../queued_item_store_test.dart | 8 +- .../test/remote_constraint_provider_test.dart | 2 +- .../aws_logging_cloudwatch/README.md | 1 - .../aws_logging_cloudwatch/example/README.md | 1 - .../cloud_watch_logs/common/serializers.dart | 41 ------- 227 files changed, 358 insertions(+), 227 deletions(-) create mode 100644 .github/workflows/amplify_logging_cloudwatch_dart.yaml rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/.gitignore (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/CHANGELOG.md (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/LICENSE (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/README.md (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/analysis_options.yaml (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/.gitignore (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/.metadata (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/LICENSE (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/README.md (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/analysis_options.yaml (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/android/.gitignore (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/android/app/build.gradle (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/android/app/src/debug/AndroidManifest.xml (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/android/app/src/main/AndroidManifest.xml (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/android/app/src/main/kotlin/com/amazonaws/amplify/amplify_logging_cloudwatch_example/MainActivity.kt (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/android/app/src/main/res/drawable-v21/launch_background.xml (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/android/app/src/main/res/drawable/launch_background.xml (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/android/app/src/main/res/values-night/styles.xml (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/android/app/src/main/res/values/styles.xml (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/android/app/src/profile/AndroidManifest.xml (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/android/build.gradle (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/android/gradle.properties (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/android/gradle/wrapper/gradle-wrapper.properties (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/android/settings.gradle (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/.gitignore (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Flutter/AppFrameworkInfo.plist (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Flutter/Debug.xcconfig (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Flutter/Release.xcconfig (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Podfile (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner.xcodeproj/project.pbxproj (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner.xcworkspace/contents.xcworkspacedata (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner/AppDelegate.swift (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner/Base.lproj/LaunchScreen.storyboard (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner/Base.lproj/Main.storyboard (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner/Info.plist (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/ios/Runner/Runner-Bridging-Header.h (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/lib/amplifyconfiguration_logging.dart (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/lib/homepage.dart (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/lib/main.dart (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/linux/.gitignore (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/linux/CMakeLists.txt (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/linux/flutter/CMakeLists.txt (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/linux/flutter/generated_plugin_registrant.cc (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/linux/flutter/generated_plugin_registrant.h (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/linux/flutter/generated_plugins.cmake (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/linux/main.cc (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/linux/my_application.cc (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/linux/my_application.h (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/macos/.gitignore (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/macos/Flutter/Flutter-Debug.xcconfig (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/macos/Flutter/Flutter-Release.xcconfig (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/macos/Flutter/GeneratedPluginRegistrant.swift (88%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/macos/Podfile (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/macos/Runner.xcodeproj/project.pbxproj (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/macos/Runner.xcworkspace/contents.xcworkspacedata (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/macos/Runner/AppDelegate.swift (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/macos/Runner/Base.lproj/MainMenu.xib (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/macos/Runner/Configs/AppInfo.xcconfig (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/macos/Runner/Configs/Debug.xcconfig (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/macos/Runner/Configs/Release.xcconfig (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/macos/Runner/Configs/Warnings.xcconfig (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/macos/Runner/DebugProfile.entitlements (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/macos/Runner/Info.plist (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/macos/Runner/MainFlutterWindow.swift (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/macos/Runner/Release.entitlements (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/pubspec.yaml (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/web/favicon.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/web/icons/Icon-192.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/web/icons/Icon-512.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/web/icons/Icon-maskable-192.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/web/icons/Icon-maskable-512.png (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/web/index.html (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/web/manifest.json (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/windows/.gitignore (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/windows/CMakeLists.txt (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/windows/flutter/CMakeLists.txt (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/windows/flutter/generated_plugin_registrant.cc (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/windows/flutter/generated_plugin_registrant.h (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/windows/flutter/generated_plugins.cmake (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/windows/runner/CMakeLists.txt (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/windows/runner/Runner.rc (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/windows/runner/flutter_window.cpp (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/windows/runner/flutter_window.h (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/windows/runner/main.cpp (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/windows/runner/resource.h (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/windows/runner/resources/app_icon.ico (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/windows/runner/runner.exe.manifest (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/windows/runner/utils.cpp (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/windows/runner/utils.h (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/windows/runner/win32_window.cpp (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/example/windows/runner/win32_window.h (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/lib/amplify_logging_cloudwatch.dart (56%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/lib/src/amplify_log_stream_name_provider.dart (100%) rename packages/{logging_cloudwatch/amplify_logging_cloudwatch/lib/src/amplify_cloudwatch_logger_plugin.dart => logging/amplify_logging_cloudwatch/lib/src/amplify_logging_cloudwatch_impl.dart} (87%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/lib/src/device_info/device_info.dart (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/lib/src/device_info/device_info.stub.dart (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/lib/src/device_info/device_info.vm.dart (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/lib/src/device_info/device_info.web.dart (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/lib/src/path_provider/flutter_path_provider.dart (100%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/pubspec.yaml (92%) rename packages/{logging_cloudwatch => logging}/amplify_logging_cloudwatch/test/amplify_log_stream_provider_test.dart (100%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/.gitignore (100%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/CHANGELOG.md (100%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/LICENSE (100%) create mode 100644 packages/logging/amplify_logging_cloudwatch_dart/README.md rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/analysis_options.yaml (100%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/com.amplify.logging_cached_logs.sqlite (100%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/example/.gitignore (100%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/example/LICENSE (100%) create mode 100644 packages/logging/amplify_logging_cloudwatch_dart/example/README.md rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/example/analysis_options.yaml (100%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/example/bin/main.dart (100%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/example/pubspec.yaml (57%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/example/web/favicon-180x180.png (100%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/example/web/favicon.png (100%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/example/web/index.html (100%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/example/web/main.dart (100%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/example/web/styles.css (100%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch/lib/aws_logging_cloudwatch.dart => logging/amplify_logging_cloudwatch_dart/lib/amplify_logging_cloudwatch_dart.dart} (64%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch/lib/src/cloudwatch_logger_plugin.dart => logging/amplify_logging_cloudwatch_dart/lib/src/amplify_logging_cloudwatch_dart_impl.dart} (92%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/file_storage/file_storage.dart (87%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/file_storage/file_storage_stub.dart (89%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/file_storage/file_storage_vm.dart (92%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/file_storage/file_storage_web.dart (90%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/log_stream_provider.dart (81%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/path_provider/app_path_provider.dart (100%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/path_provider/app_path_provider_html.dart (67%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/path_provider/app_path_provider_io.dart (70%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/path_provider/app_path_provider_stub.dart (75%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/queued_item_store/dart_queued_item_store.dart (100%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/queued_item_store/dart_queued_item_store.stub.dart (94%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/queued_item_store/dart_queued_item_store.vm.dart (88%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/queued_item_store/dart_queued_item_store.web.dart (87%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/queued_item_store/drift/drift_queued_item_store.dart (97%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/queued_item_store/drift/drift_queued_item_store.g.dart (100%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/queued_item_store/in_memory_queued_item_store.dart (86%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/queued_item_store/index_db/indexed_db_adapter.dart (98%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/queued_item_store/queued_item_store.dart (92%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/remote_constraint_provider.dart (92%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/sdk/cloud_watch_logs.dart (56%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/sdk/src/cloud_watch_logs/cloud_watch_logs_client.dart (91%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/sdk/src/cloud_watch_logs/common/endpoint_resolver.dart (97%) create mode 100644 packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/common/serializers.dart rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/sdk/src/cloud_watch_logs/model/create_log_stream_request.dart (96%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/sdk/src/cloud_watch_logs/model/create_log_stream_request.g.dart (100%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/sdk/src/cloud_watch_logs/model/data_already_accepted_exception.dart (97%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/sdk/src/cloud_watch_logs/model/data_already_accepted_exception.g.dart (100%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/sdk/src/cloud_watch_logs/model/input_log_event.dart (96%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/sdk/src/cloud_watch_logs/model/input_log_event.g.dart (100%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/sdk/src/cloud_watch_logs/model/invalid_parameter_exception.dart (96%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/sdk/src/cloud_watch_logs/model/invalid_parameter_exception.g.dart (100%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/sdk/src/cloud_watch_logs/model/invalid_sequence_token_exception.dart (97%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/sdk/src/cloud_watch_logs/model/invalid_sequence_token_exception.g.dart (100%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_request.dart (94%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_request.g.dart (100%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_response.dart (94%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_response.g.dart (100%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/sdk/src/cloud_watch_logs/model/rejected_log_events_info.dart (96%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/sdk/src/cloud_watch_logs/model/rejected_log_events_info.g.dart (100%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/sdk/src/cloud_watch_logs/model/resource_already_exists_exception.dart (96%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/sdk/src/cloud_watch_logs/model/resource_already_exists_exception.g.dart (100%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/sdk/src/cloud_watch_logs/model/resource_not_found_exception.dart (96%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/sdk/src/cloud_watch_logs/model/resource_not_found_exception.g.dart (100%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/sdk/src/cloud_watch_logs/model/service_unavailable_exception.dart (96%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/sdk/src/cloud_watch_logs/model/service_unavailable_exception.g.dart (100%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/sdk/src/cloud_watch_logs/model/unrecognized_client_exception.dart (96%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/sdk/src/cloud_watch_logs/model/unrecognized_client_exception.g.dart (100%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/sdk/src/cloud_watch_logs/operation/create_log_stream_operation.dart (84%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/sdk/src/cloud_watch_logs/operation/put_log_events_operation.dart (86%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/lib/src/stoppable_timer.dart (89%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/pubspec.yaml (96%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/sdk.yaml (100%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/test/aws_logging_cloudwatch_test.dart (76%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/test/cloudwatch_logger_plugin_test.dart (99%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/test/mocks.dart (78%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/test/queued_item_store/queued_item_store_test.dart (97%) rename packages/{logging_cloudwatch/aws_logging_cloudwatch => logging/amplify_logging_cloudwatch_dart}/test/remote_constraint_provider_test.dart (98%) delete mode 100644 packages/logging_cloudwatch/aws_logging_cloudwatch/README.md delete mode 100644 packages/logging_cloudwatch/aws_logging_cloudwatch/example/README.md delete mode 100644 packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/common/serializers.dart diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index a0f4fd5c20..6b17211b15 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -1806,7 +1806,7 @@ updates: patterns: - "build_web_compilers" - package-ecosystem: "pub" - directory: "packages/logging_cloudwatch/amplify_logging_cloudwatch" + directory: "packages/logging/amplify_logging_cloudwatch" schedule: interval: "daily" ignore: @@ -1819,7 +1819,7 @@ updates: - dependency-name: "aws_common" - dependency-name: "amplify_lints" - dependency-name: "aws_signature_v4" - - dependency-name: "aws_logging_cloudwatch" + - dependency-name: "amplify_logging_cloudwatch_dart" - dependency-name: "amplify_db_common_dart" - dependency-name: "smithy" - dependency-name: "smithy_aws" @@ -1844,7 +1844,7 @@ updates: patterns: - "test" - package-ecosystem: "pub" - directory: "packages/logging_cloudwatch/amplify_logging_cloudwatch/example" + directory: "packages/logging/amplify_logging_cloudwatch/example" schedule: interval: "daily" ignore: @@ -1873,9 +1873,9 @@ updates: - dependency-name: "amplify_flutter" - dependency-name: "amplify_authenticator" - dependency-name: "amplify_logging_cloudwatch" - - dependency-name: "aws_logging_cloudwatch" + - dependency-name: "amplify_logging_cloudwatch_dart" - package-ecosystem: "pub" - directory: "packages/logging_cloudwatch/amplify_logging_cloudwatch/example" + directory: "packages/logging/amplify_logging_cloudwatch/example" schedule: interval: "daily" ignore: @@ -1904,9 +1904,9 @@ updates: - dependency-name: "amplify_flutter" - dependency-name: "amplify_authenticator" - dependency-name: "amplify_logging_cloudwatch" - - dependency-name: "aws_logging_cloudwatch" + - dependency-name: "amplify_logging_cloudwatch_dart" - package-ecosystem: "pub" - directory: "packages/logging_cloudwatch/aws_logging_cloudwatch" + directory: "packages/logging/amplify_logging_cloudwatch_dart" schedule: interval: "daily" ignore: @@ -1952,7 +1952,7 @@ updates: patterns: - "test" - package-ecosystem: "pub" - directory: "packages/logging_cloudwatch/aws_logging_cloudwatch/example" + directory: "packages/logging/amplify_logging_cloudwatch_dart/example" schedule: interval: "daily" ignore: @@ -1961,14 +1961,7 @@ updates: update-types: - "version-update:semver-patch" # Ignore all repo packages - - dependency-name: "aws_logging_cloudwatch" - - dependency-name: "amplify_core" - - dependency-name: "aws_common" - dependency-name: "amplify_lints" - - dependency-name: "aws_signature_v4" - - dependency-name: "amplify_db_common_dart" - - dependency-name: "smithy" - - dependency-name: "smithy_aws" # Group dependencies which have a constraint set in the global "pubspec.yaml" groups: build_runner: @@ -1978,7 +1971,7 @@ updates: patterns: - "build_web_compilers" - package-ecosystem: "pub" - directory: "packages/logging_cloudwatch/aws_logging_cloudwatch/example" + directory: "packages/logging/amplify_logging_cloudwatch_dart/example" schedule: interval: "daily" ignore: @@ -1987,14 +1980,7 @@ updates: update-types: - "version-update:semver-patch" # Ignore all repo packages - - dependency-name: "aws_logging_cloudwatch" - - dependency-name: "amplify_core" - - dependency-name: "aws_common" - dependency-name: "amplify_lints" - - dependency-name: "aws_signature_v4" - - dependency-name: "amplify_db_common_dart" - - dependency-name: "smithy" - - dependency-name: "smithy_aws" # Group dependencies which have a constraint set in the global "pubspec.yaml" groups: build_runner: diff --git a/.github/workflows/amplify_logging_cloudwatch.yaml b/.github/workflows/amplify_logging_cloudwatch.yaml index 991049e48c..2b601fc2a8 100644 --- a/.github/workflows/amplify_logging_cloudwatch.yaml +++ b/.github/workflows/amplify_logging_cloudwatch.yaml @@ -21,12 +21,12 @@ on: - 'packages/aws_signature_v4/pubspec.yaml' - 'packages/common/amplify_db_common_dart/lib/**/*.dart' - 'packages/common/amplify_db_common_dart/pubspec.yaml' - - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/**/*.dart' - - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/**/*.yaml' - - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/**/*' - - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/test/**/*' - - 'packages/logging_cloudwatch/aws_logging_cloudwatch/lib/**/*.dart' - - 'packages/logging_cloudwatch/aws_logging_cloudwatch/pubspec.yaml' + - 'packages/logging/amplify_logging_cloudwatch/**/*.dart' + - 'packages/logging/amplify_logging_cloudwatch/**/*.yaml' + - 'packages/logging/amplify_logging_cloudwatch/lib/**/*' + - 'packages/logging/amplify_logging_cloudwatch/test/**/*' + - 'packages/logging/amplify_logging_cloudwatch_dart/lib/**/*.dart' + - 'packages/logging/amplify_logging_cloudwatch_dart/pubspec.yaml' - 'packages/smithy/smithy/lib/**/*.dart' - 'packages/smithy/smithy/pubspec.yaml' - 'packages/smithy/smithy_aws/lib/**/*.dart' @@ -48,12 +48,12 @@ on: - 'packages/aws_signature_v4/pubspec.yaml' - 'packages/common/amplify_db_common_dart/lib/**/*.dart' - 'packages/common/amplify_db_common_dart/pubspec.yaml' - - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/**/*.dart' - - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/**/*.yaml' - - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/**/*' - - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/test/**/*' - - 'packages/logging_cloudwatch/aws_logging_cloudwatch/lib/**/*.dart' - - 'packages/logging_cloudwatch/aws_logging_cloudwatch/pubspec.yaml' + - 'packages/logging/amplify_logging_cloudwatch/**/*.dart' + - 'packages/logging/amplify_logging_cloudwatch/**/*.yaml' + - 'packages/logging/amplify_logging_cloudwatch/lib/**/*' + - 'packages/logging/amplify_logging_cloudwatch/test/**/*' + - 'packages/logging/amplify_logging_cloudwatch_dart/lib/**/*.dart' + - 'packages/logging/amplify_logging_cloudwatch_dart/pubspec.yaml' - 'packages/smithy/smithy/lib/**/*.dart' - 'packages/smithy/smithy/pubspec.yaml' - 'packages/smithy/smithy_aws/lib/**/*.dart' @@ -81,5 +81,5 @@ jobs: secrets: inherit with: package-name: amplify_logging_cloudwatch - working-directory: packages/logging_cloudwatch/amplify_logging_cloudwatch + working-directory: packages/logging/amplify_logging_cloudwatch has-goldens: false diff --git a/.github/workflows/amplify_logging_cloudwatch_dart.yaml b/.github/workflows/amplify_logging_cloudwatch_dart.yaml new file mode 100644 index 0000000000..32ac4242e1 --- /dev/null +++ b/.github/workflows/amplify_logging_cloudwatch_dart.yaml @@ -0,0 +1,103 @@ +# Generated with aft. To update, run: `aft generate workflows` +name: amplify_logging_cloudwatch_dart +on: + push: + branches: + - main + - stable + paths: + - '.github/composite_actions/setup_firefox/action.yaml' + - '.github/workflows/amplify_logging_cloudwatch_dart.yaml' + - '.github/workflows/dart_dart2js.yaml' + - '.github/workflows/dart_ddc.yaml' + - '.github/workflows/dart_native.yaml' + - '.github/workflows/dart_vm.yaml' + - 'packages/amplify_core/lib/**/*.dart' + - 'packages/amplify_core/pubspec.yaml' + - 'packages/amplify_lints/lib/**/*.yaml' + - 'packages/amplify_lints/pubspec.yaml' + - 'packages/aws_common/lib/**/*.dart' + - 'packages/aws_common/pubspec.yaml' + - 'packages/aws_signature_v4/lib/**/*.dart' + - 'packages/aws_signature_v4/pubspec.yaml' + - 'packages/common/amplify_db_common_dart/lib/**/*.dart' + - 'packages/common/amplify_db_common_dart/pubspec.yaml' + - 'packages/logging/amplify_logging_cloudwatch_dart/**/*.dart' + - 'packages/logging/amplify_logging_cloudwatch_dart/**/*.yaml' + - 'packages/logging/amplify_logging_cloudwatch_dart/lib/**/*' + - 'packages/logging/amplify_logging_cloudwatch_dart/test/**/*' + - 'packages/smithy/smithy/lib/**/*.dart' + - 'packages/smithy/smithy/pubspec.yaml' + - 'packages/smithy/smithy_aws/lib/**/*.dart' + - 'packages/smithy/smithy_aws/pubspec.yaml' + pull_request: + paths: + - '.github/composite_actions/setup_firefox/action.yaml' + - '.github/workflows/amplify_logging_cloudwatch_dart.yaml' + - '.github/workflows/dart_dart2js.yaml' + - '.github/workflows/dart_ddc.yaml' + - '.github/workflows/dart_native.yaml' + - '.github/workflows/dart_vm.yaml' + - 'packages/amplify_core/lib/**/*.dart' + - 'packages/amplify_core/pubspec.yaml' + - 'packages/amplify_lints/lib/**/*.yaml' + - 'packages/amplify_lints/pubspec.yaml' + - 'packages/aws_common/lib/**/*.dart' + - 'packages/aws_common/pubspec.yaml' + - 'packages/aws_signature_v4/lib/**/*.dart' + - 'packages/aws_signature_v4/pubspec.yaml' + - 'packages/common/amplify_db_common_dart/lib/**/*.dart' + - 'packages/common/amplify_db_common_dart/pubspec.yaml' + - 'packages/logging/amplify_logging_cloudwatch_dart/**/*.dart' + - 'packages/logging/amplify_logging_cloudwatch_dart/**/*.yaml' + - 'packages/logging/amplify_logging_cloudwatch_dart/lib/**/*' + - 'packages/logging/amplify_logging_cloudwatch_dart/test/**/*' + - 'packages/smithy/smithy/lib/**/*.dart' + - 'packages/smithy/smithy/pubspec.yaml' + - 'packages/smithy/smithy_aws/lib/**/*.dart' + - 'packages/smithy/smithy_aws/pubspec.yaml' + schedule: + - cron: "0 13 * * *" # Everyday at 06:00 PST +defaults: + run: + shell: bash + +# These permissions are needed to interact with GitHub's OIDC Token endpoint. +permissions: + id-token: write + contents: read + +# Cancels in-progress job when there is another push to same ref. +# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-only-cancel-in-progress-jobs-or-runs-for-the-current-workflow +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + test: + uses: ./.github/workflows/dart_vm.yaml + secrets: inherit + with: + package-name: amplify_logging_cloudwatch_dart + working-directory: packages/logging/amplify_logging_cloudwatch_dart + native_test: + needs: test + uses: ./.github/workflows/dart_native.yaml + secrets: inherit + with: + package-name: amplify_logging_cloudwatch_dart + working-directory: packages/logging/amplify_logging_cloudwatch_dart + ddc_test: + needs: test + uses: ./.github/workflows/dart_ddc.yaml + secrets: inherit + with: + package-name: amplify_logging_cloudwatch_dart + working-directory: packages/logging/amplify_logging_cloudwatch_dart + dart2js_test: + needs: test + uses: ./.github/workflows/dart_dart2js.yaml + secrets: inherit + with: + package-name: amplify_logging_cloudwatch_dart + working-directory: packages/logging/amplify_logging_cloudwatch_dart diff --git a/.github/workflows/amplify_logging_cloudwatch_example.yaml b/.github/workflows/amplify_logging_cloudwatch_example.yaml index f95691da9e..405f4df6a4 100644 --- a/.github/workflows/amplify_logging_cloudwatch_example.yaml +++ b/.github/workflows/amplify_logging_cloudwatch_example.yaml @@ -32,14 +32,14 @@ on: - 'packages/common/amplify_db_common/pubspec.yaml' - 'packages/common/amplify_db_common_dart/lib/**/*.dart' - 'packages/common/amplify_db_common_dart/pubspec.yaml' - - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/example/**/*.dart' - - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/example/**/*.yaml' - - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/example/lib/**/*' - - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/example/test/**/*' - - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/**/*.dart' - - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/pubspec.yaml' - - 'packages/logging_cloudwatch/aws_logging_cloudwatch/lib/**/*.dart' - - 'packages/logging_cloudwatch/aws_logging_cloudwatch/pubspec.yaml' + - 'packages/logging/amplify_logging_cloudwatch/example/**/*.dart' + - 'packages/logging/amplify_logging_cloudwatch/example/**/*.yaml' + - 'packages/logging/amplify_logging_cloudwatch/example/lib/**/*' + - 'packages/logging/amplify_logging_cloudwatch/example/test/**/*' + - 'packages/logging/amplify_logging_cloudwatch/lib/**/*.dart' + - 'packages/logging/amplify_logging_cloudwatch/pubspec.yaml' + - 'packages/logging/amplify_logging_cloudwatch_dart/lib/**/*.dart' + - 'packages/logging/amplify_logging_cloudwatch_dart/pubspec.yaml' - 'packages/secure_storage/amplify_secure_storage/lib/**/*.dart' - 'packages/secure_storage/amplify_secure_storage/pubspec.yaml' - 'packages/secure_storage/amplify_secure_storage_dart/lib/**/*.dart' @@ -82,14 +82,14 @@ on: - 'packages/common/amplify_db_common/pubspec.yaml' - 'packages/common/amplify_db_common_dart/lib/**/*.dart' - 'packages/common/amplify_db_common_dart/pubspec.yaml' - - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/example/**/*.dart' - - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/example/**/*.yaml' - - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/example/lib/**/*' - - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/example/test/**/*' - - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/**/*.dart' - - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/pubspec.yaml' - - 'packages/logging_cloudwatch/aws_logging_cloudwatch/lib/**/*.dart' - - 'packages/logging_cloudwatch/aws_logging_cloudwatch/pubspec.yaml' + - 'packages/logging/amplify_logging_cloudwatch/example/**/*.dart' + - 'packages/logging/amplify_logging_cloudwatch/example/**/*.yaml' + - 'packages/logging/amplify_logging_cloudwatch/example/lib/**/*' + - 'packages/logging/amplify_logging_cloudwatch/example/test/**/*' + - 'packages/logging/amplify_logging_cloudwatch/lib/**/*.dart' + - 'packages/logging/amplify_logging_cloudwatch/pubspec.yaml' + - 'packages/logging/amplify_logging_cloudwatch_dart/lib/**/*.dart' + - 'packages/logging/amplify_logging_cloudwatch_dart/pubspec.yaml' - 'packages/secure_storage/amplify_secure_storage/lib/**/*.dart' - 'packages/secure_storage/amplify_secure_storage/pubspec.yaml' - 'packages/secure_storage/amplify_secure_storage_dart/lib/**/*.dart' @@ -127,5 +127,5 @@ jobs: secrets: inherit with: package-name: amplify_logging_cloudwatch_example - working-directory: packages/logging_cloudwatch/amplify_logging_cloudwatch/example + working-directory: packages/logging/amplify_logging_cloudwatch/example has-goldens: false diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/.gitignore b/packages/logging/amplify_logging_cloudwatch/.gitignore similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/.gitignore rename to packages/logging/amplify_logging_cloudwatch/.gitignore diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/CHANGELOG.md b/packages/logging/amplify_logging_cloudwatch/CHANGELOG.md similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/CHANGELOG.md rename to packages/logging/amplify_logging_cloudwatch/CHANGELOG.md diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/LICENSE b/packages/logging/amplify_logging_cloudwatch/LICENSE similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/LICENSE rename to packages/logging/amplify_logging_cloudwatch/LICENSE diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/README.md b/packages/logging/amplify_logging_cloudwatch/README.md similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/README.md rename to packages/logging/amplify_logging_cloudwatch/README.md diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/analysis_options.yaml b/packages/logging/amplify_logging_cloudwatch/analysis_options.yaml similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/analysis_options.yaml rename to packages/logging/amplify_logging_cloudwatch/analysis_options.yaml diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/.gitignore b/packages/logging/amplify_logging_cloudwatch/example/.gitignore similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/.gitignore rename to packages/logging/amplify_logging_cloudwatch/example/.gitignore diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/.metadata b/packages/logging/amplify_logging_cloudwatch/example/.metadata similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/.metadata rename to packages/logging/amplify_logging_cloudwatch/example/.metadata diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/LICENSE b/packages/logging/amplify_logging_cloudwatch/example/LICENSE similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/LICENSE rename to packages/logging/amplify_logging_cloudwatch/example/LICENSE diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/README.md b/packages/logging/amplify_logging_cloudwatch/example/README.md similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/README.md rename to packages/logging/amplify_logging_cloudwatch/example/README.md diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/analysis_options.yaml b/packages/logging/amplify_logging_cloudwatch/example/analysis_options.yaml similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/analysis_options.yaml rename to packages/logging/amplify_logging_cloudwatch/example/analysis_options.yaml diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/.gitignore b/packages/logging/amplify_logging_cloudwatch/example/android/.gitignore similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/.gitignore rename to packages/logging/amplify_logging_cloudwatch/example/android/.gitignore diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/app/build.gradle b/packages/logging/amplify_logging_cloudwatch/example/android/app/build.gradle similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/app/build.gradle rename to packages/logging/amplify_logging_cloudwatch/example/android/app/build.gradle diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/app/src/debug/AndroidManifest.xml b/packages/logging/amplify_logging_cloudwatch/example/android/app/src/debug/AndroidManifest.xml similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/app/src/debug/AndroidManifest.xml rename to packages/logging/amplify_logging_cloudwatch/example/android/app/src/debug/AndroidManifest.xml diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/app/src/main/AndroidManifest.xml b/packages/logging/amplify_logging_cloudwatch/example/android/app/src/main/AndroidManifest.xml similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/app/src/main/AndroidManifest.xml rename to packages/logging/amplify_logging_cloudwatch/example/android/app/src/main/AndroidManifest.xml diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/app/src/main/kotlin/com/amazonaws/amplify/amplify_logging_cloudwatch_example/MainActivity.kt b/packages/logging/amplify_logging_cloudwatch/example/android/app/src/main/kotlin/com/amazonaws/amplify/amplify_logging_cloudwatch_example/MainActivity.kt similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/app/src/main/kotlin/com/amazonaws/amplify/amplify_logging_cloudwatch_example/MainActivity.kt rename to packages/logging/amplify_logging_cloudwatch/example/android/app/src/main/kotlin/com/amazonaws/amplify/amplify_logging_cloudwatch_example/MainActivity.kt diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/app/src/main/res/drawable-v21/launch_background.xml b/packages/logging/amplify_logging_cloudwatch/example/android/app/src/main/res/drawable-v21/launch_background.xml similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/app/src/main/res/drawable-v21/launch_background.xml rename to packages/logging/amplify_logging_cloudwatch/example/android/app/src/main/res/drawable-v21/launch_background.xml diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/app/src/main/res/drawable/launch_background.xml b/packages/logging/amplify_logging_cloudwatch/example/android/app/src/main/res/drawable/launch_background.xml similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/app/src/main/res/drawable/launch_background.xml rename to packages/logging/amplify_logging_cloudwatch/example/android/app/src/main/res/drawable/launch_background.xml diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/packages/logging/amplify_logging_cloudwatch/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to packages/logging/amplify_logging_cloudwatch/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/packages/logging/amplify_logging_cloudwatch/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to packages/logging/amplify_logging_cloudwatch/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/packages/logging/amplify_logging_cloudwatch/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to packages/logging/amplify_logging_cloudwatch/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/packages/logging/amplify_logging_cloudwatch/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to packages/logging/amplify_logging_cloudwatch/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/packages/logging/amplify_logging_cloudwatch/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to packages/logging/amplify_logging_cloudwatch/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/app/src/main/res/values-night/styles.xml b/packages/logging/amplify_logging_cloudwatch/example/android/app/src/main/res/values-night/styles.xml similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/app/src/main/res/values-night/styles.xml rename to packages/logging/amplify_logging_cloudwatch/example/android/app/src/main/res/values-night/styles.xml diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/app/src/main/res/values/styles.xml b/packages/logging/amplify_logging_cloudwatch/example/android/app/src/main/res/values/styles.xml similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/app/src/main/res/values/styles.xml rename to packages/logging/amplify_logging_cloudwatch/example/android/app/src/main/res/values/styles.xml diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/app/src/profile/AndroidManifest.xml b/packages/logging/amplify_logging_cloudwatch/example/android/app/src/profile/AndroidManifest.xml similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/app/src/profile/AndroidManifest.xml rename to packages/logging/amplify_logging_cloudwatch/example/android/app/src/profile/AndroidManifest.xml diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/build.gradle b/packages/logging/amplify_logging_cloudwatch/example/android/build.gradle similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/build.gradle rename to packages/logging/amplify_logging_cloudwatch/example/android/build.gradle diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/gradle.properties b/packages/logging/amplify_logging_cloudwatch/example/android/gradle.properties similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/gradle.properties rename to packages/logging/amplify_logging_cloudwatch/example/android/gradle.properties diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/logging/amplify_logging_cloudwatch/example/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/gradle/wrapper/gradle-wrapper.properties rename to packages/logging/amplify_logging_cloudwatch/example/android/gradle/wrapper/gradle-wrapper.properties diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/settings.gradle b/packages/logging/amplify_logging_cloudwatch/example/android/settings.gradle similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/android/settings.gradle rename to packages/logging/amplify_logging_cloudwatch/example/android/settings.gradle diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/.gitignore b/packages/logging/amplify_logging_cloudwatch/example/ios/.gitignore similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/.gitignore rename to packages/logging/amplify_logging_cloudwatch/example/ios/.gitignore diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Flutter/AppFrameworkInfo.plist b/packages/logging/amplify_logging_cloudwatch/example/ios/Flutter/AppFrameworkInfo.plist similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Flutter/AppFrameworkInfo.plist rename to packages/logging/amplify_logging_cloudwatch/example/ios/Flutter/AppFrameworkInfo.plist diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Flutter/Debug.xcconfig b/packages/logging/amplify_logging_cloudwatch/example/ios/Flutter/Debug.xcconfig similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Flutter/Debug.xcconfig rename to packages/logging/amplify_logging_cloudwatch/example/ios/Flutter/Debug.xcconfig diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Flutter/Release.xcconfig b/packages/logging/amplify_logging_cloudwatch/example/ios/Flutter/Release.xcconfig similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Flutter/Release.xcconfig rename to packages/logging/amplify_logging_cloudwatch/example/ios/Flutter/Release.xcconfig diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Podfile b/packages/logging/amplify_logging_cloudwatch/example/ios/Podfile similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Podfile rename to packages/logging/amplify_logging_cloudwatch/example/ios/Podfile diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner.xcodeproj/project.pbxproj b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner.xcodeproj/project.pbxproj similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner.xcodeproj/project.pbxproj rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner.xcodeproj/project.pbxproj diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner.xcworkspace/contents.xcworkspacedata b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner.xcworkspace/contents.xcworkspacedata similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner.xcworkspace/contents.xcworkspacedata rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner.xcworkspace/contents.xcworkspacedata diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/AppDelegate.swift b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner/AppDelegate.swift similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/AppDelegate.swift rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner/AppDelegate.swift diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Base.lproj/LaunchScreen.storyboard b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Base.lproj/LaunchScreen.storyboard rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Base.lproj/LaunchScreen.storyboard diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Base.lproj/Main.storyboard b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Base.lproj/Main.storyboard similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Base.lproj/Main.storyboard rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Base.lproj/Main.storyboard diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Info.plist b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Info.plist similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Info.plist rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Info.plist diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Runner-Bridging-Header.h b/packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Runner-Bridging-Header.h similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/ios/Runner/Runner-Bridging-Header.h rename to packages/logging/amplify_logging_cloudwatch/example/ios/Runner/Runner-Bridging-Header.h diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/lib/amplifyconfiguration_logging.dart b/packages/logging/amplify_logging_cloudwatch/example/lib/amplifyconfiguration_logging.dart similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/lib/amplifyconfiguration_logging.dart rename to packages/logging/amplify_logging_cloudwatch/example/lib/amplifyconfiguration_logging.dart diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/lib/homepage.dart b/packages/logging/amplify_logging_cloudwatch/example/lib/homepage.dart similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/lib/homepage.dart rename to packages/logging/amplify_logging_cloudwatch/example/lib/homepage.dart diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/lib/main.dart b/packages/logging/amplify_logging_cloudwatch/example/lib/main.dart similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/lib/main.dart rename to packages/logging/amplify_logging_cloudwatch/example/lib/main.dart diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/linux/.gitignore b/packages/logging/amplify_logging_cloudwatch/example/linux/.gitignore similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/linux/.gitignore rename to packages/logging/amplify_logging_cloudwatch/example/linux/.gitignore diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/linux/CMakeLists.txt b/packages/logging/amplify_logging_cloudwatch/example/linux/CMakeLists.txt similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/linux/CMakeLists.txt rename to packages/logging/amplify_logging_cloudwatch/example/linux/CMakeLists.txt diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/linux/flutter/CMakeLists.txt b/packages/logging/amplify_logging_cloudwatch/example/linux/flutter/CMakeLists.txt similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/linux/flutter/CMakeLists.txt rename to packages/logging/amplify_logging_cloudwatch/example/linux/flutter/CMakeLists.txt diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/linux/flutter/generated_plugin_registrant.cc b/packages/logging/amplify_logging_cloudwatch/example/linux/flutter/generated_plugin_registrant.cc similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/linux/flutter/generated_plugin_registrant.cc rename to packages/logging/amplify_logging_cloudwatch/example/linux/flutter/generated_plugin_registrant.cc diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/linux/flutter/generated_plugin_registrant.h b/packages/logging/amplify_logging_cloudwatch/example/linux/flutter/generated_plugin_registrant.h similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/linux/flutter/generated_plugin_registrant.h rename to packages/logging/amplify_logging_cloudwatch/example/linux/flutter/generated_plugin_registrant.h diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/linux/flutter/generated_plugins.cmake b/packages/logging/amplify_logging_cloudwatch/example/linux/flutter/generated_plugins.cmake similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/linux/flutter/generated_plugins.cmake rename to packages/logging/amplify_logging_cloudwatch/example/linux/flutter/generated_plugins.cmake diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/linux/main.cc b/packages/logging/amplify_logging_cloudwatch/example/linux/main.cc similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/linux/main.cc rename to packages/logging/amplify_logging_cloudwatch/example/linux/main.cc diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/linux/my_application.cc b/packages/logging/amplify_logging_cloudwatch/example/linux/my_application.cc similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/linux/my_application.cc rename to packages/logging/amplify_logging_cloudwatch/example/linux/my_application.cc diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/linux/my_application.h b/packages/logging/amplify_logging_cloudwatch/example/linux/my_application.h similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/linux/my_application.h rename to packages/logging/amplify_logging_cloudwatch/example/linux/my_application.h diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/.gitignore b/packages/logging/amplify_logging_cloudwatch/example/macos/.gitignore similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/.gitignore rename to packages/logging/amplify_logging_cloudwatch/example/macos/.gitignore diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Flutter/Flutter-Debug.xcconfig b/packages/logging/amplify_logging_cloudwatch/example/macos/Flutter/Flutter-Debug.xcconfig similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Flutter/Flutter-Debug.xcconfig rename to packages/logging/amplify_logging_cloudwatch/example/macos/Flutter/Flutter-Debug.xcconfig diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Flutter/Flutter-Release.xcconfig b/packages/logging/amplify_logging_cloudwatch/example/macos/Flutter/Flutter-Release.xcconfig similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Flutter/Flutter-Release.xcconfig rename to packages/logging/amplify_logging_cloudwatch/example/macos/Flutter/Flutter-Release.xcconfig diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/logging/amplify_logging_cloudwatch/example/macos/Flutter/GeneratedPluginRegistrant.swift similarity index 88% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Flutter/GeneratedPluginRegistrant.swift rename to packages/logging/amplify_logging_cloudwatch/example/macos/Flutter/GeneratedPluginRegistrant.swift index 32a9505309..c33812bc70 100644 --- a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/logging/amplify_logging_cloudwatch/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -16,7 +16,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifyAuthCognitoPlugin.register(with: registry.registrar(forPlugin: "AmplifyAuthCognitoPlugin")) AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) + FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Podfile b/packages/logging/amplify_logging_cloudwatch/example/macos/Podfile similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Podfile rename to packages/logging/amplify_logging_cloudwatch/example/macos/Podfile diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner.xcodeproj/project.pbxproj b/packages/logging/amplify_logging_cloudwatch/example/macos/Runner.xcodeproj/project.pbxproj similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner.xcodeproj/project.pbxproj rename to packages/logging/amplify_logging_cloudwatch/example/macos/Runner.xcodeproj/project.pbxproj diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/logging/amplify_logging_cloudwatch/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to packages/logging/amplify_logging_cloudwatch/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/logging/amplify_logging_cloudwatch/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme rename to packages/logging/amplify_logging_cloudwatch/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner.xcworkspace/contents.xcworkspacedata b/packages/logging/amplify_logging_cloudwatch/example/macos/Runner.xcworkspace/contents.xcworkspacedata similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner.xcworkspace/contents.xcworkspacedata rename to packages/logging/amplify_logging_cloudwatch/example/macos/Runner.xcworkspace/contents.xcworkspacedata diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/packages/logging/amplify_logging_cloudwatch/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to packages/logging/amplify_logging_cloudwatch/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/AppDelegate.swift b/packages/logging/amplify_logging_cloudwatch/example/macos/Runner/AppDelegate.swift similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/AppDelegate.swift rename to packages/logging/amplify_logging_cloudwatch/example/macos/Runner/AppDelegate.swift diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json rename to packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png rename to packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png rename to packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png rename to packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png rename to packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png rename to packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png rename to packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png rename to packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Base.lproj/MainMenu.xib b/packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Base.lproj/MainMenu.xib similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Base.lproj/MainMenu.xib rename to packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Base.lproj/MainMenu.xib diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Configs/AppInfo.xcconfig b/packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Configs/AppInfo.xcconfig similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Configs/AppInfo.xcconfig rename to packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Configs/AppInfo.xcconfig diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Configs/Debug.xcconfig b/packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Configs/Debug.xcconfig similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Configs/Debug.xcconfig rename to packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Configs/Debug.xcconfig diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Configs/Release.xcconfig b/packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Configs/Release.xcconfig similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Configs/Release.xcconfig rename to packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Configs/Release.xcconfig diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Configs/Warnings.xcconfig b/packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Configs/Warnings.xcconfig similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Configs/Warnings.xcconfig rename to packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Configs/Warnings.xcconfig diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/DebugProfile.entitlements b/packages/logging/amplify_logging_cloudwatch/example/macos/Runner/DebugProfile.entitlements similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/DebugProfile.entitlements rename to packages/logging/amplify_logging_cloudwatch/example/macos/Runner/DebugProfile.entitlements diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Info.plist b/packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Info.plist similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Info.plist rename to packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Info.plist diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/MainFlutterWindow.swift b/packages/logging/amplify_logging_cloudwatch/example/macos/Runner/MainFlutterWindow.swift similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/MainFlutterWindow.swift rename to packages/logging/amplify_logging_cloudwatch/example/macos/Runner/MainFlutterWindow.swift diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Release.entitlements b/packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Release.entitlements similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/macos/Runner/Release.entitlements rename to packages/logging/amplify_logging_cloudwatch/example/macos/Runner/Release.entitlements diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/pubspec.yaml b/packages/logging/amplify_logging_cloudwatch/example/pubspec.yaml similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/pubspec.yaml rename to packages/logging/amplify_logging_cloudwatch/example/pubspec.yaml diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/web/favicon.png b/packages/logging/amplify_logging_cloudwatch/example/web/favicon.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/web/favicon.png rename to packages/logging/amplify_logging_cloudwatch/example/web/favicon.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/web/icons/Icon-192.png b/packages/logging/amplify_logging_cloudwatch/example/web/icons/Icon-192.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/web/icons/Icon-192.png rename to packages/logging/amplify_logging_cloudwatch/example/web/icons/Icon-192.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/web/icons/Icon-512.png b/packages/logging/amplify_logging_cloudwatch/example/web/icons/Icon-512.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/web/icons/Icon-512.png rename to packages/logging/amplify_logging_cloudwatch/example/web/icons/Icon-512.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/web/icons/Icon-maskable-192.png b/packages/logging/amplify_logging_cloudwatch/example/web/icons/Icon-maskable-192.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/web/icons/Icon-maskable-192.png rename to packages/logging/amplify_logging_cloudwatch/example/web/icons/Icon-maskable-192.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/web/icons/Icon-maskable-512.png b/packages/logging/amplify_logging_cloudwatch/example/web/icons/Icon-maskable-512.png similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/web/icons/Icon-maskable-512.png rename to packages/logging/amplify_logging_cloudwatch/example/web/icons/Icon-maskable-512.png diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/web/index.html b/packages/logging/amplify_logging_cloudwatch/example/web/index.html similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/web/index.html rename to packages/logging/amplify_logging_cloudwatch/example/web/index.html diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/web/manifest.json b/packages/logging/amplify_logging_cloudwatch/example/web/manifest.json similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/web/manifest.json rename to packages/logging/amplify_logging_cloudwatch/example/web/manifest.json diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/.gitignore b/packages/logging/amplify_logging_cloudwatch/example/windows/.gitignore similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/.gitignore rename to packages/logging/amplify_logging_cloudwatch/example/windows/.gitignore diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/CMakeLists.txt b/packages/logging/amplify_logging_cloudwatch/example/windows/CMakeLists.txt similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/CMakeLists.txt rename to packages/logging/amplify_logging_cloudwatch/example/windows/CMakeLists.txt diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/flutter/CMakeLists.txt b/packages/logging/amplify_logging_cloudwatch/example/windows/flutter/CMakeLists.txt similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/flutter/CMakeLists.txt rename to packages/logging/amplify_logging_cloudwatch/example/windows/flutter/CMakeLists.txt diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/flutter/generated_plugin_registrant.cc b/packages/logging/amplify_logging_cloudwatch/example/windows/flutter/generated_plugin_registrant.cc similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/flutter/generated_plugin_registrant.cc rename to packages/logging/amplify_logging_cloudwatch/example/windows/flutter/generated_plugin_registrant.cc diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/flutter/generated_plugin_registrant.h b/packages/logging/amplify_logging_cloudwatch/example/windows/flutter/generated_plugin_registrant.h similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/flutter/generated_plugin_registrant.h rename to packages/logging/amplify_logging_cloudwatch/example/windows/flutter/generated_plugin_registrant.h diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/flutter/generated_plugins.cmake b/packages/logging/amplify_logging_cloudwatch/example/windows/flutter/generated_plugins.cmake similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/flutter/generated_plugins.cmake rename to packages/logging/amplify_logging_cloudwatch/example/windows/flutter/generated_plugins.cmake diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/runner/CMakeLists.txt b/packages/logging/amplify_logging_cloudwatch/example/windows/runner/CMakeLists.txt similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/runner/CMakeLists.txt rename to packages/logging/amplify_logging_cloudwatch/example/windows/runner/CMakeLists.txt diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/runner/Runner.rc b/packages/logging/amplify_logging_cloudwatch/example/windows/runner/Runner.rc similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/runner/Runner.rc rename to packages/logging/amplify_logging_cloudwatch/example/windows/runner/Runner.rc diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/runner/flutter_window.cpp b/packages/logging/amplify_logging_cloudwatch/example/windows/runner/flutter_window.cpp similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/runner/flutter_window.cpp rename to packages/logging/amplify_logging_cloudwatch/example/windows/runner/flutter_window.cpp diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/runner/flutter_window.h b/packages/logging/amplify_logging_cloudwatch/example/windows/runner/flutter_window.h similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/runner/flutter_window.h rename to packages/logging/amplify_logging_cloudwatch/example/windows/runner/flutter_window.h diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/runner/main.cpp b/packages/logging/amplify_logging_cloudwatch/example/windows/runner/main.cpp similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/runner/main.cpp rename to packages/logging/amplify_logging_cloudwatch/example/windows/runner/main.cpp diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/runner/resource.h b/packages/logging/amplify_logging_cloudwatch/example/windows/runner/resource.h similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/runner/resource.h rename to packages/logging/amplify_logging_cloudwatch/example/windows/runner/resource.h diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/runner/resources/app_icon.ico b/packages/logging/amplify_logging_cloudwatch/example/windows/runner/resources/app_icon.ico similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/runner/resources/app_icon.ico rename to packages/logging/amplify_logging_cloudwatch/example/windows/runner/resources/app_icon.ico diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/runner/runner.exe.manifest b/packages/logging/amplify_logging_cloudwatch/example/windows/runner/runner.exe.manifest similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/runner/runner.exe.manifest rename to packages/logging/amplify_logging_cloudwatch/example/windows/runner/runner.exe.manifest diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/runner/utils.cpp b/packages/logging/amplify_logging_cloudwatch/example/windows/runner/utils.cpp similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/runner/utils.cpp rename to packages/logging/amplify_logging_cloudwatch/example/windows/runner/utils.cpp diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/runner/utils.h b/packages/logging/amplify_logging_cloudwatch/example/windows/runner/utils.h similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/runner/utils.h rename to packages/logging/amplify_logging_cloudwatch/example/windows/runner/utils.h diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/runner/win32_window.cpp b/packages/logging/amplify_logging_cloudwatch/example/windows/runner/win32_window.cpp similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/runner/win32_window.cpp rename to packages/logging/amplify_logging_cloudwatch/example/windows/runner/win32_window.cpp diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/runner/win32_window.h b/packages/logging/amplify_logging_cloudwatch/example/windows/runner/win32_window.h similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/example/windows/runner/win32_window.h rename to packages/logging/amplify_logging_cloudwatch/example/windows/runner/win32_window.h diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/amplify_logging_cloudwatch.dart b/packages/logging/amplify_logging_cloudwatch/lib/amplify_logging_cloudwatch.dart similarity index 56% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/amplify_logging_cloudwatch.dart rename to packages/logging/amplify_logging_cloudwatch/lib/amplify_logging_cloudwatch.dart index f9b7b8c9fe..4e30735c0e 100644 --- a/packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/amplify_logging_cloudwatch.dart +++ b/packages/logging/amplify_logging_cloudwatch/lib/amplify_logging_cloudwatch.dart @@ -1,4 +1,4 @@ /// amplify_logging_cloudwatch library amplify_logging_cloudwatch; -export 'src/amplify_cloudwatch_logger_plugin.dart'; +export 'src/amplify_logging_cloudwatch_impl.dart'; diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/amplify_log_stream_name_provider.dart b/packages/logging/amplify_logging_cloudwatch/lib/src/amplify_log_stream_name_provider.dart similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/amplify_log_stream_name_provider.dart rename to packages/logging/amplify_logging_cloudwatch/lib/src/amplify_log_stream_name_provider.dart diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/amplify_cloudwatch_logger_plugin.dart b/packages/logging/amplify_logging_cloudwatch/lib/src/amplify_logging_cloudwatch_impl.dart similarity index 87% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/amplify_cloudwatch_logger_plugin.dart rename to packages/logging/amplify_logging_cloudwatch/lib/src/amplify_logging_cloudwatch_impl.dart index bcfaee5f06..5e5a3bfe6c 100644 --- a/packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/amplify_cloudwatch_logger_plugin.dart +++ b/packages/logging/amplify_logging_cloudwatch/lib/src/amplify_logging_cloudwatch_impl.dart @@ -3,11 +3,11 @@ import 'dart:async'; import 'package:amplify_core/amplify_core.dart'; import 'package:amplify_logging_cloudwatch/src/amplify_log_stream_name_provider.dart'; import 'package:amplify_logging_cloudwatch/src/path_provider/flutter_path_provider.dart'; -import 'package:aws_logging_cloudwatch/aws_logging_cloudwatch.dart'; +import 'package:amplify_logging_cloudwatch_dart/amplify_logging_cloudwatch_dart.dart'; -/// {@macro aws_logging_cloudwatch.cloudwatch_logger_plugin} +/// {@macro amplify_logging_cloudwatch_dart.cloudwatch_logger_plugin} class AmplifyCloudWatchLoggerPlugin extends CloudWatchLoggerPlugin { - /// {@macro aws_logging_cloudwatch.cloudwatch_logger_plugin} + /// {@macro amplify_logging_cloudwatch_dart.cloudwatch_logger_plugin} AmplifyCloudWatchLoggerPlugin( super.pluginConfig, { super.remoteLoggingConstraintProvider, diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/device_info/device_info.dart b/packages/logging/amplify_logging_cloudwatch/lib/src/device_info/device_info.dart similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/device_info/device_info.dart rename to packages/logging/amplify_logging_cloudwatch/lib/src/device_info/device_info.dart diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/device_info/device_info.stub.dart b/packages/logging/amplify_logging_cloudwatch/lib/src/device_info/device_info.stub.dart similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/device_info/device_info.stub.dart rename to packages/logging/amplify_logging_cloudwatch/lib/src/device_info/device_info.stub.dart diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/device_info/device_info.vm.dart b/packages/logging/amplify_logging_cloudwatch/lib/src/device_info/device_info.vm.dart similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/device_info/device_info.vm.dart rename to packages/logging/amplify_logging_cloudwatch/lib/src/device_info/device_info.vm.dart diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/device_info/device_info.web.dart b/packages/logging/amplify_logging_cloudwatch/lib/src/device_info/device_info.web.dart similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/device_info/device_info.web.dart rename to packages/logging/amplify_logging_cloudwatch/lib/src/device_info/device_info.web.dart diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/path_provider/flutter_path_provider.dart b/packages/logging/amplify_logging_cloudwatch/lib/src/path_provider/flutter_path_provider.dart similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/lib/src/path_provider/flutter_path_provider.dart rename to packages/logging/amplify_logging_cloudwatch/lib/src/path_provider/flutter_path_provider.dart diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/pubspec.yaml b/packages/logging/amplify_logging_cloudwatch/pubspec.yaml similarity index 92% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/pubspec.yaml rename to packages/logging/amplify_logging_cloudwatch/pubspec.yaml index a386833e78..47ae4f8bb6 100644 --- a/packages/logging_cloudwatch/amplify_logging_cloudwatch/pubspec.yaml +++ b/packages/logging/amplify_logging_cloudwatch/pubspec.yaml @@ -10,9 +10,8 @@ environment: sdk: "^3.0.0" dependencies: - amplify_core: ">=1.6.0 <1.7.0" + amplify_core: ">=1.4.0 <1.5.0" aws_common: ">=0.6.0 <0.7.0" - aws_logging_cloudwatch: ^0.1.0 device_info_plus: ^9.0.0 flutter: sdk: flutter diff --git a/packages/logging_cloudwatch/amplify_logging_cloudwatch/test/amplify_log_stream_provider_test.dart b/packages/logging/amplify_logging_cloudwatch/test/amplify_log_stream_provider_test.dart similarity index 100% rename from packages/logging_cloudwatch/amplify_logging_cloudwatch/test/amplify_log_stream_provider_test.dart rename to packages/logging/amplify_logging_cloudwatch/test/amplify_log_stream_provider_test.dart diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/.gitignore b/packages/logging/amplify_logging_cloudwatch_dart/.gitignore similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/.gitignore rename to packages/logging/amplify_logging_cloudwatch_dart/.gitignore diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/CHANGELOG.md b/packages/logging/amplify_logging_cloudwatch_dart/CHANGELOG.md similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/CHANGELOG.md rename to packages/logging/amplify_logging_cloudwatch_dart/CHANGELOG.md diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/LICENSE b/packages/logging/amplify_logging_cloudwatch_dart/LICENSE similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/LICENSE rename to packages/logging/amplify_logging_cloudwatch_dart/LICENSE diff --git a/packages/logging/amplify_logging_cloudwatch_dart/README.md b/packages/logging/amplify_logging_cloudwatch_dart/README.md new file mode 100644 index 0000000000..113384a0ff --- /dev/null +++ b/packages/logging/amplify_logging_cloudwatch_dart/README.md @@ -0,0 +1 @@ +# amplify_logging_cloudwatch_dart diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/analysis_options.yaml b/packages/logging/amplify_logging_cloudwatch_dart/analysis_options.yaml similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/analysis_options.yaml rename to packages/logging/amplify_logging_cloudwatch_dart/analysis_options.yaml diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/com.amplify.logging_cached_logs.sqlite b/packages/logging/amplify_logging_cloudwatch_dart/com.amplify.logging_cached_logs.sqlite similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/com.amplify.logging_cached_logs.sqlite rename to packages/logging/amplify_logging_cloudwatch_dart/com.amplify.logging_cached_logs.sqlite diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/example/.gitignore b/packages/logging/amplify_logging_cloudwatch_dart/example/.gitignore similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/example/.gitignore rename to packages/logging/amplify_logging_cloudwatch_dart/example/.gitignore diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/example/LICENSE b/packages/logging/amplify_logging_cloudwatch_dart/example/LICENSE similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/example/LICENSE rename to packages/logging/amplify_logging_cloudwatch_dart/example/LICENSE diff --git a/packages/logging/amplify_logging_cloudwatch_dart/example/README.md b/packages/logging/amplify_logging_cloudwatch_dart/example/README.md new file mode 100644 index 0000000000..fda2ffa68f --- /dev/null +++ b/packages/logging/amplify_logging_cloudwatch_dart/example/README.md @@ -0,0 +1 @@ +# amplify_logging_cloudwatch_dart_example diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/example/analysis_options.yaml b/packages/logging/amplify_logging_cloudwatch_dart/example/analysis_options.yaml similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/example/analysis_options.yaml rename to packages/logging/amplify_logging_cloudwatch_dart/example/analysis_options.yaml diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/example/bin/main.dart b/packages/logging/amplify_logging_cloudwatch_dart/example/bin/main.dart similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/example/bin/main.dart rename to packages/logging/amplify_logging_cloudwatch_dart/example/bin/main.dart diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/example/pubspec.yaml b/packages/logging/amplify_logging_cloudwatch_dart/example/pubspec.yaml similarity index 57% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/example/pubspec.yaml rename to packages/logging/amplify_logging_cloudwatch_dart/example/pubspec.yaml index 4301edc976..5a2d980660 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/example/pubspec.yaml +++ b/packages/logging/amplify_logging_cloudwatch_dart/example/pubspec.yaml @@ -1,10 +1,10 @@ -name: aws_logging_cloudwatch_example -description: An example app showcasing the aws_logging_cloudwatch package. +name: amplify_logging_cloudwatch_dart_example +description: An example app showcasing the amplify_logging_cloudwatch_dart package. publish_to: none version: 1.0.0 environment: - sdk: '^3.0.0' + sdk: "^3.0.0" dependencies: aws_logging_cloudwatch: diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/example/web/favicon-180x180.png b/packages/logging/amplify_logging_cloudwatch_dart/example/web/favicon-180x180.png similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/example/web/favicon-180x180.png rename to packages/logging/amplify_logging_cloudwatch_dart/example/web/favicon-180x180.png diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/example/web/favicon.png b/packages/logging/amplify_logging_cloudwatch_dart/example/web/favicon.png similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/example/web/favicon.png rename to packages/logging/amplify_logging_cloudwatch_dart/example/web/favicon.png diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/example/web/index.html b/packages/logging/amplify_logging_cloudwatch_dart/example/web/index.html similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/example/web/index.html rename to packages/logging/amplify_logging_cloudwatch_dart/example/web/index.html diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/example/web/main.dart b/packages/logging/amplify_logging_cloudwatch_dart/example/web/main.dart similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/example/web/main.dart rename to packages/logging/amplify_logging_cloudwatch_dart/example/web/main.dart diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/example/web/styles.css b/packages/logging/amplify_logging_cloudwatch_dart/example/web/styles.css similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/example/web/styles.css rename to packages/logging/amplify_logging_cloudwatch_dart/example/web/styles.css diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/aws_logging_cloudwatch.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/amplify_logging_cloudwatch_dart.dart similarity index 64% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/aws_logging_cloudwatch.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/amplify_logging_cloudwatch_dart.dart index c909f23ef7..019cd3b193 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/aws_logging_cloudwatch.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/amplify_logging_cloudwatch_dart.dart @@ -1,10 +1,10 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -/// aws_logging_cloudwatch -library aws_logging_cloudwatch; +/// amplify_logging_cloudwatch_dart +library amplify_logging_cloudwatch_dart; -export 'src/cloudwatch_logger_plugin.dart'; +export 'src/amplify_logging_cloudwatch_dart_impl.dart'; export 'src/file_storage/file_storage.dart'; export 'src/log_stream_provider.dart'; export 'src/remote_constraint_provider.dart'; diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/cloudwatch_logger_plugin.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/amplify_logging_cloudwatch_dart_impl.dart similarity index 92% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/cloudwatch_logger_plugin.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/amplify_logging_cloudwatch_dart_impl.dart index b26b446ccb..e93e56b4d7 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/cloudwatch_logger_plugin.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/amplify_logging_cloudwatch_dart_impl.dart @@ -7,12 +7,17 @@ import 'dart:math'; import 'package:amplify_core/amplify_core.dart'; // ignore: invalid_use_of_internal_member, implementation_imports import 'package:amplify_core/src/http/amplify_category_method.dart'; -import 'package:aws_logging_cloudwatch/aws_logging_cloudwatch.dart'; -import 'package:aws_logging_cloudwatch/src/path_provider/app_path_provider.dart'; -import 'package:aws_logging_cloudwatch/src/queued_item_store/dart_queued_item_store.dart'; -import 'package:aws_logging_cloudwatch/src/queued_item_store/queued_item_store.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/cloud_watch_logs.dart'; -import 'package:aws_logging_cloudwatch/src/stoppable_timer.dart'; +import 'package:amplify_logging_cloudwatch_dart/amplify_logging_cloudwatch_dart.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/path_provider/app_path_provider.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/queued_item_store/dart_queued_item_store.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/queued_item_store/queued_item_store.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/cloud_watch_logs_client.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/input_log_event.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/put_log_events_request.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/put_log_events_response.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/rejected_log_events_info.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/resource_not_found_exception.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/stoppable_timer.dart'; import 'package:fixnum/fixnum.dart'; import 'package:meta/meta.dart'; @@ -44,11 +49,11 @@ const Duration _baseRetryInterval = Duration(seconds: 10); typedef _LogBatch = (List logQueues, List logEvents); -/// {@template aws_logging_cloudwatch.cloudwatch_logger_plugin} +/// {@template amplify_logging_cloudwatch_dart_dart.cloudwatch_logger_plugin} /// An [AWSLoggerPlugin] for sending logs to AWS CloudWatch Logs. /// {@endtemplate} class CloudWatchLoggerPlugin extends LoggingPluginInterface with AWSDebuggable { - /// {@macro aws_logging_cloudwatch.cloudwatch_logger_plugin} + /// {@macro amplify_logging_cloudwatch_dart.cloudwatch_logger_plugin} CloudWatchLoggerPlugin( CloudWatchPluginConfig pluginConfig, { RemoteLoggingConstraintProvider? remoteLoggingConstraintProvider, diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/file_storage/file_storage.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/file_storage/file_storage.dart similarity index 87% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/file_storage/file_storage.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/file_storage/file_storage.dart index 94627270bc..7ea746150a 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/file_storage/file_storage.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/file_storage/file_storage.dart @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 import 'package:amplify_core/amplify_core.dart'; -import 'package:aws_logging_cloudwatch/src/file_storage/file_storage_stub.dart' +import 'package:amplify_logging_cloudwatch_dart/src/file_storage/file_storage_stub.dart' if (dart.library.io) 'file_storage_vm.dart' if (dart.library.html) 'file_storage_web.dart'; diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/file_storage/file_storage_stub.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/file_storage/file_storage_stub.dart similarity index 89% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/file_storage/file_storage_stub.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/file_storage/file_storage_stub.dart index 6b8971325c..2d57620abd 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/file_storage/file_storage_stub.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/file_storage/file_storage_stub.dart @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 import 'package:amplify_core/amplify_core.dart'; -import 'package:aws_logging_cloudwatch/src/file_storage/file_storage.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/file_storage/file_storage.dart'; /// File storage implementation for saving and loading constraint locally class FileStorageImpl implements FileStorage { diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/file_storage/file_storage_vm.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/file_storage/file_storage_vm.dart similarity index 92% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/file_storage/file_storage_vm.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/file_storage/file_storage_vm.dart index 30c39773e0..2c1478bba4 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/file_storage/file_storage_vm.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/file_storage/file_storage_vm.dart @@ -4,7 +4,7 @@ import 'dart:io'; import 'package:amplify_core/amplify_core.dart'; -import 'package:aws_logging_cloudwatch/src/file_storage/file_storage.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/file_storage/file_storage.dart'; import 'package:path/path.dart' as p; /// File storage implementation for saving and loading constraint locally diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/file_storage/file_storage_web.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/file_storage/file_storage_web.dart similarity index 90% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/file_storage/file_storage_web.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/file_storage/file_storage_web.dart index 4475a00b62..dc70ac8b54 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/file_storage/file_storage_web.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/file_storage/file_storage_web.dart @@ -4,7 +4,7 @@ import 'dart:html'; import 'package:amplify_core/amplify_core.dart'; -import 'package:aws_logging_cloudwatch/src/file_storage/file_storage.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/file_storage/file_storage.dart'; /// File storage implementation for saving and loading constraint locally class FileStorageImpl implements FileStorage { diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/log_stream_provider.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/log_stream_provider.dart similarity index 81% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/log_stream_provider.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/log_stream_provider.dart index 8828b2609e..90039d355f 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/log_stream_provider.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/log_stream_provider.dart @@ -3,11 +3,13 @@ import 'dart:async'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/cloud_watch_logs_client.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/create_log_stream_request.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/resource_already_exists_exception.dart'; import 'package:aws_common/aws_common.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/cloud_watch_logs.dart'; import 'package:intl/intl.dart'; -/// {@template aws_logging_cloudwatch.cloudwatch_logstream_provider} +/// {@template amplify_logging_cloudwatch_dart_dart.cloudwatch_logstream_provider} /// An interface to provide custom implementation for /// [CloudWatchLogStreamProvider] /// {@endtemplate} @@ -20,7 +22,7 @@ abstract class CloudWatchLogStreamProvider { Future createLogStream(String logStreamName); } -/// {@template aws_logging_cloudwatch.default_cloudwatch_logstream_provider} +/// {@template amplify_logging_cloudwatch_dart.default_cloudwatch_logstream_provider} /// The default implementaion of [CloudWatchLogStreamProvider]. /// /// It uses `defaultLogStreamNameProvider` if provided otherwise uses @@ -28,7 +30,7 @@ abstract class CloudWatchLogStreamProvider { /// {@endtemplate} class DefaultCloudWatchLogStreamProvider implements CloudWatchLogStreamProvider { - /// {@macro aws_logging_cloudwatch.default_cloudwatch_logstream_provider} + /// {@macro amplify_logging_cloudwatch_dart.default_cloudwatch_logstream_provider} DefaultCloudWatchLogStreamProvider({ required AWSCredentialsProvider credentialsProvider, required String region, diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/path_provider/app_path_provider.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider.dart similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/path_provider/app_path_provider.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider.dart diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/path_provider/app_path_provider_html.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_html.dart similarity index 67% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/path_provider/app_path_provider_html.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_html.dart index bf50dca4a6..02c9df7d68 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/path_provider/app_path_provider_html.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_html.dart @@ -3,11 +3,11 @@ import 'package:amplify_core/amplify_core.dart'; -/// {@template aws_logging_cloudwatch.app_path_provider} -/// Provides App paths for aws_logging_cloudwatch package. +/// {@template amplify_logging_cloudwatch_dart_dart.app_path_provider} +/// Provides App paths for amplify_logging_cloudwatch_dart package. /// {@endtemplate} class DartAppPathProvider implements AppPathProvider { - /// {@macro aws_logging_cloudwatch.app_path_provider} + /// {@macro amplify_logging_cloudwatch_dart.app_path_provider} const DartAppPathProvider(); @override diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/path_provider/app_path_provider_io.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_io.dart similarity index 70% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/path_provider/app_path_provider_io.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_io.dart index 87fe157320..691d5779cd 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/path_provider/app_path_provider_io.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_io.dart @@ -5,11 +5,11 @@ import 'dart:io'; import 'package:amplify_core/amplify_core.dart'; -/// {@template aws_logging_cloudwatch.app_path_provider} -/// Provides App paths for aws_logging_cloudwatch package. +/// {@template amplify_logging_cloudwatch_dart_dart.app_path_provider} +/// Provides App paths for amplify_logging_cloudwatch_dart package. /// {@endtemplate} class DartAppPathProvider implements AppPathProvider { - /// {@macro aws_logging_cloudwatch.app_path_provider} + /// {@macro amplify_logging_cloudwatch_dart.app_path_provider} const DartAppPathProvider(); @override diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/path_provider/app_path_provider_stub.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_stub.dart similarity index 75% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/path_provider/app_path_provider_stub.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_stub.dart index 068f8f04f2..92ea6648d3 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/path_provider/app_path_provider_stub.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_stub.dart @@ -3,11 +3,11 @@ import 'package:amplify_core/amplify_core.dart'; -/// {@template aws_logging_cloudwatch.app_path_provider} -/// Provides App paths for aws_logging_cloudwatch package. +/// {@template amplify_logging_cloudwatch_dart_dart.app_path_provider} +/// Provides App paths for amplify_logging_cloudwatch_dart package. /// {@endtemplate} class DartAppPathProvider implements AppPathProvider { - /// {@macro aws_logging_cloudwatch.app_path_provider} + /// {@macro amplify_logging_cloudwatch_dart.app_path_provider} const DartAppPathProvider(); @override diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/dart_queued_item_store.dart similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/dart_queued_item_store.dart diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.stub.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/dart_queued_item_store.stub.dart similarity index 94% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.stub.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/dart_queued_item_store.stub.dart index 5db1a8d647..dca4e140c0 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.stub.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/dart_queued_item_store.stub.dart @@ -5,7 +5,7 @@ import 'dart:async'; import 'package:amplify_core/amplify_core.dart'; // ignore: implementation_imports -import 'package:aws_logging_cloudwatch/src/queued_item_store/queued_item_store.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/queued_item_store/queued_item_store.dart'; import 'package:meta/meta.dart'; /// {@template amplify_logging_cloudwatch.dart_queued_item_store} diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.vm.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/dart_queued_item_store.vm.dart similarity index 88% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.vm.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/dart_queued_item_store.vm.dart index 2ea1ae0c5a..cff937ca85 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.vm.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/dart_queued_item_store.vm.dart @@ -4,9 +4,9 @@ import 'dart:async'; import 'package:amplify_core/amplify_core.dart'; -import 'package:aws_logging_cloudwatch/src/queued_item_store/drift/drift_queued_item_store.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/queued_item_store/drift/drift_queued_item_store.dart'; // ignore: implementation_imports -import 'package:aws_logging_cloudwatch/src/queued_item_store/queued_item_store.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/queued_item_store/queued_item_store.dart'; import 'package:meta/meta.dart'; /// {@macro amplify_logging_cloudwatch.dart_queued_item_store} diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.web.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/dart_queued_item_store.web.dart similarity index 87% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.web.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/dart_queued_item_store.web.dart index deac3ff6cb..e658e93050 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/dart_queued_item_store.web.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/dart_queued_item_store.web.dart @@ -6,9 +6,9 @@ import 'dart:async'; import 'package:amplify_core/amplify_core.dart'; -import 'package:aws_logging_cloudwatch/src/queued_item_store/in_memory_queued_item_store.dart'; -import 'package:aws_logging_cloudwatch/src/queued_item_store/index_db/indexed_db_adapter.dart'; -import 'package:aws_logging_cloudwatch/src/queued_item_store/queued_item_store.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/queued_item_store/in_memory_queued_item_store.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/queued_item_store/index_db/indexed_db_adapter.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/queued_item_store/queued_item_store.dart'; import 'package:meta/meta.dart'; /// {@macro amplify_logging_cloudwatch.dart_queued_item_store} diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/drift/drift_queued_item_store.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/drift/drift_queued_item_store.dart similarity index 97% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/drift/drift_queued_item_store.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/drift/drift_queued_item_store.dart index 653d36350c..00e1421757 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/drift/drift_queued_item_store.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/drift/drift_queued_item_store.dart @@ -5,7 +5,7 @@ import 'dart:async'; import 'package:amplify_db_common_dart/amplify_db_common_dart.dart'; // ignore: implementation_imports -import 'package:aws_logging_cloudwatch/src/queued_item_store/queued_item_store.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/queued_item_store/queued_item_store.dart'; import 'package:drift/drift.dart'; part 'drift_queued_item_store.g.dart'; diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/drift/drift_queued_item_store.g.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/drift/drift_queued_item_store.g.dart similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/drift/drift_queued_item_store.g.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/drift/drift_queued_item_store.g.dart diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/in_memory_queued_item_store.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/in_memory_queued_item_store.dart similarity index 86% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/in_memory_queued_item_store.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/in_memory_queued_item_store.dart index 252956a969..f7ea79d8c1 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/in_memory_queued_item_store.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/in_memory_queued_item_store.dart @@ -3,13 +3,13 @@ import 'dart:collection'; -import 'package:aws_logging_cloudwatch/src/queued_item_store/queued_item_store.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/queued_item_store/queued_item_store.dart'; -/// {@template aws_logging_cloudwatch.in_memory_queued_item_store} +/// {@template amplify_logging_cloudwatch_dart_dart.in_memory_queued_item_store} /// Stores string elements in device memory. /// {@endtemplate} class InMemoryQueuedItemStore implements QueuedItemStore { - /// {@macro aws_logging_cloudwatch.in_memory_queued_item_store} + /// {@macro amplify_logging_cloudwatch_dart.in_memory_queued_item_store} InMemoryQueuedItemStore(); /// The next ID that should be used when adding an item in the DB. diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/index_db/indexed_db_adapter.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/index_db/indexed_db_adapter.dart similarity index 98% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/index_db/indexed_db_adapter.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/index_db/indexed_db_adapter.dart index 7da69274ae..ed3fc8c017 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/index_db/indexed_db_adapter.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/index_db/indexed_db_adapter.dart @@ -7,8 +7,8 @@ import 'dart:async'; import 'dart:js_util'; import 'package:amplify_core/amplify_core.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/queued_item_store/queued_item_store.dart'; import 'package:aws_common/src/js/indexed_db.dart'; -import 'package:aws_logging_cloudwatch/src/queued_item_store/queued_item_store.dart'; import 'package:collection/collection.dart'; // TODO(kylechen): Consider merging/refactoring with existing 'amplify_secure_storage_web - _IndexedDBStorage' class diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/queued_item_store.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/queued_item_store.dart similarity index 92% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/queued_item_store.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/queued_item_store.dart index 24e197d449..a64fe54270 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/queued_item_store/queued_item_store.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/queued_item_store.dart @@ -33,11 +33,11 @@ abstract interface class QueuedItemStore { FutureOr close(); } -/// {@template aws_logging_cloudwatch.string_database_element} +/// {@template amplify_logging_cloudwatch_dart_dart.string_database_element} /// An item stored in the [QueuedItemStore]. /// {@endtemplate} class QueuedItem { - /// {@macro aws_logging_cloudwatch.string_database_element} + /// {@macro amplify_logging_cloudwatch_dart.string_database_element} /// The size of the item, in bytes, when stored in the database. const QueuedItem({ diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/remote_constraint_provider.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/remote_constraint_provider.dart similarity index 92% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/remote_constraint_provider.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/remote_constraint_provider.dart index bc51696495..32e271c0cd 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/remote_constraint_provider.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/remote_constraint_provider.dart @@ -5,11 +5,11 @@ import 'dart:async'; import 'dart:convert'; import 'package:amplify_core/amplify_core.dart'; -import 'package:aws_logging_cloudwatch/src/file_storage/file_storage.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/file_storage/file_storage.dart'; import 'package:aws_signature_v4/aws_signature_v4.dart'; import 'package:meta/meta.dart'; -/// {@template aws_logging_cloudwatch.remote_logging_constraint_provider} +/// {@template amplify_logging_cloudwatch_dart_dart.remote_logging_constraint_provider} /// An Interface to provide custom implementation for /// [RemoteLoggingConstraintProvider] /// It gets the [LoggingConstraints] from a remote location and cache it. @@ -19,14 +19,14 @@ abstract class RemoteLoggingConstraintProvider { LoggingConstraints? get loggingConstraint; } -/// {@template aws_logging_cloudwatch.base_remote_constraints_provider} +/// {@template amplify_logging_cloudwatch_dart_dart.base_remote_constraints_provider} /// Base class for [RemoteLoggingConstraintProvider] to provide /// [LoggingConstraints] from a remote location and cache it. /// {@endtemplate} base class BaseRemoteLoggingConstraintProvider with AWSDebuggable, AmplifyLoggerMixin implements RemoteLoggingConstraintProvider, Closeable { - /// {@macro aws_logging_cloudwatch.base_remote_constraints_provider} + /// {@macro amplify_logging_cloudwatch_dart.base_remote_constraints_provider} BaseRemoteLoggingConstraintProvider({ required DefaultRemoteConfiguration config, FileStorage? fileStorage, @@ -160,13 +160,13 @@ base class BaseRemoteLoggingConstraintProvider } } -/// {@template aws_logging_cloudwatch.default_remote_logging_constraint_provider} +/// {@template amplify_logging_cloudwatch_dart_dart.default_remote_logging_constraint_provider} /// Default implementation of [RemoteLoggingConstraintProvider] to fetch /// [LoggingConstraints] from an http endpoint periodically. /// {@endtemplate} final class DefaultRemoteLoggingConstraintProvider extends BaseRemoteLoggingConstraintProvider { - /// {@macro aws_logging_cloudwatch.default_remote_logging_constraint_provider} + /// {@macro amplify_logging_cloudwatch_dart.default_remote_logging_constraint_provider} DefaultRemoteLoggingConstraintProvider({ required super.config, required String region, diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/cloud_watch_logs.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/cloud_watch_logs.dart similarity index 56% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/cloud_watch_logs.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/cloud_watch_logs.dart index 0c895030f0..bf0c294704 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/cloud_watch_logs.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/cloud_watch_logs.dart @@ -12,18 +12,18 @@ /// * **Monitor CloudTrail logged events**: You can create alarms in CloudWatch and receive notifications of particular API activity as captured by CloudTrail. You can use the notification to perform troubleshooting. /// /// * **Archive log data**: You can use CloudWatch Logs to store your log data in highly durable storage. You can change the log retention setting so that any log events earlier than this setting are automatically deleted. The CloudWatch Logs agent helps to quickly send both rotated and non-rotated log data off of a host and into the log service. You can then access the raw log data when you need it. -library aws_logging_cloudwatch.cloud_watch_logs; +library amplify_logging_cloudwatch_dart.cloud_watch_logs; -export 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/cloud_watch_logs_client.dart'; -export 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/create_log_stream_request.dart'; -export 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/data_already_accepted_exception.dart'; -export 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/input_log_event.dart'; -export 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/invalid_parameter_exception.dart'; -export 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/invalid_sequence_token_exception.dart'; -export 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/put_log_events_request.dart'; -export 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/put_log_events_response.dart'; -export 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/rejected_log_events_info.dart'; -export 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/resource_already_exists_exception.dart'; -export 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/resource_not_found_exception.dart'; -export 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/service_unavailable_exception.dart'; -export 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/unrecognized_client_exception.dart'; +export 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/cloud_watch_logs_client.dart'; +export 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/create_log_stream_request.dart'; +export 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/data_already_accepted_exception.dart'; +export 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/input_log_event.dart'; +export 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/invalid_parameter_exception.dart'; +export 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/invalid_sequence_token_exception.dart'; +export 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/put_log_events_request.dart'; +export 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/put_log_events_response.dart'; +export 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/rejected_log_events_info.dart'; +export 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/resource_already_exists_exception.dart'; +export 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/resource_not_found_exception.dart'; +export 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/service_unavailable_exception.dart'; +export 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/unrecognized_client_exception.dart'; diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/cloud_watch_logs_client.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/cloud_watch_logs_client.dart similarity index 91% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/cloud_watch_logs_client.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/cloud_watch_logs_client.dart index 9300b2426e..8499c1a788 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/cloud_watch_logs_client.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/cloud_watch_logs_client.dart @@ -1,14 +1,19 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. // ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas -library aws_logging_cloudwatch.cloud_watch_logs.cloud_watch_logs_client; // ignore_for_file: no_leading_underscores_for_library_prefixes +library amplify_logging_cloudwatch_dart.cloud_watch_logs.cloud_watch_logs_client; // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:aws_common/aws_common.dart' as _i1; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/create_log_stream_request.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/put_log_events_request.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/put_log_events_response.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/operation/create_log_stream_operation.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/operation/put_log_events_operation.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/create_log_stream_request.dart' + as _i4; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/put_log_events_request.dart' + as _i7; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/put_log_events_response.dart' + as _i6; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/operation/create_log_stream_operation.dart' + as _i5; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/operation/put_log_events_operation.dart' + as _i8; import 'package:aws_signature_v4/aws_signature_v4.dart' as _i2; import 'package:smithy/smithy.dart' as _i3; diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/common/endpoint_resolver.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/common/endpoint_resolver.dart similarity index 97% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/common/endpoint_resolver.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/common/endpoint_resolver.dart index 21963cc5d1..43b95743f9 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/common/endpoint_resolver.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/common/endpoint_resolver.dart @@ -1,7 +1,7 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. // ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas -library aws_logging_cloudwatch.cloud_watch_logs.common.endpoint_resolver; // ignore_for_file: no_leading_underscores_for_library_prefixes +library amplify_logging_cloudwatch_dart.cloud_watch_logs.common.endpoint_resolver; // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:meta/meta.dart' as _i2; import 'package:smithy_aws/smithy_aws.dart' as _i1; diff --git a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/common/serializers.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/common/serializers.dart new file mode 100644 index 0000000000..d23d719d90 --- /dev/null +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/common/serializers.dart @@ -0,0 +1,53 @@ +// Generated with smithy-dart 0.3.1. DO NOT MODIFY. +// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas + +library amplify_logging_cloudwatch_dart.cloud_watch_logs.common.serializers; // ignore_for_file: no_leading_underscores_for_library_prefixes + +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/create_log_stream_request.dart' + as _i2; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/data_already_accepted_exception.dart' + as _i11; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/input_log_event.dart' + as _i7; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/invalid_parameter_exception.dart' + as _i3; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/invalid_sequence_token_exception.dart' + as _i12; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/put_log_events_request.dart' + as _i8; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/put_log_events_response.dart' + as _i10; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/rejected_log_events_info.dart' + as _i9; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/resource_already_exists_exception.dart' + as _i4; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/resource_not_found_exception.dart' + as _i5; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/service_unavailable_exception.dart' + as _i6; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/unrecognized_client_exception.dart' + as _i13; +import 'package:built_collection/built_collection.dart' as _i14; +import 'package:built_value/serializer.dart'; +import 'package:smithy/smithy.dart' as _i1; + +const List<_i1.SmithySerializer> serializers = [ + ..._i2.CreateLogStreamRequest.serializers, + ..._i3.InvalidParameterException.serializers, + ..._i4.ResourceAlreadyExistsException.serializers, + ..._i5.ResourceNotFoundException.serializers, + ..._i6.ServiceUnavailableException.serializers, + ..._i7.InputLogEvent.serializers, + ..._i8.PutLogEventsRequest.serializers, + ..._i9.RejectedLogEventsInfo.serializers, + ..._i10.PutLogEventsResponse.serializers, + ..._i11.DataAlreadyAcceptedException.serializers, + ..._i12.InvalidSequenceTokenException.serializers, + ..._i13.UnrecognizedClientException.serializers, +]; +final Map builderFactories = { + const FullType( + _i14.BuiltList, + [FullType(_i7.InputLogEvent)], + ): _i14.ListBuilder<_i7.InputLogEvent>.new +}; diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/create_log_stream_request.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/create_log_stream_request.dart similarity index 96% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/create_log_stream_request.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/create_log_stream_request.dart index e52603ebe8..818e591e38 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/create_log_stream_request.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/create_log_stream_request.dart @@ -1,7 +1,7 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. // ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas -library aws_logging_cloudwatch.cloud_watch_logs.model.create_log_stream_request; // ignore_for_file: no_leading_underscores_for_library_prefixes +library amplify_logging_cloudwatch_dart.cloud_watch_logs.model.create_log_stream_request; // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:aws_common/aws_common.dart' as _i2; import 'package:built_value/built_value.dart'; diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/create_log_stream_request.g.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/create_log_stream_request.g.dart similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/create_log_stream_request.g.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/create_log_stream_request.g.dart diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/data_already_accepted_exception.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/data_already_accepted_exception.dart similarity index 97% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/data_already_accepted_exception.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/data_already_accepted_exception.dart index 83f6913bd2..c93d70f604 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/data_already_accepted_exception.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/data_already_accepted_exception.dart @@ -1,7 +1,7 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. // ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas -library aws_logging_cloudwatch.cloud_watch_logs.model.data_already_accepted_exception; // ignore_for_file: no_leading_underscores_for_library_prefixes +library amplify_logging_cloudwatch_dart.cloud_watch_logs.model.data_already_accepted_exception; // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:aws_common/aws_common.dart' as _i1; import 'package:built_value/built_value.dart'; diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/data_already_accepted_exception.g.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/data_already_accepted_exception.g.dart similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/data_already_accepted_exception.g.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/data_already_accepted_exception.g.dart diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/input_log_event.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/input_log_event.dart similarity index 96% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/input_log_event.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/input_log_event.dart index f1c0094719..456a5e56cf 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/input_log_event.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/input_log_event.dart @@ -1,7 +1,7 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. // ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas -library aws_logging_cloudwatch.cloud_watch_logs.model.input_log_event; // ignore_for_file: no_leading_underscores_for_library_prefixes +library amplify_logging_cloudwatch_dart.cloud_watch_logs.model.input_log_event; // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:aws_common/aws_common.dart' as _i1; import 'package:built_value/built_value.dart'; diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/input_log_event.g.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/input_log_event.g.dart similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/input_log_event.g.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/input_log_event.g.dart diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/invalid_parameter_exception.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/invalid_parameter_exception.dart similarity index 96% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/invalid_parameter_exception.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/invalid_parameter_exception.dart index 7a96c765bd..85afe404fc 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/invalid_parameter_exception.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/invalid_parameter_exception.dart @@ -1,7 +1,7 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. // ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas -library aws_logging_cloudwatch.cloud_watch_logs.model.invalid_parameter_exception; // ignore_for_file: no_leading_underscores_for_library_prefixes +library amplify_logging_cloudwatch_dart.cloud_watch_logs.model.invalid_parameter_exception; // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:aws_common/aws_common.dart' as _i1; import 'package:built_value/built_value.dart'; diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/invalid_parameter_exception.g.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/invalid_parameter_exception.g.dart similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/invalid_parameter_exception.g.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/invalid_parameter_exception.g.dart diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/invalid_sequence_token_exception.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/invalid_sequence_token_exception.dart similarity index 97% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/invalid_sequence_token_exception.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/invalid_sequence_token_exception.dart index 49f2196a16..8af2befb62 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/invalid_sequence_token_exception.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/invalid_sequence_token_exception.dart @@ -1,7 +1,7 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. // ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas -library aws_logging_cloudwatch.cloud_watch_logs.model.invalid_sequence_token_exception; // ignore_for_file: no_leading_underscores_for_library_prefixes +library amplify_logging_cloudwatch_dart.cloud_watch_logs.model.invalid_sequence_token_exception; // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:aws_common/aws_common.dart' as _i1; import 'package:built_value/built_value.dart'; diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/invalid_sequence_token_exception.g.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/invalid_sequence_token_exception.g.dart similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/invalid_sequence_token_exception.g.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/invalid_sequence_token_exception.g.dart diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_request.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_request.dart similarity index 94% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_request.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_request.dart index ade65f34b7..acfd736886 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_request.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_request.dart @@ -1,11 +1,12 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. // ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas -library aws_logging_cloudwatch.cloud_watch_logs.model.put_log_events_request; // ignore_for_file: no_leading_underscores_for_library_prefixes +library amplify_logging_cloudwatch_dart.cloud_watch_logs.model.put_log_events_request; // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:aws_common/aws_common.dart' as _i2; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/input_log_event.dart'; -import 'package:built_collection/built_collection.dart' as _i3; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/input_log_event.dart' + as _i3; +import 'package:built_collection/built_collection.dart' as _i4; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; import 'package:smithy/smithy.dart' as _i1; diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_request.g.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_request.g.dart similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_request.g.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_request.g.dart diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_response.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_response.dart similarity index 94% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_response.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_response.dart index d075f59a0b..585f1318e9 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_response.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_response.dart @@ -1,10 +1,11 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. // ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas -library aws_logging_cloudwatch.cloud_watch_logs.model.put_log_events_response; // ignore_for_file: no_leading_underscores_for_library_prefixes +library amplify_logging_cloudwatch_dart.cloud_watch_logs.model.put_log_events_response; // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:aws_common/aws_common.dart' as _i1; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/rejected_log_events_info.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/rejected_log_events_info.dart' + as _i2; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; import 'package:smithy/smithy.dart' as _i2; diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_response.g.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_response.g.dart similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_response.g.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_response.g.dart diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/rejected_log_events_info.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/rejected_log_events_info.dart similarity index 96% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/rejected_log_events_info.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/rejected_log_events_info.dart index 4a635a09ea..4f1f312f2a 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/rejected_log_events_info.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/rejected_log_events_info.dart @@ -1,7 +1,7 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. // ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas -library aws_logging_cloudwatch.cloud_watch_logs.model.rejected_log_events_info; // ignore_for_file: no_leading_underscores_for_library_prefixes +library amplify_logging_cloudwatch_dart.cloud_watch_logs.model.rejected_log_events_info; // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:aws_common/aws_common.dart' as _i1; import 'package:built_value/built_value.dart'; diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/rejected_log_events_info.g.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/rejected_log_events_info.g.dart similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/rejected_log_events_info.g.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/rejected_log_events_info.g.dart diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/resource_already_exists_exception.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/resource_already_exists_exception.dart similarity index 96% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/resource_already_exists_exception.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/resource_already_exists_exception.dart index 4bda859642..1aa5e21be4 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/resource_already_exists_exception.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/resource_already_exists_exception.dart @@ -1,7 +1,7 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. // ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas -library aws_logging_cloudwatch.cloud_watch_logs.model.resource_already_exists_exception; // ignore_for_file: no_leading_underscores_for_library_prefixes +library amplify_logging_cloudwatch_dart.cloud_watch_logs.model.resource_already_exists_exception; // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:aws_common/aws_common.dart' as _i1; import 'package:built_value/built_value.dart'; diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/resource_already_exists_exception.g.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/resource_already_exists_exception.g.dart similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/resource_already_exists_exception.g.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/resource_already_exists_exception.g.dart diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/resource_not_found_exception.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/resource_not_found_exception.dart similarity index 96% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/resource_not_found_exception.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/resource_not_found_exception.dart index 728356dbd5..94933c62be 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/resource_not_found_exception.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/resource_not_found_exception.dart @@ -1,7 +1,7 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. // ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas -library aws_logging_cloudwatch.cloud_watch_logs.model.resource_not_found_exception; // ignore_for_file: no_leading_underscores_for_library_prefixes +library amplify_logging_cloudwatch_dart.cloud_watch_logs.model.resource_not_found_exception; // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:aws_common/aws_common.dart' as _i1; import 'package:built_value/built_value.dart'; diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/resource_not_found_exception.g.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/resource_not_found_exception.g.dart similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/resource_not_found_exception.g.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/resource_not_found_exception.g.dart diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/service_unavailable_exception.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/service_unavailable_exception.dart similarity index 96% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/service_unavailable_exception.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/service_unavailable_exception.dart index c8932f7df6..4daf156f19 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/service_unavailable_exception.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/service_unavailable_exception.dart @@ -1,7 +1,7 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. // ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas -library aws_logging_cloudwatch.cloud_watch_logs.model.service_unavailable_exception; // ignore_for_file: no_leading_underscores_for_library_prefixes +library amplify_logging_cloudwatch_dart.cloud_watch_logs.model.service_unavailable_exception; // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:aws_common/aws_common.dart' as _i1; import 'package:built_value/built_value.dart'; diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/service_unavailable_exception.g.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/service_unavailable_exception.g.dart similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/service_unavailable_exception.g.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/service_unavailable_exception.g.dart diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/unrecognized_client_exception.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/unrecognized_client_exception.dart similarity index 96% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/unrecognized_client_exception.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/unrecognized_client_exception.dart index ce051bd408..a4635db91e 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/unrecognized_client_exception.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/unrecognized_client_exception.dart @@ -1,7 +1,7 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. // ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas -library aws_logging_cloudwatch.cloud_watch_logs.model.unrecognized_client_exception; // ignore_for_file: no_leading_underscores_for_library_prefixes +library amplify_logging_cloudwatch_dart.cloud_watch_logs.model.unrecognized_client_exception; // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:aws_common/aws_common.dart' as _i1; import 'package:built_value/built_value.dart'; diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/unrecognized_client_exception.g.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/unrecognized_client_exception.g.dart similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/model/unrecognized_client_exception.g.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/unrecognized_client_exception.g.dart diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/operation/create_log_stream_operation.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/operation/create_log_stream_operation.dart similarity index 84% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/operation/create_log_stream_operation.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/operation/create_log_stream_operation.dart index 538ce710e7..5483275d8c 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/operation/create_log_stream_operation.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/operation/create_log_stream_operation.dart @@ -1,19 +1,26 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. // ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas -library aws_logging_cloudwatch.cloud_watch_logs.operation.create_log_stream_operation; // ignore_for_file: no_leading_underscores_for_library_prefixes +library amplify_logging_cloudwatch_dart.cloud_watch_logs.operation.create_log_stream_operation; // ignore_for_file: no_leading_underscores_for_library_prefixes import 'dart:async' as _i5; -import 'package:aws_common/aws_common.dart' as _i4; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/common/endpoint_resolver.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/common/serializers.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/create_log_stream_request.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/invalid_parameter_exception.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/resource_already_exists_exception.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/resource_not_found_exception.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/service_unavailable_exception.dart'; -import 'package:aws_signature_v4/aws_signature_v4.dart' as _i2; +import 'package:aws_common/aws_common.dart' as _i6; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/common/endpoint_resolver.dart' + as _i7; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/common/serializers.dart' + as _i5; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/create_log_stream_request.dart' + as _i2; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/invalid_parameter_exception.dart' + as _i8; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/resource_already_exists_exception.dart' + as _i9; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/resource_not_found_exception.dart' + as _i10; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/service_unavailable_exception.dart' + as _i11; +import 'package:aws_signature_v4/aws_signature_v4.dart' as _i3; import 'package:smithy/smithy.dart' as _i1; import 'package:smithy_aws/smithy_aws.dart' as _i3; diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/operation/put_log_events_operation.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/operation/put_log_events_operation.dart similarity index 86% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/operation/put_log_events_operation.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/operation/put_log_events_operation.dart index 777252fd1a..b31c4f2145 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/operation/put_log_events_operation.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/operation/put_log_events_operation.dart @@ -1,22 +1,32 @@ // Generated with smithy-dart 0.3.1. DO NOT MODIFY. // ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas -library aws_logging_cloudwatch.cloud_watch_logs.operation.put_log_events_operation; // ignore_for_file: no_leading_underscores_for_library_prefixes +library amplify_logging_cloudwatch_dart.cloud_watch_logs.operation.put_log_events_operation; // ignore_for_file: no_leading_underscores_for_library_prefixes import 'dart:async' as _i5; -import 'package:aws_common/aws_common.dart' as _i4; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/common/endpoint_resolver.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/common/serializers.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/data_already_accepted_exception.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/invalid_parameter_exception.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/invalid_sequence_token_exception.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/put_log_events_request.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/put_log_events_response.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/resource_not_found_exception.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/service_unavailable_exception.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/unrecognized_client_exception.dart'; -import 'package:aws_signature_v4/aws_signature_v4.dart' as _i2; +import 'package:aws_common/aws_common.dart' as _i7; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/common/endpoint_resolver.dart' + as _i8; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/common/serializers.dart' + as _i6; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/data_already_accepted_exception.dart' + as _i9; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/invalid_parameter_exception.dart' + as _i10; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/invalid_sequence_token_exception.dart' + as _i11; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/put_log_events_request.dart' + as _i2; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/put_log_events_response.dart' + as _i3; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/resource_not_found_exception.dart' + as _i12; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/service_unavailable_exception.dart' + as _i13; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/unrecognized_client_exception.dart' + as _i14; +import 'package:aws_signature_v4/aws_signature_v4.dart' as _i4; import 'package:smithy/smithy.dart' as _i1; import 'package:smithy_aws/smithy_aws.dart' as _i3; diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/stoppable_timer.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/stoppable_timer.dart similarity index 89% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/stoppable_timer.dart rename to packages/logging/amplify_logging_cloudwatch_dart/lib/src/stoppable_timer.dart index 6cd5e15ef9..5f635f796e 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/stoppable_timer.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/stoppable_timer.dart @@ -3,14 +3,14 @@ import 'dart:async'; -/// {@template aws_logging_cloudwatch.stoppable_timer} +/// {@template amplify_logging_cloudwatch_dart_dart.stoppable_timer} /// A Timer that can be stopped and started again. /// /// The `callback` function is invoked repeatedly with [duration] intervals /// until stopped with the [stop] function. /// {@endtemplate} class StoppableTimer { - /// {@macro aws_logging_cloudwatch.stoppable_timer} + /// {@macro amplify_logging_cloudwatch_dart.stoppable_timer} StoppableTimer({ required this.duration, required Future Function() callback, diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/pubspec.yaml b/packages/logging/amplify_logging_cloudwatch_dart/pubspec.yaml similarity index 96% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/pubspec.yaml rename to packages/logging/amplify_logging_cloudwatch_dart/pubspec.yaml index 30fa4c37d9..ffdeb9a500 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/pubspec.yaml +++ b/packages/logging/amplify_logging_cloudwatch_dart/pubspec.yaml @@ -1,4 +1,4 @@ -name: aws_logging_cloudwatch +name: amplify_logging_cloudwatch_dart description: Implementation of AWS logger plugin with CloudWatch Logs. version: 0.1.0 homepage: https://docs.amplify.aws/lib/q/platform/flutter/ diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/sdk.yaml b/packages/logging/amplify_logging_cloudwatch_dart/sdk.yaml similarity index 100% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/sdk.yaml rename to packages/logging/amplify_logging_cloudwatch_dart/sdk.yaml diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/test/aws_logging_cloudwatch_test.dart b/packages/logging/amplify_logging_cloudwatch_dart/test/aws_logging_cloudwatch_test.dart similarity index 76% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/test/aws_logging_cloudwatch_test.dart rename to packages/logging/amplify_logging_cloudwatch_dart/test/aws_logging_cloudwatch_test.dart index 99d6eeb3e9..c0a9af8d2f 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/test/aws_logging_cloudwatch_test.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/test/aws_logging_cloudwatch_test.dart @@ -4,5 +4,5 @@ import 'package:test/test.dart'; void main() { - test('aws_logging_cloudwatch', () {}); + test('amplify_logging_cloudwatch_dart', () {}); } diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/test/cloudwatch_logger_plugin_test.dart b/packages/logging/amplify_logging_cloudwatch_dart/test/cloudwatch_logger_plugin_test.dart similarity index 99% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/test/cloudwatch_logger_plugin_test.dart rename to packages/logging/amplify_logging_cloudwatch_dart/test/cloudwatch_logger_plugin_test.dart index c1f9998d50..68c7207b3a 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/test/cloudwatch_logger_plugin_test.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/test/cloudwatch_logger_plugin_test.dart @@ -4,9 +4,9 @@ import 'dart:async'; import 'package:amplify_core/amplify_core.dart'; -import 'package:aws_logging_cloudwatch/aws_logging_cloudwatch.dart'; -import 'package:aws_logging_cloudwatch/src/queued_item_store/queued_item_store.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/cloud_watch_logs.dart'; +import 'package:amplify_logging_cloudwatch_dart/amplify_logging_cloudwatch_dart.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/queued_item_store/queued_item_store.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/cloud_watch_logs.dart'; import 'package:mocktail/mocktail.dart'; import 'package:test/test.dart'; diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/test/mocks.dart b/packages/logging/amplify_logging_cloudwatch_dart/test/mocks.dart similarity index 78% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/test/mocks.dart rename to packages/logging/amplify_logging_cloudwatch_dart/test/mocks.dart index b2308a9286..64a2f8d9ab 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/test/mocks.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/test/mocks.dart @@ -1,8 +1,8 @@ import 'package:amplify_core/amplify_core.dart'; -import 'package:aws_logging_cloudwatch/aws_logging_cloudwatch.dart' +import 'package:amplify_logging_cloudwatch_dart/amplify_logging_cloudwatch_dart.dart' show CloudWatchLogStreamProvider, RemoteLoggingConstraintProvider; -import 'package:aws_logging_cloudwatch/src/queued_item_store/queued_item_store.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/cloud_watch_logs.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/queued_item_store/queued_item_store.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/cloud_watch_logs.dart'; import 'package:mocktail/mocktail.dart'; import 'package:smithy/smithy.dart'; diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/test/queued_item_store/queued_item_store_test.dart b/packages/logging/amplify_logging_cloudwatch_dart/test/queued_item_store/queued_item_store_test.dart similarity index 97% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/test/queued_item_store/queued_item_store_test.dart rename to packages/logging/amplify_logging_cloudwatch_dart/test/queued_item_store/queued_item_store_test.dart index 3576e0daa0..e638cdc65d 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/test/queued_item_store/queued_item_store_test.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/test/queued_item_store/queued_item_store_test.dart @@ -1,10 +1,10 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -import 'package:aws_logging_cloudwatch/src/path_provider/app_path_provider.dart'; -import 'package:aws_logging_cloudwatch/src/queued_item_store/dart_queued_item_store.dart'; -import 'package:aws_logging_cloudwatch/src/queued_item_store/in_memory_queued_item_store.dart'; -import 'package:aws_logging_cloudwatch/src/queued_item_store/queued_item_store.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/path_provider/app_path_provider.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/queued_item_store/dart_queued_item_store.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/queued_item_store/in_memory_queued_item_store.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/queued_item_store/queued_item_store.dart'; import 'package:test/test.dart'; void main() { diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/test/remote_constraint_provider_test.dart b/packages/logging/amplify_logging_cloudwatch_dart/test/remote_constraint_provider_test.dart similarity index 98% rename from packages/logging_cloudwatch/aws_logging_cloudwatch/test/remote_constraint_provider_test.dart rename to packages/logging/amplify_logging_cloudwatch_dart/test/remote_constraint_provider_test.dart index 003679c272..3794d8abd1 100644 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/test/remote_constraint_provider_test.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/test/remote_constraint_provider_test.dart @@ -4,8 +4,8 @@ import 'dart:convert'; import 'package:amplify_core/amplify_core.dart'; +import 'package:amplify_logging_cloudwatch_dart/amplify_logging_cloudwatch_dart.dart'; import 'package:aws_common/testing.dart'; -import 'package:aws_logging_cloudwatch/aws_logging_cloudwatch.dart'; import 'package:mocktail/mocktail.dart'; import 'package:test/test.dart'; diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/README.md b/packages/logging_cloudwatch/aws_logging_cloudwatch/README.md deleted file mode 100644 index 087af44943..0000000000 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/README.md +++ /dev/null @@ -1 +0,0 @@ -# aws_logging_cloudwatch diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/example/README.md b/packages/logging_cloudwatch/aws_logging_cloudwatch/example/README.md deleted file mode 100644 index b4a5a65d67..0000000000 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/example/README.md +++ /dev/null @@ -1 +0,0 @@ -# aws_logging_cloudwatch_example diff --git a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/common/serializers.dart b/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/common/serializers.dart deleted file mode 100644 index e8c21b4e4b..0000000000 --- a/packages/logging_cloudwatch/aws_logging_cloudwatch/lib/src/sdk/src/cloud_watch_logs/common/serializers.dart +++ /dev/null @@ -1,41 +0,0 @@ -// Generated with smithy-dart 0.3.1. DO NOT MODIFY. -// ignore_for_file: avoid_unused_constructor_parameters,deprecated_member_use_from_same_package,non_constant_identifier_names,require_trailing_commas - -library aws_logging_cloudwatch.cloud_watch_logs.common.serializers; // ignore_for_file: no_leading_underscores_for_library_prefixes - -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/create_log_stream_request.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/data_already_accepted_exception.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/input_log_event.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/invalid_parameter_exception.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/invalid_sequence_token_exception.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/put_log_events_request.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/put_log_events_response.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/rejected_log_events_info.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/resource_already_exists_exception.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/resource_not_found_exception.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/service_unavailable_exception.dart'; -import 'package:aws_logging_cloudwatch/src/sdk/src/cloud_watch_logs/model/unrecognized_client_exception.dart'; -import 'package:built_collection/built_collection.dart' as _i2; -import 'package:built_value/serializer.dart'; -import 'package:smithy/smithy.dart' as _i1; - -const List<_i1.SmithySerializer> serializers = [ - ...CreateLogStreamRequest.serializers, - ...InvalidParameterException.serializers, - ...ResourceAlreadyExistsException.serializers, - ...ResourceNotFoundException.serializers, - ...ServiceUnavailableException.serializers, - ...InputLogEvent.serializers, - ...PutLogEventsRequest.serializers, - ...RejectedLogEventsInfo.serializers, - ...PutLogEventsResponse.serializers, - ...DataAlreadyAcceptedException.serializers, - ...InvalidSequenceTokenException.serializers, - ...UnrecognizedClientException.serializers, -]; -final Map builderFactories = { - const FullType( - _i2.BuiltList, - [FullType(InputLogEvent)], - ): _i2.ListBuilder.new -}; From c4f17a09a698250c1cb338703530a873f49d3f11 Mon Sep 17 00:00:00 2001 From: Kha Truong <64438356+khatruong2009@users.noreply.github.com> Date: Thu, 16 Nov 2023 16:12:00 -0800 Subject: [PATCH 02/16] change swift files back --- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/amplify/amplify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/amplify/amplify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index c08326fa04..6f6fe42d59 100644 --- a/packages/amplify/amplify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/amplify/amplify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -17,6 +17,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) + FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) } diff --git a/packages/analytics/amplify_analytics_pinpoint/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/analytics/amplify_analytics_pinpoint/example/macos/Flutter/GeneratedPluginRegistrant.swift index c08326fa04..6f6fe42d59 100644 --- a/packages/analytics/amplify_analytics_pinpoint/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/analytics/amplify_analytics_pinpoint/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -17,6 +17,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) + FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) } diff --git a/packages/api/amplify_api/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/api/amplify_api/example/macos/Flutter/GeneratedPluginRegistrant.swift index 8b6fd0e279..3e3c6f2144 100644 --- a/packages/api/amplify_api/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/api/amplify_api/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -18,7 +18,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) + FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } diff --git a/packages/auth/amplify_auth_cognito/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/auth/amplify_auth_cognito/example/macos/Flutter/GeneratedPluginRegistrant.swift index 8b6fd0e279..3e3c6f2144 100644 --- a/packages/auth/amplify_auth_cognito/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/auth/amplify_auth_cognito/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -18,7 +18,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) + FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } diff --git a/packages/authenticator/amplify_authenticator/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/authenticator/amplify_authenticator/example/macos/Flutter/GeneratedPluginRegistrant.swift index 8b6fd0e279..3e3c6f2144 100644 --- a/packages/authenticator/amplify_authenticator/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/authenticator/amplify_authenticator/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -18,7 +18,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) + FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } diff --git a/packages/authenticator/amplify_authenticator_test/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/authenticator/amplify_authenticator_test/example/macos/Flutter/GeneratedPluginRegistrant.swift index c33812bc70..32a9505309 100644 --- a/packages/authenticator/amplify_authenticator_test/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/authenticator/amplify_authenticator_test/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -16,7 +16,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifyAuthCognitoPlugin.register(with: registry.registrar(forPlugin: "AmplifyAuthCognitoPlugin")) AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) + FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } diff --git a/packages/logging/amplify_logging_cloudwatch/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/logging/amplify_logging_cloudwatch/example/macos/Flutter/GeneratedPluginRegistrant.swift index c33812bc70..32a9505309 100644 --- a/packages/logging/amplify_logging_cloudwatch/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/logging/amplify_logging_cloudwatch/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -16,7 +16,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifyAuthCognitoPlugin.register(with: registry.registrar(forPlugin: "AmplifyAuthCognitoPlugin")) AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) + FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } diff --git a/packages/storage/amplify_storage_s3/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/storage/amplify_storage_s3/example/macos/Flutter/GeneratedPluginRegistrant.swift index c33812bc70..32a9505309 100644 --- a/packages/storage/amplify_storage_s3/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/storage/amplify_storage_s3/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -16,7 +16,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifyAuthCognitoPlugin.register(with: registry.registrar(forPlugin: "AmplifyAuthCognitoPlugin")) AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) + FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } From 6ef5c70c1828614709e6f6603c0a2bac202eeb25 Mon Sep 17 00:00:00 2001 From: Kha Truong <64438356+khatruong2009@users.noreply.github.com> Date: Thu, 16 Nov 2023 16:33:24 -0800 Subject: [PATCH 03/16] chore: Update Amplify CloudWatchLoggerPlugin to AmplifyLoggingCloudwatch --- .../amplify_logging_cloudwatch/example/lib/main.dart | 2 +- .../lib/src/amplify_logging_cloudwatch_impl.dart | 10 +++++----- .../src/amplify_logging_cloudwatch_dart_impl.dart | 12 ++++++------ .../test/cloudwatch_logger_plugin_test.dart | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/logging/amplify_logging_cloudwatch/example/lib/main.dart b/packages/logging/amplify_logging_cloudwatch/example/lib/main.dart index 9688db8f97..65b89cc2cc 100644 --- a/packages/logging/amplify_logging_cloudwatch/example/lib/main.dart +++ b/packages/logging/amplify_logging_cloudwatch/example/lib/main.dart @@ -39,7 +39,7 @@ class _MyAppState extends State { MacOSSecureStorageOptions(useDataProtection: false), ), ); - final loggingPlugin = AmplifyCloudWatchLoggerPlugin( + final loggingPlugin = AmplifyLoggingCloudwatch( CloudWatchPluginConfig.fromJson( jsonDecode(loggingconfig) as Map, ), diff --git a/packages/logging/amplify_logging_cloudwatch/lib/src/amplify_logging_cloudwatch_impl.dart b/packages/logging/amplify_logging_cloudwatch/lib/src/amplify_logging_cloudwatch_impl.dart index 5e5a3bfe6c..adf251c55f 100644 --- a/packages/logging/amplify_logging_cloudwatch/lib/src/amplify_logging_cloudwatch_impl.dart +++ b/packages/logging/amplify_logging_cloudwatch/lib/src/amplify_logging_cloudwatch_impl.dart @@ -6,9 +6,9 @@ import 'package:amplify_logging_cloudwatch/src/path_provider/flutter_path_provid import 'package:amplify_logging_cloudwatch_dart/amplify_logging_cloudwatch_dart.dart'; /// {@macro amplify_logging_cloudwatch_dart.cloudwatch_logger_plugin} -class AmplifyCloudWatchLoggerPlugin extends CloudWatchLoggerPlugin { +class AmplifyLoggingCloudwatch extends AmplifyLoggingCloudWatchDart { /// {@macro amplify_logging_cloudwatch_dart.cloudwatch_logger_plugin} - AmplifyCloudWatchLoggerPlugin( + AmplifyLoggingCloudwatch( super.pluginConfig, { super.remoteLoggingConstraintProvider, FutureOr Function()? logStreamNameProvider, @@ -31,14 +31,14 @@ class AmplifyCloudWatchLoggerPlugin extends CloudWatchLoggerPlugin { /// A plugin key which can be used with `Amplify.Logging.getPlugin` to retrieve /// a CloudWatch-specific Logging category interface. /// {@endtemplate} - static const LoggingPluginKey pluginKey = + static const LoggingPluginKey pluginKey = _AmplifyCloudWatchLoggerPluginKey(); } class _AmplifyCloudWatchLoggerPluginKey - extends LoggingPluginKey { + extends LoggingPluginKey { const _AmplifyCloudWatchLoggerPluginKey(); @override - String get runtimeTypeName => 'AmplifyCloudWatchLoggerPluginKey'; + String get runtimeTypeName => 'AmplifyLoggingCloudwatchKey'; } diff --git a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/amplify_logging_cloudwatch_dart_impl.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/amplify_logging_cloudwatch_dart_impl.dart index e93e56b4d7..fbefe68024 100644 --- a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/amplify_logging_cloudwatch_dart_impl.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/amplify_logging_cloudwatch_dart_impl.dart @@ -52,9 +52,9 @@ typedef _LogBatch = (List logQueues, List logEvents); /// {@template amplify_logging_cloudwatch_dart_dart.cloudwatch_logger_plugin} /// An [AWSLoggerPlugin] for sending logs to AWS CloudWatch Logs. /// {@endtemplate} -class CloudWatchLoggerPlugin extends LoggingPluginInterface with AWSDebuggable { +class AmplifyLoggingCloudWatchDart extends LoggingPluginInterface with AWSDebuggable { /// {@macro amplify_logging_cloudwatch_dart.cloudwatch_logger_plugin} - CloudWatchLoggerPlugin( + AmplifyLoggingCloudWatchDart( CloudWatchPluginConfig pluginConfig, { RemoteLoggingConstraintProvider? remoteLoggingConstraintProvider, FutureOr Function()? logStreamNameProvider, @@ -428,22 +428,22 @@ class CloudWatchLoggerPlugin extends LoggingPluginInterface with AWSDebuggable { } @override - String get runtimeTypeName => 'CloudWatchLoggerPlugin'; + String get runtimeTypeName => 'AmplifyLoggingCloudWatchDart'; /// {@template amplify_logging_cloudwatch_dart.plugin_key} /// A plugin key which can be used with `Amplify.Logging.getPlugin` to retrieve /// a CloudWatch-specific Logging category interface. /// {@endtemplate} - static const LoggingPluginKey pluginKey = + static const LoggingPluginKey pluginKey = _CloudWatchLoggerPluginKey(); } class _CloudWatchLoggerPluginKey - extends LoggingPluginKey { + extends LoggingPluginKey { const _CloudWatchLoggerPluginKey(); @override - String get runtimeTypeName => 'CloudWatchLoggerPluginPluginKey'; + String get runtimeTypeName => 'AmplifyLoggingCloudWatchDartKey'; } extension on QueuedItem { diff --git a/packages/logging/amplify_logging_cloudwatch_dart/test/cloudwatch_logger_plugin_test.dart b/packages/logging/amplify_logging_cloudwatch_dart/test/cloudwatch_logger_plugin_test.dart index 68c7207b3a..701baf60a7 100644 --- a/packages/logging/amplify_logging_cloudwatch_dart/test/cloudwatch_logger_plugin_test.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/test/cloudwatch_logger_plugin_test.dart @@ -16,7 +16,7 @@ void main() { late MockCloudWatchLogsClient mockCloudWatchLogsClient; late MockQueuedItemStore mockQueuedItemStore; late MockCloudWatchLogStreamProvider mockCloudWatchLogStreamProvider; - late CloudWatchLoggerPlugin plugin; + late AmplifyLoggingCloudWatchDart plugin; late MockSmithyOperation mockPutLogEventsOperation; late DependencyManager dependencyManagerOverride; late MockAuthProviderRepo mockAuthProviderRepo; @@ -93,7 +93,7 @@ void main() { .getAuthProvider(APIAuthorizationType.iam.authProviderToken), ).thenReturn(mockIamAuthProvider); - plugin = CloudWatchLoggerPlugin( + plugin = AmplifyLoggingCloudWatchDart( pluginConfig, dependencyManagerOverride: dependencyManagerOverride, ); From 8288db3eb513f0dbd377f1ccffb31f9096b8cfb2 Mon Sep 17 00:00:00 2001 From: Kha Truong <64438356+khatruong2009@users.noreply.github.com> Date: Thu, 16 Nov 2023 16:44:40 -0800 Subject: [PATCH 04/16] chore: removed cloud_watch_logs duplicate imports --- .../lib/src/amplify_logging_cloudwatch_dart_impl.dart | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/amplify_logging_cloudwatch_dart_impl.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/amplify_logging_cloudwatch_dart_impl.dart index fbefe68024..d598553eeb 100644 --- a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/amplify_logging_cloudwatch_dart_impl.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/amplify_logging_cloudwatch_dart_impl.dart @@ -11,12 +11,7 @@ import 'package:amplify_logging_cloudwatch_dart/amplify_logging_cloudwatch_dart. import 'package:amplify_logging_cloudwatch_dart/src/path_provider/app_path_provider.dart'; import 'package:amplify_logging_cloudwatch_dart/src/queued_item_store/dart_queued_item_store.dart'; import 'package:amplify_logging_cloudwatch_dart/src/queued_item_store/queued_item_store.dart'; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/cloud_watch_logs_client.dart'; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/input_log_event.dart'; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/put_log_events_request.dart'; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/put_log_events_response.dart'; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/rejected_log_events_info.dart'; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/resource_not_found_exception.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/cloud_watch_logs.dart'; import 'package:amplify_logging_cloudwatch_dart/src/stoppable_timer.dart'; import 'package:fixnum/fixnum.dart'; import 'package:meta/meta.dart'; @@ -52,7 +47,8 @@ typedef _LogBatch = (List logQueues, List logEvents); /// {@template amplify_logging_cloudwatch_dart_dart.cloudwatch_logger_plugin} /// An [AWSLoggerPlugin] for sending logs to AWS CloudWatch Logs. /// {@endtemplate} -class AmplifyLoggingCloudWatchDart extends LoggingPluginInterface with AWSDebuggable { +class AmplifyLoggingCloudWatchDart extends LoggingPluginInterface + with AWSDebuggable { /// {@macro amplify_logging_cloudwatch_dart.cloudwatch_logger_plugin} AmplifyLoggingCloudWatchDart( CloudWatchPluginConfig pluginConfig, { From 815dfb5e1f6ced905612adb94d2e82f2b97e8493 Mon Sep 17 00:00:00 2001 From: Kha Truong <64438356+khatruong2009@users.noreply.github.com> Date: Thu, 16 Nov 2023 16:53:18 -0800 Subject: [PATCH 05/16] chore: remove typos and duplicate imports --- .../lib/src/amplify_logging_cloudwatch_dart_impl.dart | 2 +- .../lib/src/log_stream_provider.dart | 6 ++---- .../lib/src/path_provider/app_path_provider_html.dart | 2 +- .../lib/src/path_provider/app_path_provider_io.dart | 2 +- .../lib/src/path_provider/app_path_provider_stub.dart | 2 +- .../src/queued_item_store/in_memory_queued_item_store.dart | 2 +- .../lib/src/queued_item_store/queued_item_store.dart | 2 +- .../lib/src/remote_constraint_provider.dart | 6 +++--- .../lib/src/stoppable_timer.dart | 2 +- 9 files changed, 12 insertions(+), 14 deletions(-) diff --git a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/amplify_logging_cloudwatch_dart_impl.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/amplify_logging_cloudwatch_dart_impl.dart index d598553eeb..ff57038093 100644 --- a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/amplify_logging_cloudwatch_dart_impl.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/amplify_logging_cloudwatch_dart_impl.dart @@ -44,7 +44,7 @@ const Duration _baseRetryInterval = Duration(seconds: 10); typedef _LogBatch = (List logQueues, List logEvents); -/// {@template amplify_logging_cloudwatch_dart_dart.cloudwatch_logger_plugin} +/// {@template amplify_logging_cloudwatch_dart.cloudwatch_logger_plugin} /// An [AWSLoggerPlugin] for sending logs to AWS CloudWatch Logs. /// {@endtemplate} class AmplifyLoggingCloudWatchDart extends LoggingPluginInterface diff --git a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/log_stream_provider.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/log_stream_provider.dart index 90039d355f..641f1d48ae 100644 --- a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/log_stream_provider.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/log_stream_provider.dart @@ -3,13 +3,11 @@ import 'dart:async'; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/cloud_watch_logs_client.dart'; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/create_log_stream_request.dart'; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/resource_already_exists_exception.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/cloud_watch_logs.dart'; import 'package:aws_common/aws_common.dart'; import 'package:intl/intl.dart'; -/// {@template amplify_logging_cloudwatch_dart_dart.cloudwatch_logstream_provider} +/// {@template amplify_logging_cloudwatch_dart.cloudwatch_logstream_provider} /// An interface to provide custom implementation for /// [CloudWatchLogStreamProvider] /// {@endtemplate} diff --git a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_html.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_html.dart index 02c9df7d68..80bada4d26 100644 --- a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_html.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_html.dart @@ -3,7 +3,7 @@ import 'package:amplify_core/amplify_core.dart'; -/// {@template amplify_logging_cloudwatch_dart_dart.app_path_provider} +/// {@template amplify_logging_cloudwatch_dart.app_path_provider} /// Provides App paths for amplify_logging_cloudwatch_dart package. /// {@endtemplate} class DartAppPathProvider implements AppPathProvider { diff --git a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_io.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_io.dart index 691d5779cd..9e32b43bd6 100644 --- a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_io.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_io.dart @@ -5,7 +5,7 @@ import 'dart:io'; import 'package:amplify_core/amplify_core.dart'; -/// {@template amplify_logging_cloudwatch_dart_dart.app_path_provider} +/// {@template amplify_logging_cloudwatch_dart.app_path_provider} /// Provides App paths for amplify_logging_cloudwatch_dart package. /// {@endtemplate} class DartAppPathProvider implements AppPathProvider { diff --git a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_stub.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_stub.dart index 92ea6648d3..bda44a2c08 100644 --- a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_stub.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/path_provider/app_path_provider_stub.dart @@ -3,7 +3,7 @@ import 'package:amplify_core/amplify_core.dart'; -/// {@template amplify_logging_cloudwatch_dart_dart.app_path_provider} +/// {@template amplify_logging_cloudwatch_dart.app_path_provider} /// Provides App paths for amplify_logging_cloudwatch_dart package. /// {@endtemplate} class DartAppPathProvider implements AppPathProvider { diff --git a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/in_memory_queued_item_store.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/in_memory_queued_item_store.dart index f7ea79d8c1..f029e60b02 100644 --- a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/in_memory_queued_item_store.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/in_memory_queued_item_store.dart @@ -5,7 +5,7 @@ import 'dart:collection'; import 'package:amplify_logging_cloudwatch_dart/src/queued_item_store/queued_item_store.dart'; -/// {@template amplify_logging_cloudwatch_dart_dart.in_memory_queued_item_store} +/// {@template amplify_logging_cloudwatch_dart.in_memory_queued_item_store} /// Stores string elements in device memory. /// {@endtemplate} class InMemoryQueuedItemStore implements QueuedItemStore { diff --git a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/queued_item_store.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/queued_item_store.dart index a64fe54270..c89ea3079a 100644 --- a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/queued_item_store.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/queued_item_store/queued_item_store.dart @@ -33,7 +33,7 @@ abstract interface class QueuedItemStore { FutureOr close(); } -/// {@template amplify_logging_cloudwatch_dart_dart.string_database_element} +/// {@template amplify_logging_cloudwatch_dart.string_database_element} /// An item stored in the [QueuedItemStore]. /// {@endtemplate} class QueuedItem { diff --git a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/remote_constraint_provider.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/remote_constraint_provider.dart index 32e271c0cd..478a0d17d6 100644 --- a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/remote_constraint_provider.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/remote_constraint_provider.dart @@ -9,7 +9,7 @@ import 'package:amplify_logging_cloudwatch_dart/src/file_storage/file_storage.da import 'package:aws_signature_v4/aws_signature_v4.dart'; import 'package:meta/meta.dart'; -/// {@template amplify_logging_cloudwatch_dart_dart.remote_logging_constraint_provider} +/// {@template amplify_logging_cloudwatch_dart.remote_logging_constraint_provider} /// An Interface to provide custom implementation for /// [RemoteLoggingConstraintProvider] /// It gets the [LoggingConstraints] from a remote location and cache it. @@ -19,7 +19,7 @@ abstract class RemoteLoggingConstraintProvider { LoggingConstraints? get loggingConstraint; } -/// {@template amplify_logging_cloudwatch_dart_dart.base_remote_constraints_provider} +/// {@template amplify_logging_cloudwatch_dart.base_remote_constraints_provider} /// Base class for [RemoteLoggingConstraintProvider] to provide /// [LoggingConstraints] from a remote location and cache it. /// {@endtemplate} @@ -160,7 +160,7 @@ base class BaseRemoteLoggingConstraintProvider } } -/// {@template amplify_logging_cloudwatch_dart_dart.default_remote_logging_constraint_provider} +/// {@template amplify_logging_cloudwatch_dart.default_remote_logging_constraint_provider} /// Default implementation of [RemoteLoggingConstraintProvider] to fetch /// [LoggingConstraints] from an http endpoint periodically. /// {@endtemplate} diff --git a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/stoppable_timer.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/stoppable_timer.dart index 5f635f796e..e8663607d0 100644 --- a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/stoppable_timer.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/stoppable_timer.dart @@ -3,7 +3,7 @@ import 'dart:async'; -/// {@template amplify_logging_cloudwatch_dart_dart.stoppable_timer} +/// {@template amplify_logging_cloudwatch_dart.stoppable_timer} /// A Timer that can be stopped and started again. /// /// The `callback` function is invoked repeatedly with [duration] intervals From 30f50fa33f0d44d6001f17d8110c1d0896048cc7 Mon Sep 17 00:00:00 2001 From: Kha Truong <64438356+khatruong2009@users.noreply.github.com> Date: Fri, 17 Nov 2023 11:07:15 -0800 Subject: [PATCH 06/16] chore: pubspec change --- .github/dependabot.yaml | 14 ++++++++++++++ .../example/lib/amplifyconfiguration_logging.dart | 12 ++++++------ .../example/pubspec.yaml | 2 +- ...t => amplify_logging_cloudwatch_dart_test.dart} | 0 4 files changed, 21 insertions(+), 7 deletions(-) rename packages/logging/amplify_logging_cloudwatch_dart/test/{aws_logging_cloudwatch_test.dart => amplify_logging_cloudwatch_dart_test.dart} (100%) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 6b17211b15..bf84a47ac3 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -1961,7 +1961,14 @@ updates: update-types: - "version-update:semver-patch" # Ignore all repo packages + - dependency-name: "amplify_logging_cloudwatch_dart" + - dependency-name: "amplify_core" + - dependency-name: "aws_common" - dependency-name: "amplify_lints" + - dependency-name: "aws_signature_v4" + - dependency-name: "amplify_db_common_dart" + - dependency-name: "smithy" + - dependency-name: "smithy_aws" # Group dependencies which have a constraint set in the global "pubspec.yaml" groups: build_runner: @@ -1980,7 +1987,14 @@ updates: update-types: - "version-update:semver-patch" # Ignore all repo packages + - dependency-name: "amplify_logging_cloudwatch_dart" + - dependency-name: "amplify_core" + - dependency-name: "aws_common" - dependency-name: "amplify_lints" + - dependency-name: "aws_signature_v4" + - dependency-name: "amplify_db_common_dart" + - dependency-name: "smithy" + - dependency-name: "smithy_aws" # Group dependencies which have a constraint set in the global "pubspec.yaml" groups: build_runner: diff --git a/packages/logging/amplify_logging_cloudwatch/example/lib/amplifyconfiguration_logging.dart b/packages/logging/amplify_logging_cloudwatch/example/lib/amplifyconfiguration_logging.dart index c73e240584..9efb303398 100644 --- a/packages/logging/amplify_logging_cloudwatch/example/lib/amplifyconfiguration_logging.dart +++ b/packages/logging/amplify_logging_cloudwatch/example/lib/amplifyconfiguration_logging.dart @@ -1,13 +1,11 @@ const loggingconfig = '''{ + "plugins": { + "cloudWatchLoggerPluginConfiguration": { "enable": true, - "logGroupName": "", - "region": "", + "logGroupName": "test-logging-log-group", + "region": "us-west-2", "localStoreMaxSizeInMB": 5, "flushIntervalInSeconds": 60, - "defaultRemoteConfiguration": { - "endpoint": "https://.execute-api..amazonaws.com/prod/loggingconstraints", - "refreshIntervalInSeconds": 1200 - }, "loggingConstraints": { "defaultLogLevel": "ERROR", "categoryLogLevel": { @@ -24,4 +22,6 @@ const loggingconfig = '''{ } } } + } + } }'''; diff --git a/packages/logging/amplify_logging_cloudwatch_dart/example/pubspec.yaml b/packages/logging/amplify_logging_cloudwatch_dart/example/pubspec.yaml index 5a2d980660..96171f0c9d 100644 --- a/packages/logging/amplify_logging_cloudwatch_dart/example/pubspec.yaml +++ b/packages/logging/amplify_logging_cloudwatch_dart/example/pubspec.yaml @@ -7,7 +7,7 @@ environment: sdk: "^3.0.0" dependencies: - aws_logging_cloudwatch: + amplify_logging_cloudwatch_dart: path: ../ dev_dependencies: diff --git a/packages/logging/amplify_logging_cloudwatch_dart/test/aws_logging_cloudwatch_test.dart b/packages/logging/amplify_logging_cloudwatch_dart/test/amplify_logging_cloudwatch_dart_test.dart similarity index 100% rename from packages/logging/amplify_logging_cloudwatch_dart/test/aws_logging_cloudwatch_test.dart rename to packages/logging/amplify_logging_cloudwatch_dart/test/amplify_logging_cloudwatch_dart_test.dart From caf7c88da17791b1119479808d64732bc703b375 Mon Sep 17 00:00:00 2001 From: Kha Truong <64438356+khatruong2009@users.noreply.github.com> Date: Fri, 17 Nov 2023 11:48:47 -0800 Subject: [PATCH 07/16] chore: change file path of example app in pubspec --- packages/aft/test/config/package_selector_test.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/aft/test/config/package_selector_test.dart b/packages/aft/test/config/package_selector_test.dart index 65fc35c27e..ccf1ae9846 100644 --- a/packages/aft/test/config/package_selector_test.dart +++ b/packages/aft/test/config/package_selector_test.dart @@ -45,7 +45,7 @@ void main() { 'packages/common/amplify_db_common_dart/example', 'packages/example_common/example', 'packages/logging_cloudwatch/amplify_logging_cloudwatch/example', - 'packages/logging_cloudwatch/aws_logging_cloudwatch/example', + 'packages/logging_cloudwatch/amplify_logging_cloudwatch_dart/example', 'packages/notifications/push/amplify_push_notifications/example', 'packages/notifications/push/amplify_push_notifications_pinpoint/example', 'packages/secure_storage/amplify_secure_storage/example', From 2cf9b3e5433aef7cceb5f308b8d4526626358d28 Mon Sep 17 00:00:00 2001 From: Kha Truong <64438356+khatruong2009@users.noreply.github.com> Date: Fri, 17 Nov 2023 12:38:00 -0800 Subject: [PATCH 08/16] chore: pubspec directory change --- packages/logging/amplify_logging_cloudwatch_dart/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/logging/amplify_logging_cloudwatch_dart/pubspec.yaml b/packages/logging/amplify_logging_cloudwatch_dart/pubspec.yaml index ffdeb9a500..2147106bdc 100644 --- a/packages/logging/amplify_logging_cloudwatch_dart/pubspec.yaml +++ b/packages/logging/amplify_logging_cloudwatch_dart/pubspec.yaml @@ -2,7 +2,7 @@ name: amplify_logging_cloudwatch_dart description: Implementation of AWS logger plugin with CloudWatch Logs. version: 0.1.0 homepage: https://docs.amplify.aws/lib/q/platform/flutter/ -repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/aws_logging_cloudwatch +repository: https://github.com/aws-amplify/amplify-flutter/tree/main/packages/amplify_logging_cloudwatch_dart issue_tracker: https://github.com/aws-amplify/amplify-flutter/issues environment: From 09bba37da1ce2d4bf2cc7131cbd8048f6c48caee Mon Sep 17 00:00:00 2001 From: Kha Truong <64438356+khatruong2009@users.noreply.github.com> Date: Fri, 17 Nov 2023 13:05:55 -0800 Subject: [PATCH 09/16] chore: removed unnecessary workflow file --- .github/workflows/aws_logging_cloudwatch.yaml | 103 ------------------ 1 file changed, 103 deletions(-) delete mode 100644 .github/workflows/aws_logging_cloudwatch.yaml diff --git a/.github/workflows/aws_logging_cloudwatch.yaml b/.github/workflows/aws_logging_cloudwatch.yaml deleted file mode 100644 index 936449a852..0000000000 --- a/.github/workflows/aws_logging_cloudwatch.yaml +++ /dev/null @@ -1,103 +0,0 @@ -# Generated with aft. To update, run: `aft generate workflows` -name: aws_logging_cloudwatch -on: - push: - branches: - - main - - stable - paths: - - '.github/composite_actions/setup_firefox/action.yaml' - - '.github/workflows/aws_logging_cloudwatch.yaml' - - '.github/workflows/dart_dart2js.yaml' - - '.github/workflows/dart_ddc.yaml' - - '.github/workflows/dart_native.yaml' - - '.github/workflows/dart_vm.yaml' - - 'packages/amplify_core/lib/**/*.dart' - - 'packages/amplify_core/pubspec.yaml' - - 'packages/amplify_lints/lib/**/*.yaml' - - 'packages/amplify_lints/pubspec.yaml' - - 'packages/aws_common/lib/**/*.dart' - - 'packages/aws_common/pubspec.yaml' - - 'packages/aws_signature_v4/lib/**/*.dart' - - 'packages/aws_signature_v4/pubspec.yaml' - - 'packages/common/amplify_db_common_dart/lib/**/*.dart' - - 'packages/common/amplify_db_common_dart/pubspec.yaml' - - 'packages/logging_cloudwatch/aws_logging_cloudwatch/**/*.dart' - - 'packages/logging_cloudwatch/aws_logging_cloudwatch/**/*.yaml' - - 'packages/logging_cloudwatch/aws_logging_cloudwatch/lib/**/*' - - 'packages/logging_cloudwatch/aws_logging_cloudwatch/test/**/*' - - 'packages/smithy/smithy/lib/**/*.dart' - - 'packages/smithy/smithy/pubspec.yaml' - - 'packages/smithy/smithy_aws/lib/**/*.dart' - - 'packages/smithy/smithy_aws/pubspec.yaml' - pull_request: - paths: - - '.github/composite_actions/setup_firefox/action.yaml' - - '.github/workflows/aws_logging_cloudwatch.yaml' - - '.github/workflows/dart_dart2js.yaml' - - '.github/workflows/dart_ddc.yaml' - - '.github/workflows/dart_native.yaml' - - '.github/workflows/dart_vm.yaml' - - 'packages/amplify_core/lib/**/*.dart' - - 'packages/amplify_core/pubspec.yaml' - - 'packages/amplify_lints/lib/**/*.yaml' - - 'packages/amplify_lints/pubspec.yaml' - - 'packages/aws_common/lib/**/*.dart' - - 'packages/aws_common/pubspec.yaml' - - 'packages/aws_signature_v4/lib/**/*.dart' - - 'packages/aws_signature_v4/pubspec.yaml' - - 'packages/common/amplify_db_common_dart/lib/**/*.dart' - - 'packages/common/amplify_db_common_dart/pubspec.yaml' - - 'packages/logging_cloudwatch/aws_logging_cloudwatch/**/*.dart' - - 'packages/logging_cloudwatch/aws_logging_cloudwatch/**/*.yaml' - - 'packages/logging_cloudwatch/aws_logging_cloudwatch/lib/**/*' - - 'packages/logging_cloudwatch/aws_logging_cloudwatch/test/**/*' - - 'packages/smithy/smithy/lib/**/*.dart' - - 'packages/smithy/smithy/pubspec.yaml' - - 'packages/smithy/smithy_aws/lib/**/*.dart' - - 'packages/smithy/smithy_aws/pubspec.yaml' - schedule: - - cron: "0 13 * * *" # Everyday at 06:00 PST -defaults: - run: - shell: bash - -# These permissions are needed to interact with GitHub's OIDC Token endpoint. -permissions: - id-token: write - contents: read - -# Cancels in-progress job when there is another push to same ref. -# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-only-cancel-in-progress-jobs-or-runs-for-the-current-workflow -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - test: - uses: ./.github/workflows/dart_vm.yaml - secrets: inherit - with: - package-name: aws_logging_cloudwatch - working-directory: packages/logging_cloudwatch/aws_logging_cloudwatch - native_test: - needs: test - uses: ./.github/workflows/dart_native.yaml - secrets: inherit - with: - package-name: aws_logging_cloudwatch - working-directory: packages/logging_cloudwatch/aws_logging_cloudwatch - ddc_test: - needs: test - uses: ./.github/workflows/dart_ddc.yaml - secrets: inherit - with: - package-name: aws_logging_cloudwatch - working-directory: packages/logging_cloudwatch/aws_logging_cloudwatch - dart2js_test: - needs: test - uses: ./.github/workflows/dart_dart2js.yaml - secrets: inherit - with: - package-name: aws_logging_cloudwatch - working-directory: packages/logging_cloudwatch/aws_logging_cloudwatch From 446b0deb417eaf7d9a2339c0ed32739ee5c3e104 Mon Sep 17 00:00:00 2001 From: Kha Truong <64438356+khatruong2009@users.noreply.github.com> Date: Fri, 17 Nov 2023 13:21:34 -0800 Subject: [PATCH 10/16] chore: adjusted AFT test --- packages/aft/test/config/package_selector_test.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/aft/test/config/package_selector_test.dart b/packages/aft/test/config/package_selector_test.dart index ccf1ae9846..6aa256dd97 100644 --- a/packages/aft/test/config/package_selector_test.dart +++ b/packages/aft/test/config/package_selector_test.dart @@ -44,8 +44,8 @@ void main() { 'packages/common/amplify_db_common/example', 'packages/common/amplify_db_common_dart/example', 'packages/example_common/example', - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/example', - 'packages/logging_cloudwatch/amplify_logging_cloudwatch_dart/example', + 'packages/logging/amplify_logging_cloudwatch/example', + 'packages/logging/amplify_logging_cloudwatch_dart/example', 'packages/notifications/push/amplify_push_notifications/example', 'packages/notifications/push/amplify_push_notifications_pinpoint/example', 'packages/secure_storage/amplify_secure_storage/example', @@ -136,7 +136,7 @@ void main() { 'packages/analytics/amplify_analytics_pinpoint/example', 'packages/api/amplify_api/example', 'packages/common/amplify_db_common/example', - 'packages/logging_cloudwatch/amplify_logging_cloudwatch/example', + 'packages/logging/amplify_logging_cloudwatch/example', 'packages/notifications/push/amplify_push_notifications/example', 'packages/notifications/push/amplify_push_notifications_pinpoint/example', 'packages/secure_storage/amplify_secure_storage/example', From 205400382cadbab94a071ed6ecd9fe75a182ee6f Mon Sep 17 00:00:00 2001 From: Kha Truong <64438356+khatruong2009@users.noreply.github.com> Date: Fri, 26 Jan 2024 14:32:02 -0800 Subject: [PATCH 11/16] chore: update amplify core back to 1.6.0 --- packages/logging/amplify_logging_cloudwatch/pubspec.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/logging/amplify_logging_cloudwatch/pubspec.yaml b/packages/logging/amplify_logging_cloudwatch/pubspec.yaml index 47ae4f8bb6..095fa6f2a0 100644 --- a/packages/logging/amplify_logging_cloudwatch/pubspec.yaml +++ b/packages/logging/amplify_logging_cloudwatch/pubspec.yaml @@ -10,7 +10,8 @@ environment: sdk: "^3.0.0" dependencies: - amplify_core: ">=1.4.0 <1.5.0" + amplify_core: ">=1.6.0 <1.7.0" + amplify_logging_cloudwatch_dart: ^0.1.0 aws_common: ">=0.6.0 <0.7.0" device_info_plus: ^9.0.0 flutter: From 5bc1843de29d1ae930cb67c95021628a79662eda Mon Sep 17 00:00:00 2001 From: Kha Truong <64438356+khatruong2009@users.noreply.github.com> Date: Fri, 26 Jan 2024 16:48:19 -0800 Subject: [PATCH 12/16] chore: regenerate sdk with aft --- .github/dependabot.yaml | 28 ++++---- .../cloud_watch_logs_client.dart | 15 ++-- .../cloud_watch_logs/common/serializers.dart | 68 ++++++++----------- .../model/put_log_events_request.dart | 5 +- .../model/put_log_events_response.dart | 3 +- .../create_log_stream_operation.dart | 25 +++---- .../operation/put_log_events_operation.dart | 34 ++++------ 7 files changed, 71 insertions(+), 107 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index bf84a47ac3..f490d86551 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -129,20 +129,6 @@ updates: test: patterns: - "test" - - package-ecosystem: "pub" - directory: "infra" - schedule: - interval: "daily" - ignore: - # Ignore patch version bumps - - dependency-name: "*" - update-types: - - "version-update:semver-patch" - # Ignore all repo packages - - dependency-name: "amplify_core" - - dependency-name: "aws_common" - - dependency-name: "amplify_lints" - - dependency-name: "aws_signature_v4" - package-ecosystem: "pub" directory: "actions" schedule: @@ -207,6 +193,20 @@ updates: - dependency-name: "amplify_datastore_plugin_interface" - dependency-name: "amplify_storage_s3" - dependency-name: "amplify_storage_s3_dart" + - package-ecosystem: "pub" + directory: "infra" + schedule: + interval: "daily" + ignore: + # Ignore patch version bumps + - dependency-name: "*" + update-types: + - "version-update:semver-patch" + # Ignore all repo packages + - dependency-name: "amplify_core" + - dependency-name: "aws_common" + - dependency-name: "amplify_lints" + - dependency-name: "aws_signature_v4" - package-ecosystem: "pub" directory: "packages/aft" schedule: diff --git a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/cloud_watch_logs_client.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/cloud_watch_logs_client.dart index 8499c1a788..ad29a0302a 100644 --- a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/cloud_watch_logs_client.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/cloud_watch_logs_client.dart @@ -3,17 +3,12 @@ library amplify_logging_cloudwatch_dart.cloud_watch_logs.cloud_watch_logs_client; // ignore_for_file: no_leading_underscores_for_library_prefixes +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/create_log_stream_request.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/put_log_events_request.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/put_log_events_response.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/operation/create_log_stream_operation.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/operation/put_log_events_operation.dart'; import 'package:aws_common/aws_common.dart' as _i1; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/create_log_stream_request.dart' - as _i4; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/put_log_events_request.dart' - as _i7; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/put_log_events_response.dart' - as _i6; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/operation/create_log_stream_operation.dart' - as _i5; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/operation/put_log_events_operation.dart' - as _i8; import 'package:aws_signature_v4/aws_signature_v4.dart' as _i2; import 'package:smithy/smithy.dart' as _i3; diff --git a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/common/serializers.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/common/serializers.dart index d23d719d90..a5bb1eafa3 100644 --- a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/common/serializers.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/common/serializers.dart @@ -3,51 +3,39 @@ library amplify_logging_cloudwatch_dart.cloud_watch_logs.common.serializers; // ignore_for_file: no_leading_underscores_for_library_prefixes -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/create_log_stream_request.dart' - as _i2; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/data_already_accepted_exception.dart' - as _i11; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/input_log_event.dart' - as _i7; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/invalid_parameter_exception.dart' - as _i3; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/invalid_sequence_token_exception.dart' - as _i12; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/put_log_events_request.dart' - as _i8; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/put_log_events_response.dart' - as _i10; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/rejected_log_events_info.dart' - as _i9; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/resource_already_exists_exception.dart' - as _i4; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/resource_not_found_exception.dart' - as _i5; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/service_unavailable_exception.dart' - as _i6; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/unrecognized_client_exception.dart' - as _i13; -import 'package:built_collection/built_collection.dart' as _i14; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/create_log_stream_request.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/data_already_accepted_exception.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/input_log_event.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/invalid_parameter_exception.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/invalid_sequence_token_exception.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/put_log_events_request.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/put_log_events_response.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/rejected_log_events_info.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/resource_already_exists_exception.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/resource_not_found_exception.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/service_unavailable_exception.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/unrecognized_client_exception.dart'; +import 'package:built_collection/built_collection.dart' as _i2; import 'package:built_value/serializer.dart'; import 'package:smithy/smithy.dart' as _i1; const List<_i1.SmithySerializer> serializers = [ - ..._i2.CreateLogStreamRequest.serializers, - ..._i3.InvalidParameterException.serializers, - ..._i4.ResourceAlreadyExistsException.serializers, - ..._i5.ResourceNotFoundException.serializers, - ..._i6.ServiceUnavailableException.serializers, - ..._i7.InputLogEvent.serializers, - ..._i8.PutLogEventsRequest.serializers, - ..._i9.RejectedLogEventsInfo.serializers, - ..._i10.PutLogEventsResponse.serializers, - ..._i11.DataAlreadyAcceptedException.serializers, - ..._i12.InvalidSequenceTokenException.serializers, - ..._i13.UnrecognizedClientException.serializers, + ...CreateLogStreamRequest.serializers, + ...InvalidParameterException.serializers, + ...ResourceAlreadyExistsException.serializers, + ...ResourceNotFoundException.serializers, + ...ServiceUnavailableException.serializers, + ...InputLogEvent.serializers, + ...PutLogEventsRequest.serializers, + ...RejectedLogEventsInfo.serializers, + ...PutLogEventsResponse.serializers, + ...DataAlreadyAcceptedException.serializers, + ...InvalidSequenceTokenException.serializers, + ...UnrecognizedClientException.serializers, ]; final Map builderFactories = { const FullType( - _i14.BuiltList, - [FullType(_i7.InputLogEvent)], - ): _i14.ListBuilder<_i7.InputLogEvent>.new + _i2.BuiltList, + [FullType(InputLogEvent)], + ): _i2.ListBuilder.new }; diff --git a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_request.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_request.dart index acfd736886..f1021385da 100644 --- a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_request.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_request.dart @@ -3,10 +3,9 @@ library amplify_logging_cloudwatch_dart.cloud_watch_logs.model.put_log_events_request; // ignore_for_file: no_leading_underscores_for_library_prefixes +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/input_log_event.dart'; import 'package:aws_common/aws_common.dart' as _i2; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/input_log_event.dart' - as _i3; -import 'package:built_collection/built_collection.dart' as _i4; +import 'package:built_collection/built_collection.dart' as _i3; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; import 'package:smithy/smithy.dart' as _i1; diff --git a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_response.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_response.dart index 585f1318e9..5115ff8543 100644 --- a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_response.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/model/put_log_events_response.dart @@ -3,9 +3,8 @@ library amplify_logging_cloudwatch_dart.cloud_watch_logs.model.put_log_events_response; // ignore_for_file: no_leading_underscores_for_library_prefixes +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/rejected_log_events_info.dart'; import 'package:aws_common/aws_common.dart' as _i1; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/rejected_log_events_info.dart' - as _i2; import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; import 'package:smithy/smithy.dart' as _i2; diff --git a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/operation/create_log_stream_operation.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/operation/create_log_stream_operation.dart index 5483275d8c..a6fd7b53ac 100644 --- a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/operation/create_log_stream_operation.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/operation/create_log_stream_operation.dart @@ -5,22 +5,15 @@ library amplify_logging_cloudwatch_dart.cloud_watch_logs.operation.create_log_st import 'dart:async' as _i5; -import 'package:aws_common/aws_common.dart' as _i6; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/common/endpoint_resolver.dart' - as _i7; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/common/serializers.dart' - as _i5; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/create_log_stream_request.dart' - as _i2; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/invalid_parameter_exception.dart' - as _i8; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/resource_already_exists_exception.dart' - as _i9; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/resource_not_found_exception.dart' - as _i10; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/service_unavailable_exception.dart' - as _i11; -import 'package:aws_signature_v4/aws_signature_v4.dart' as _i3; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/common/endpoint_resolver.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/common/serializers.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/create_log_stream_request.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/invalid_parameter_exception.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/resource_already_exists_exception.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/resource_not_found_exception.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/service_unavailable_exception.dart'; +import 'package:aws_common/aws_common.dart' as _i4; +import 'package:aws_signature_v4/aws_signature_v4.dart' as _i2; import 'package:smithy/smithy.dart' as _i1; import 'package:smithy_aws/smithy_aws.dart' as _i3; diff --git a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/operation/put_log_events_operation.dart b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/operation/put_log_events_operation.dart index b31c4f2145..0dbee5965c 100644 --- a/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/operation/put_log_events_operation.dart +++ b/packages/logging/amplify_logging_cloudwatch_dart/lib/src/sdk/src/cloud_watch_logs/operation/put_log_events_operation.dart @@ -5,28 +5,18 @@ library amplify_logging_cloudwatch_dart.cloud_watch_logs.operation.put_log_event import 'dart:async' as _i5; -import 'package:aws_common/aws_common.dart' as _i7; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/common/endpoint_resolver.dart' - as _i8; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/common/serializers.dart' - as _i6; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/data_already_accepted_exception.dart' - as _i9; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/invalid_parameter_exception.dart' - as _i10; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/invalid_sequence_token_exception.dart' - as _i11; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/put_log_events_request.dart' - as _i2; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/put_log_events_response.dart' - as _i3; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/resource_not_found_exception.dart' - as _i12; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/service_unavailable_exception.dart' - as _i13; -import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/unrecognized_client_exception.dart' - as _i14; -import 'package:aws_signature_v4/aws_signature_v4.dart' as _i4; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/common/endpoint_resolver.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/common/serializers.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/data_already_accepted_exception.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/invalid_parameter_exception.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/invalid_sequence_token_exception.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/put_log_events_request.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/put_log_events_response.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/resource_not_found_exception.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/service_unavailable_exception.dart'; +import 'package:amplify_logging_cloudwatch_dart/src/sdk/src/cloud_watch_logs/model/unrecognized_client_exception.dart'; +import 'package:aws_common/aws_common.dart' as _i4; +import 'package:aws_signature_v4/aws_signature_v4.dart' as _i2; import 'package:smithy/smithy.dart' as _i1; import 'package:smithy_aws/smithy_aws.dart' as _i3; From 333e166ee8fd3b41d9128d6210283584c045202d Mon Sep 17 00:00:00 2001 From: Kha Truong <64438356+khatruong2009@users.noreply.github.com> Date: Mon, 29 Jan 2024 15:31:18 -0800 Subject: [PATCH 13/16] Update plugin registration in GeneratedPluginRegistrant.swift --- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/amplify/amplify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/amplify/amplify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index 6f6fe42d59..c08326fa04 100644 --- a/packages/amplify/amplify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/amplify/amplify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -17,6 +17,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) + FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) } diff --git a/packages/analytics/amplify_analytics_pinpoint/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/analytics/amplify_analytics_pinpoint/example/macos/Flutter/GeneratedPluginRegistrant.swift index 6f6fe42d59..c08326fa04 100644 --- a/packages/analytics/amplify_analytics_pinpoint/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/analytics/amplify_analytics_pinpoint/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -17,6 +17,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) + FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) } diff --git a/packages/api/amplify_api/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/api/amplify_api/example/macos/Flutter/GeneratedPluginRegistrant.swift index 3e3c6f2144..8b6fd0e279 100644 --- a/packages/api/amplify_api/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/api/amplify_api/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -18,7 +18,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) + FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } diff --git a/packages/auth/amplify_auth_cognito/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/auth/amplify_auth_cognito/example/macos/Flutter/GeneratedPluginRegistrant.swift index 3e3c6f2144..8b6fd0e279 100644 --- a/packages/auth/amplify_auth_cognito/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/auth/amplify_auth_cognito/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -18,7 +18,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) + FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } diff --git a/packages/authenticator/amplify_authenticator/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/authenticator/amplify_authenticator/example/macos/Flutter/GeneratedPluginRegistrant.swift index 3e3c6f2144..8b6fd0e279 100644 --- a/packages/authenticator/amplify_authenticator/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/authenticator/amplify_authenticator/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -18,7 +18,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) + FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } diff --git a/packages/authenticator/amplify_authenticator_test/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/authenticator/amplify_authenticator_test/example/macos/Flutter/GeneratedPluginRegistrant.swift index 32a9505309..c33812bc70 100644 --- a/packages/authenticator/amplify_authenticator_test/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/authenticator/amplify_authenticator_test/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -16,7 +16,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifyAuthCognitoPlugin.register(with: registry.registrar(forPlugin: "AmplifyAuthCognitoPlugin")) AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) + FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } diff --git a/packages/logging/amplify_logging_cloudwatch/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/logging/amplify_logging_cloudwatch/example/macos/Flutter/GeneratedPluginRegistrant.swift index 32a9505309..c33812bc70 100644 --- a/packages/logging/amplify_logging_cloudwatch/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/logging/amplify_logging_cloudwatch/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -16,7 +16,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifyAuthCognitoPlugin.register(with: registry.registrar(forPlugin: "AmplifyAuthCognitoPlugin")) AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) + FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } diff --git a/packages/storage/amplify_storage_s3/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/storage/amplify_storage_s3/example/macos/Flutter/GeneratedPluginRegistrant.swift index 32a9505309..c33812bc70 100644 --- a/packages/storage/amplify_storage_s3/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/storage/amplify_storage_s3/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -16,7 +16,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifyAuthCognitoPlugin.register(with: registry.registrar(forPlugin: "AmplifyAuthCognitoPlugin")) AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) + FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } From 39c1f8f84ae1f7e1508c10a5a72558ea25fe5022 Mon Sep 17 00:00:00 2001 From: Kha Truong <64438356+khatruong2009@users.noreply.github.com> Date: Mon, 29 Jan 2024 15:35:47 -0800 Subject: [PATCH 14/16] chore: removed change in GeneratedPluginRegistrant --- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/amplify/amplify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/amplify/amplify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index c08326fa04..6f6fe42d59 100644 --- a/packages/amplify/amplify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/amplify/amplify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -17,6 +17,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) + FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) } diff --git a/packages/analytics/amplify_analytics_pinpoint/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/analytics/amplify_analytics_pinpoint/example/macos/Flutter/GeneratedPluginRegistrant.swift index c08326fa04..6f6fe42d59 100644 --- a/packages/analytics/amplify_analytics_pinpoint/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/analytics/amplify_analytics_pinpoint/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -17,6 +17,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) + FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) } diff --git a/packages/api/amplify_api/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/api/amplify_api/example/macos/Flutter/GeneratedPluginRegistrant.swift index 8b6fd0e279..3e3c6f2144 100644 --- a/packages/api/amplify_api/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/api/amplify_api/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -18,7 +18,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) + FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } diff --git a/packages/auth/amplify_auth_cognito/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/auth/amplify_auth_cognito/example/macos/Flutter/GeneratedPluginRegistrant.swift index 8b6fd0e279..3e3c6f2144 100644 --- a/packages/auth/amplify_auth_cognito/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/auth/amplify_auth_cognito/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -18,7 +18,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) + FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } diff --git a/packages/authenticator/amplify_authenticator/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/authenticator/amplify_authenticator/example/macos/Flutter/GeneratedPluginRegistrant.swift index 8b6fd0e279..3e3c6f2144 100644 --- a/packages/authenticator/amplify_authenticator/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/authenticator/amplify_authenticator/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -18,7 +18,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) + FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } diff --git a/packages/authenticator/amplify_authenticator_test/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/authenticator/amplify_authenticator_test/example/macos/Flutter/GeneratedPluginRegistrant.swift index c33812bc70..32a9505309 100644 --- a/packages/authenticator/amplify_authenticator_test/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/authenticator/amplify_authenticator_test/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -16,7 +16,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifyAuthCognitoPlugin.register(with: registry.registrar(forPlugin: "AmplifyAuthCognitoPlugin")) AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) + FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } diff --git a/packages/logging/amplify_logging_cloudwatch/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/logging/amplify_logging_cloudwatch/example/macos/Flutter/GeneratedPluginRegistrant.swift index c33812bc70..32a9505309 100644 --- a/packages/logging/amplify_logging_cloudwatch/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/logging/amplify_logging_cloudwatch/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -16,7 +16,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifyAuthCognitoPlugin.register(with: registry.registrar(forPlugin: "AmplifyAuthCognitoPlugin")) AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) + FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } diff --git a/packages/storage/amplify_storage_s3/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/storage/amplify_storage_s3/example/macos/Flutter/GeneratedPluginRegistrant.swift index c33812bc70..32a9505309 100644 --- a/packages/storage/amplify_storage_s3/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/storage/amplify_storage_s3/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -16,7 +16,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifyAuthCognitoPlugin.register(with: registry.registrar(forPlugin: "AmplifyAuthCognitoPlugin")) AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) + FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } From d1083505c76635270054e8aaf48adc37c3e79adb Mon Sep 17 00:00:00 2001 From: Kha Truong <64438356+khatruong2009@users.noreply.github.com> Date: Mon, 29 Jan 2024 15:36:36 -0800 Subject: [PATCH 15/16] chore: removed change in GeneratedPluginRegistrant --- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/amplify/amplify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/amplify/amplify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift index 6f6fe42d59..c08326fa04 100644 --- a/packages/amplify/amplify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/amplify/amplify_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -17,6 +17,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) + FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) } diff --git a/packages/analytics/amplify_analytics_pinpoint/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/analytics/amplify_analytics_pinpoint/example/macos/Flutter/GeneratedPluginRegistrant.swift index 6f6fe42d59..c08326fa04 100644 --- a/packages/analytics/amplify_analytics_pinpoint/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/analytics/amplify_analytics_pinpoint/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -17,6 +17,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) + FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) } diff --git a/packages/api/amplify_api/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/api/amplify_api/example/macos/Flutter/GeneratedPluginRegistrant.swift index 3e3c6f2144..8b6fd0e279 100644 --- a/packages/api/amplify_api/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/api/amplify_api/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -18,7 +18,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) + FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } diff --git a/packages/auth/amplify_auth_cognito/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/auth/amplify_auth_cognito/example/macos/Flutter/GeneratedPluginRegistrant.swift index 3e3c6f2144..8b6fd0e279 100644 --- a/packages/auth/amplify_auth_cognito/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/auth/amplify_auth_cognito/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -18,7 +18,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) + FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } diff --git a/packages/authenticator/amplify_authenticator/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/authenticator/amplify_authenticator/example/macos/Flutter/GeneratedPluginRegistrant.swift index 3e3c6f2144..8b6fd0e279 100644 --- a/packages/authenticator/amplify_authenticator/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/authenticator/amplify_authenticator/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -18,7 +18,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) + FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } diff --git a/packages/authenticator/amplify_authenticator_test/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/authenticator/amplify_authenticator_test/example/macos/Flutter/GeneratedPluginRegistrant.swift index 32a9505309..c33812bc70 100644 --- a/packages/authenticator/amplify_authenticator_test/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/authenticator/amplify_authenticator_test/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -16,7 +16,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifyAuthCognitoPlugin.register(with: registry.registrar(forPlugin: "AmplifyAuthCognitoPlugin")) AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) + FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } diff --git a/packages/logging/amplify_logging_cloudwatch/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/logging/amplify_logging_cloudwatch/example/macos/Flutter/GeneratedPluginRegistrant.swift index 32a9505309..c33812bc70 100644 --- a/packages/logging/amplify_logging_cloudwatch/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/logging/amplify_logging_cloudwatch/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -16,7 +16,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifyAuthCognitoPlugin.register(with: registry.registrar(forPlugin: "AmplifyAuthCognitoPlugin")) AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) + FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } diff --git a/packages/storage/amplify_storage_s3/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/storage/amplify_storage_s3/example/macos/Flutter/GeneratedPluginRegistrant.swift index 32a9505309..c33812bc70 100644 --- a/packages/storage/amplify_storage_s3/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/storage/amplify_storage_s3/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -16,7 +16,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifyAuthCognitoPlugin.register(with: registry.registrar(forPlugin: "AmplifyAuthCognitoPlugin")) AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) + FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) } From c21219ca3290bdcf9bd26ea2fbe73b5317061709 Mon Sep 17 00:00:00 2001 From: Kha Truong <64438356+khatruong2009@users.noreply.github.com> Date: Mon, 29 Jan 2024 15:37:35 -0800 Subject: [PATCH 16/16] chore: removed change in GeneratedPluginRegistrant --- .../example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/logging/amplify_logging_cloudwatch/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/logging/amplify_logging_cloudwatch/example/macos/Flutter/GeneratedPluginRegistrant.swift index c33812bc70..32a9505309 100644 --- a/packages/logging/amplify_logging_cloudwatch/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/packages/logging/amplify_logging_cloudwatch/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -16,7 +16,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AmplifyAuthCognitoPlugin.register(with: registry.registrar(forPlugin: "AmplifyAuthCognitoPlugin")) AmplifySecureStoragePlugin.register(with: registry.registrar(forPlugin: "AmplifySecureStoragePlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) - FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) + FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) }