Merge branch 'main' into add-content-resizing-sample

Author: ericwindmill

.gemini/settings.json

@@ -0,0 +1,11 @@
+{
+  "mcpServers": {
+    "dart": {
+      "command": "dart",
+      "args": [
+        "mcp-server"
+      ]
+    }
+  },
+  "contextFileName": "/.prompts/llm.md"
+}

.github/dependabot.yaml

@@ -5,13 +5,9 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
-    labels:
-      - "autosubmit"
-    # Updating patch versions for "github-actions" is too chatty.
-    # See https://github.com/flutter/flutter/issues/158350.
-    ignore:
-      - dependency-name: "*"
-        update-types: ["version-update:semver-patch"]
+    #  Don't auto-submit github actions updates
+    # labels:
+    #   - "autosubmit"
   - package-ecosystem: "npm"
     directory: "web_embedding/ng-flutter"
     schedule:

.github/workflows/beta.yml

@@ -15,55 +15,55 @@ defaults:
     shell: bash
 
 jobs:
-  # Run the stable test script on the beta channel. Since this branch will soon
-  # be merged into main as our stable-targeting code, this is the key thing we
-  # need to test.
-  stable-tests-on-beta:
+  # Test all samples on the beta channel. Since the beta channel will soon be
+  # promoted to stable, this branch is only concerned with the beta.
+  Beta-CI:
+    name: Test flutter beta channel
     runs-on: ${{ matrix.os }}
     if: github.repository == 'flutter/samples'
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
+      - uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e
         with:
           distribution: 'zulu'
           java-version: '17'
-      - uses: subosito/flutter-action@395322a6cded4e9ed503aebd4cc1965625f8e59a
+      - uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046
         with:
           channel: beta
-      - run: ./tool/flutter_ci_script_stable.sh
+      - run: flutter pub get && dart tool/ci_script.dart
 
   # Verify the Android add-to-app samples build and pass tests with the beta
   # channel.
-  # android-build:
-  #   runs-on: ubuntu-latest
-  #   if: github.repository == 'flutter/samples'
-  #   steps:
-  #     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-  #     - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
-  #       with:
-  #         distribution: 'zulu'
-  #         java-version: '17'
-  #     - uses: subosito/flutter-action@395322a6cded4e9ed503aebd4cc1965625f8e59a
-  #       with:
-  #         channel: beta
-  #     - run: ./tool/android_ci_script.sh
-
-  # Verify the iOS add-to-app samples build and pass tests with the beta
-  # channel.
-  ios-build:
-    runs-on: macos-latest
+  android-build:
+    runs-on: ubuntu-latest
     if: github.repository == 'flutter/samples'
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-      - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
+      - uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e
         with:
           distribution: 'zulu'
           java-version: '17'
-      - uses: subosito/flutter-action@395322a6cded4e9ed503aebd4cc1965625f8e59a
+      - uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046
         with:
           channel: beta
-      - run: ./tool/ios_ci_script.sh
+      - run: ./tool/android_ci_script.sh
+
+  # Verify the iOS add-to-app samples build and pass tests with the beta
+  # channel.
+  # ios-build:
+  #   runs-on: macos-latest
+  #   if: github.repository == 'flutter/samples'
+  #   steps:
+  #     - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
+  #     - uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e
+  #       with:
+  #         distribution: 'zulu'
+  #         java-version: '17'
+  #     - uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046
+  #       with:
+  #         channel: beta
+  #     - run: ./tool/ios_ci_script.sh

.github/workflows/build-android.yml

@@ -0,0 +1,30 @@
+name: Test Android Build
+
+# Declare default permissions as read only.
+permissions: read-all
+
+on:
+  push:
+    branches: [beta]
+  pull_request:
+    branches: [beta]
+  workflow_dispatch:
+
+defaults:
+  run:
+    shell: bash
+  
+jobs:
+  android-build:
+    runs-on: ubuntu-latest
+    if: github.repository == 'flutter/samples'
+    steps:
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
+      - uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+      - uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046
+        with:
+          channel: stable
+      - run: ./tool/android_ci_script.sh

.github/workflows/build-ios.yml

@@ -0,0 +1,33 @@
+name: Test iOS Build
+
+# Declare default permissions as read only.
+permissions: read-all
+
+on:
+  push:
+    branches: [beta]
+  pull_request:
+    branches: [beta]
+  workflow_dispatch:
+
+defaults:
+  run:
+    shell: bash
+  
+jobs:
+  ios-build:
+    name: Test flutter beta channel
+    runs-on: macos-latest
+    if: github.repository == 'flutter/samples'
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
+      - uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+      - uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046
+        with:
+          channel: beta
+      - run: ./tool/ios_ci_script.sh