Merge main -> stable

.gitattributes

@@ -1,31 +1,87 @@
+## GITATTRIBUTES
+#
+# Details per file setting:
+#   text    These files should be normalized (i.e. convert CRLF to LF).
+#   binary  These files are binary and should be left untouched.
+#
+# Reference: https://git-scm.com/docs/gitattributes
+# GitHub Linguist: https://github.com/github-linguist/linguist/blob/master/docs/overrides.md
+######################################################################
+
+# Auto detect text files and perform LF normalization
+*                                   text=auto
+
+# Always perform LF normalization
+*.dart                              text
+*.gradle                            text
+*.html                              text
+*.java                              text
+*.js                                text
+*.json                              text linguist-language=JSON-with-Comments
+*.md                                text
+*.sh                                text
+*.ts                                text
+*.txt                               text
+*.xml                               text
+*.yaml                              text
+
+# Make sure that these Windows files always have CRLF line endings at checkout
+*.bat                               text eol=crlf
+*.cmd                               text eol=crlf
+*.ps1                               text eol=crlf
+*.rc                                text eol=crlf
+*.sln                               text eol=crlf
+*.props                             text eol=crlf
+*.vcxproj                           text eol=crlf
+*.vcxproj.filters                   text eol=crlf
+# Including templates
+*.sln.tmpl                          text eol=crlf
+*.props.tmpl                        text eol=crlf
+*.vcxproj.tmpl                      text eol=crlf
+
+# Never perform LF normalization
+*.ico                               binary
+*.jar                               binary
+*.png                               binary
+*.zip                               binary
+*.ttf                               binary
+*.otf                               binary
+
 ## Platform files generated by Flutter during `flutter create`
