fix(ci): align toolchains and isolate platform tests

.github/workflows/build.yml

@@ -70,7 +70,7 @@ jobs:
         uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5
         with:
           distribution: "temurin"
-          java-version: "17"
+          java-version: "21"
 
       - name: Setup Flutter
         uses: subosito/flutter-action@1a449444c387b1966244ae4d4f8c696479add0b2 # v2

.github/workflows/ci.yml

@@ -42,6 +42,10 @@ jobs:
 
           flutter pub get
 
+      - name: Install wakelock_plus development dependencies
+        working-directory: packages/wakelock_plus
+        run: flutter pub get --enforce-lockfile --no-example
+
       - name: Verify generated files committed
         run: scripts/codegen.sh --check
 
@@ -177,7 +181,7 @@ jobs:
         uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5
         with:
           distribution: "temurin"
-          java-version: "17"
+          java-version: "21"
 
       - name: Setup Flutter
         uses: subosito/flutter-action@1a449444c387b1966244ae4d4f8c696479add0b2 # v2
@@ -286,7 +290,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y --no-install-recommends \
             clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev \
-            libstdc++-12-dev libmpv-dev libepoxy-dev
+            libstdc++-12-dev libmpv-dev libepoxy-dev libcurl4-openssl-dev
 
       - name: Prepare Flutter Linux configuration
         run: |
@@ -483,12 +487,24 @@ jobs:
         shell: pwsh
         run: |
           $root = "$env:RUNNER_TEMP\flutter"
+          $expectedCommit = "559ffa3f75e7402d65a8def9c28389a9b2e6fe42"
           git init $root
           git -C $root remote add origin https://github.com/flutter/flutter.git
-          git -C $root fetch --depth 1 origin 559ffa3f75e7402d65a8def9c28389a9b2e6fe42
-          git -C $root checkout --detach FETCH_HEAD
+          git -C $root fetch --depth 1 origin refs/tags/3.44.0:refs/tags/3.44.0
+          git -C $root checkout --detach refs/tags/3.44.0
+          $actualCommit = git -C $root rev-parse HEAD
+          if ($LASTEXITCODE -ne 0 -or $actualCommit -ne $expectedCommit) {
+            throw "Flutter 3.44.0 resolved to $actualCommit, expected $expectedCommit"
+          }
           "$root\bin" | Out-File -FilePath $env:GITHUB_PATH -Append -Encoding utf8
-          & "$root\bin\flutter.bat" --version
+          $versionJson = & "$root\bin\flutter.bat" --version --machine
+          if ($LASTEXITCODE -ne 0) {
+            throw "Unable to resolve the Flutter SDK version"
+          }
+          $version = $versionJson | ConvertFrom-Json
+          if ($version.frameworkVersion -ne "3.44.0") {
+            throw "Flutter reported version $($version.frameworkVersion), expected 3.44.0"
+          }
 
       - name: Install locked Dart dependencies
         shell: pwsh

.github/workflows/e2e.yml

@@ -44,7 +44,7 @@ jobs:
         uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5
         with:
           distribution: temurin
-          java-version: "17"
+          java-version: "21"
 
       - name: Setup Flutter
         uses: subosito/flutter-action@1a449444c387b1966244ae4d4f8c696479add0b2 # v2
@@ -181,6 +181,22 @@ jobs:
             -no-boot-anim -camera-back none
           script: echo "Generated Android 9 AVD snapshot."
 
+      - name: Run Android 15 instrumentation
+        id: api35-instrumentation
+        continue-on-error: true
+        uses: reactivecircus/android-emulator-runner@a421e43855164a8197daf9d8d40fe71c6996bb0d # v2
+        with:
+          api-level: 35
+          arch: x86_64
+          profile: pixel_6
+          avd-name: maestro-api35-instrumentation
+          force-avd-creation: false
+          disable-animations: true
+          emulator-options: >-
+            -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio
+            -no-boot-anim -camera-back none
+          script: python3 scripts/run_maestro_ci.py android-15-instrumentation
+
       - name: Run Android 15 suites
         id: api35
         continue-on-error: true
@@ -283,8 +299,9 @@ jobs:
           retention-days: 7
 
       - name: Report suite failures
-        if: ${{ always() && (steps.api35.outcome != 'success' || steps.api28.outcome != 'success') }}
+        if: ${{ always() && (steps.api35-instrumentation.outcome != 'success' || steps.api35.outcome != 'success' || steps.api28.outcome != 'success') }}
         run: |
+          echo "Android 15 instrumentation outcome: ${{ steps.api35-instrumentation.outcome }}"
           echo "Android 15 outcome: ${{ steps.api35.outcome }}"
           echo "Android 9 outcome: ${{ steps.api28.outcome }}"
           exit 1