-**/example/android/** linguist-generated=true
-**/example/ios/** linguist-generated=true
-**/example/linux/** linguist-generated=true
-**/example/macos/** linguist-generated=true
-**/example/windows/** linguist-generated=true
+**/example/android/**                       linguist-generated
+**/example/ios/**                           linguist-generated
+**/example/linux/**                         linguist-generated
+**/example/macos/**                         linguist-generated
+**/example/windows/**                       linguist-generated
 ## Exclude flutter generated web files without excluding web files from
 ## non-flutter dart example apps
-**/example/web/icons/** linguist-generated=true
-**/example/web/*.json linguist-generated=true
-**/example/web/*.png linguist-generated=true
+**/example/web/icons/**                     linguist-generated
+**/example/web/*.json                       linguist-generated
+**/example/web/*.png                        linguist-generated
 
 ## Generated by Pigeon
-**/*Pigeon.java linguist-generated=true
-**/*Messages.java linguist-generated=true
-**/Pigeons/*.swift linguist-generated=true
-**/pigeons/*.h linguist-generated=true
-**/pigeons/*.m linguist-generated=true
+**/*Pigeon.java                             linguist-generated
+**/*Messages.java                           linguist-generated
+**/pigeons/*.kt                             linguist-generated
+**/Pigeons/*.swift                          linguist-generated
+**/pigeons/*.swift                          linguist-generated
+**/pigeons/*.h                              linguist-generated
+**/pigeons/*.m                              linguist-generated
 
 ## Generated SDK files
-packages/**/lib/src/sdk/src/** linguist-generated=true
+packages/**/lib/src/sdk/src/**              linguist-generated
 
-## Generated Smithy files
-packages/smithy/goldens/** linguist-generated=true
+## Smithy files
+packages/smithy/goldens/lib/**              linguist-generated
+packages/smithy/goldens/lib2/**             linguist-generated
+packages/smithy/goldens/models/**           linguist-vendored
+packages/smithy/goldens/models/custom/**    -linguist-vendored
 
 ## Genrated dart files
-*.g.dart linguist-generated=true
+*.g.dart                                    linguist-generated
 
-## Generated lock files
-package-lock.json linguist-generated=true
-yarn.lock linguist-generated=true
+## Lock files
+package-lock.json                           linguist-generated
+pnpm-lock.yaml                              linguist-generated
+pubspec.lock                                linguist-generated
+yarn.lock                                   linguist-generated

.github/composite_actions/fetch_backends/action.yaml

@@ -3,14 +3,16 @@ description: "Downloads Amplify configurations after getting temporary AWS crede
 inputs:
   aws-region:
     required: true
+    description: The AWS region
   role-to-assume:
     required: true
-  # scope for melos, e.g. "amplify_api_example"
+    description: The role to assume in the STS session
   scope:
     required: true
-  # ARN of secret from AWS Secrets Manger which is a JSON object of app IDs / s3 bucket ARNs
+    description: scope for aft, e.g. "amplify_api_example"
   secret-identifier:
     required: true
+    description: ARN of secret from AWS Secrets Manger which is a JSON object of app IDs / s3 bucket ARNs
 
 runs:
   using: "composite"
@@ -25,7 +27,7 @@ runs:
     - name: Create AWS profile
       run: ./build-support/create_integration_test_profile.sh
       shell: bash
-    
+
     - name: Get Amplify App IDs / bucket ARNs from Secrets Manager
       uses: aws-actions/aws-secretsmanager-get-secrets@bafac38d78b5f679d35ef3f36f9842a63de59564 # 1.0.0
       with:
@@ -34,16 +36,13 @@ runs:
         parse-json-secrets: true
 
     - name: Pull Amplify Configurations
-      run: |
-        flutter pub global run melos exec --scope=${{ inputs.scope }} bash tool/pull_test_backend.sh
       shell: bash
+      run: dart pub global run aft exec --include=${{ inputs.scope }} -- tool/pull_test_backend.sh
 
     - name: Undo any codegen changes from amplify pull
-      run: |    
-        flutter pub global run melos exec --scope=${{ inputs.scope }} "[ -d "lib/models" ] && git checkout lib/models/ || exit 0"
       shell: bash
+      run: dart pub global run aft exec --include=${{ inputs.scope }} -- [ -d "lib/models" ] && git checkout lib/models/ || exit 0
 
     - name: Delete AWS profile
-      run: rm -rf ~/.aws
       shell: bash
-
+      run: rm -rf ~/.aws

.github/composite_actions/install_dependencies/action.yaml

@@ -1,32 +1,28 @@
 name: "Install Non-Platform Dependencies"
-description: "Installs non-platform dependencies: Flutter, melos, aft"
+description: "Installs non-platform dependencies: Flutter, aft"
 inputs:
+  channel:
+    required: false
+    description: The Flutter channel to user when running tests. Defaults to "stable".
+    default: stable
   flutter-version:
     required: false
-    description: The version of Flutter to run tests against. Defaults to "stable".
+    description: The specific version of Flutter to run tests against.
 
 runs:
   using: "composite"
   steps:
     - uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d # 2.8.0
       with:
         cache: true
-        channel: "stable"
+        channel: ${{ inputs.channel }}
         flutter-version: ${{ inputs.flutter-version }}
 
-    - name: Install Melos
-      run: |
-        flutter pub global activate melos 2.8.0
-      shell: bash
-
     #  Install aft from path, links packages and runs build runner where needed.
     - name: Partial aft bootstrap
+      shell: bash
       run: |
         git submodule update --init
-        flutter pub global activate -spath packages/aft
-        if [[ "${{ inputs.flutter-version }}" == "3.3.0" ]]; then
-          flutter pub global run aft constraints apply --config=aft.legacy.yaml --exclude=aft
-        fi
-        flutter pub global run aft link
-        flutter pub global run melos exec -c 1 --scope="amplify_secure_storage_dart,amplify_auth_cognito_dart" -- dart run build_runner build --delete-conflicting-outputs
-      shell: bash
+        dart pub global activate -spath packages/aft
+        dart pub global run aft link
+        dart pub global run aft exec --include="amplify_secure_storage_dart,amplify_auth_cognito_dart" -- dart run build_runner build --delete-conflicting-outputs

.github/composite_actions/launch_android_emulator/action.yaml

@@ -0,0 +1,50 @@
+name: Launch Android emulator
+description: Launches an Android emulator and caches it for further action runs
+inputs:
+  api-level:
+    description: The Android API level
+    default: "33"
+  target:
+    description: The Android image type
+    default: google_apis
+  arch:
+    description: The CPU architecture
+    default: x86_64
+  script:
+    description: The script to run once the emulator is booted
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+    - name: Cache AVD
+      id: avd-cache
+      uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11
+      with:
+        path: |
+          ~/.android/avd/*
+          ~/.android/adb*
+        key: avd-${{ inputs.api-level }}-${{ inputs.arch }}-${{ inputs.target }}
+
+    - name: Create AVD and generate snapshot
+      if: steps.avd-cache.outputs.cache-hit != 'true'
+      uses: reactivecircus/android-emulator-runner@50986b1464923454c95e261820bc626f38490ec0 # 2.27.0
+      with:
+        api-level: ${{ inputs.api-level }}
+        target: ${{ inputs.target }}
+        arch: ${{ inputs.arch }}
+        emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -logcat '*:e *:s'
+        script: echo "Generated AVD snapshot for caching."
+
+    - name: Launch AVD
+      uses: reactivecircus/android-emulator-runner@50986b1464923454c95e261820bc626f38490ec0 # 2.27.0
+      with:
+        api-level: ${{ inputs.api-level }}
+        target: ${{ inputs.target }}
+        arch: ${{ inputs.arch }}
+        # -no-snapshot-save + default options: https://github.com/reactivecircus/android-emulator-runner#configurations
+        emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -logcat '*:e *:s'
+        # set screen timeout to 1 hour
+        script: |
+          adb shell settings put system screen_off_timeout 3600000
+          ${{ inputs.script }}

.github/composite_actions/launch_ios_simulator/action.yaml

@@ -0,0 +1,31 @@
+name: Launch iOS simulator
+description: Launches an iOS simulator and caches it for further action runs
+inputs:
+  ios-version:
+    description: The iOS version
+    default: "16"
+
+runs:
+  using: "composite"
+  steps:
+    - name: List runtimes
+      shell: bash
+      run: |
+        xcrun simctl list runtimes -j
+
+        # Use xcodes (https://github.com/XcodesOrg/xcodes) to list runtimes for all Xcode versions
+        brew install xcodesorg/made/xcodes
+        xcodes runtimes
+
+    - name: Create Simulator
+      shell: bash
+      run: |
+        get_runtime() {
+          xcrun simctl list runtimes -j | jq -r '.runtimes[] | select(.name | startswith("iOS ${{ inputs.ios-version }}")) | .identifier' | head -n 1
+        }
+        if [[ -z "$(get_runtime)" ]]; then
+          echo "No runtime found for iOS ${{ inputs.ios-version }}" >&2
+          sudo xcodes runtimes install 'iOS ${{ inputs.ios-version }}'
+        fi
+        xcrun simctl create test "iPhone 11" "$(get_runtime)"
+        xcrun simctl boot test

.github/dependabot.yaml

@@ -23,18 +23,6 @@ updates:
     directory: "packages/amplify/amplify_flutter/example/"
     schedule:
       interval: "daily"
-  - package-ecosystem: "pub"
-    directory: "packages/amplify/amplify_flutter_android/"
-    schedule:
-      interval: "daily"
-  - package-ecosystem: "pub"
-    directory: "packages/amplify/amplify_flutter_ios/"
-    schedule:
-      interval: "daily"
-  - package-ecosystem: "pub"
-    directory: "packages/amplify/amplify_flutter_ios/example/"
-    schedule:
-      interval: "daily"
   - package-ecosystem: "pub"
     directory: "packages/amplify_core/"
     schedule:
@@ -87,26 +75,10 @@ updates:
     directory: "packages/api/amplify_api/example/"
     schedule:
       interval: "daily"
-  - package-ecosystem: "pub"
-    directory: "packages/api/amplify_api_android/"
-    schedule:
-      interval: "daily"
-  - package-ecosystem: "pub"
-    directory: "packages/api/amplify_api_android/example/"
-    schedule:
-      interval: "daily"
   - package-ecosystem: "pub"
     directory: "packages/api/amplify_api_dart/"
     schedule:
       interval: "daily"
-  - package-ecosystem: "pub"
-    directory: "packages/api/amplify_api_ios/"
-    schedule:
-      interval: "daily"
-  - package-ecosystem: "pub"
-    directory: "packages/api/amplify_api_ios/example/"
-    schedule:
-      interval: "daily"
   - package-ecosystem: "pub"
     directory: "packages/auth/amplify_auth_cognito/"
     schedule:

.github/workflows/aft.yaml

@@ -6,10 +6,10 @@ on:
       - stable
       - next
     paths:
-      - 'packages/aft/**/*.dart'
+      - "packages/aft/**/*.dart"
   pull_request:
     paths:
-      - 'packages/aft/**/*.dart'
+      - "packages/aft/**/*.dart"
   schedule:
     - cron: "0 0 * * 0" # Every Sunday at 00:00
 defaults:

.github/workflows/amplify_analytics_pinpoint.yaml

@@ -7,34 +7,38 @@ on:
       - stable
   pull_request:
     paths:
-      - '.github/workflows/flutter_vm.yaml'
       - '.github/workflows/amplify_analytics_pinpoint.yaml'
+      - '.github/workflows/flutter_vm.yaml'
+      - 'packages/amplify_core/lib/**/*.dart'
+      - 'packages/amplify_core/pubspec.yaml'
+      - 'packages/amplify_lints/lib/**/*.yaml'
+      - 'packages/amplify_lints/pubspec.yaml'
       - 'packages/analytics/amplify_analytics_pinpoint/**/*.dart'
       - 'packages/analytics/amplify_analytics_pinpoint/**/*.yaml'
       - 'packages/analytics/amplify_analytics_pinpoint/lib/**/*'
       - 'packages/analytics/amplify_analytics_pinpoint/test/**/*'
-      - 'packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml'
       - 'packages/analytics/amplify_analytics_pinpoint_dart/lib/**/*.dart'
-      - 'packages/amplify_core/pubspec.yaml'
-      - 'packages/amplify_core/lib/**/*.dart'
-      - 'packages/aws_common/pubspec.yaml'
+      - 'packages/analytics/amplify_analytics_pinpoint_dart/pubspec.yaml'
       - 'packages/aws_common/lib/**/*.dart'
-      - 'packages/aws_signature_v4/pubspec.yaml'
+      - 'packages/aws_common/pubspec.yaml'
       - 'packages/aws_signature_v4/lib/**/*.dart'
-      - 'packages/common/amplify_db_common_dart/pubspec.yaml'
+      - 'packages/aws_signature_v4/pubspec.yaml'
+      - 'packages/common/amplify_db_common/lib/**/*.dart'
+      - 'packages/common/amplify_db_common/pubspec.yaml'
       - 'packages/common/amplify_db_common_dart/lib/**/*.dart'
-      - 'packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml'
+      - 'packages/common/amplify_db_common_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'
-      - 'packages/worker_bee/worker_bee/pubspec.yaml'
-      - 'packages/worker_bee/worker_bee/lib/**/*.dart'
-      - 'packages/smithy/smithy/pubspec.yaml'
+      - 'packages/secure_storage/amplify_secure_storage_dart/pubspec.yaml'
       - 'packages/smithy/smithy/lib/**/*.dart'
-      - 'packages/smithy/smithy_aws/pubspec.yaml'
+      - 'packages/smithy/smithy/pubspec.yaml'
       - 'packages/smithy/smithy_aws/lib/**/*.dart'
-      - 'packages/common/amplify_db_common/pubspec.yaml'
-      - 'packages/common/amplify_db_common/lib/**/*.dart'
-      - 'packages/secure_storage/amplify_secure_storage/pubspec.yaml'
-      - 'packages/secure_storage/amplify_secure_storage/lib/**/*.dart'
+      - 'packages/smithy/smithy_aws/pubspec.yaml'
+      - 'packages/worker_bee/worker_bee/lib/**/*.dart'
+      - 'packages/worker_bee/worker_bee/pubspec.yaml'
+      - 'packages/worker_bee/worker_bee_builder/lib/**/*.dart'
+      - 'packages/worker_bee/worker_bee_builder/pubspec.yaml'
   schedule:
     - cron: "0 0 * * 0" # Every Sunday at 00:00
 defaults: