Merge branch 'main' of https://github.com/flutter/packages into Frill…

…back

.ci.yaml

@@ -28,22 +28,25 @@ platform_properties:
       device_type: none
       dependencies: >-
         [
-          {"dependency": "android_sdk", "version": "version:33v6"},
+          {"dependency": "android_sdk", "version": "version:36v3"},
           {"dependency": "open_jdk", "version": "version:17"},
           {"dependency": "curl", "version": "version:7.64.0"},
-          {"dependency": "avd_cipd_version", "version": "build_id:8733065022087935185"}
+          {"dependency": "avd_cipd_version", "version": "build_id:8719362231152674241"}
         ]
   linux_android_legacy:
     properties:
       os: Ubuntu
       cores: "8"
       device_type: none
+      # The android_virtual_device here should be as old as is feasible. Currently it's 31
+      # because the older devices available (see link above for options) are all x86, which
+      # is no longer supported by Flutter.
       dependencies: >-
         [
           {"dependency": "android_sdk", "version": "version:33v6"},
           {"dependency": "open_jdk", "version": "version:17"},
           {"dependency": "curl", "version": "version:7.64.0"},
-          {"dependency": "android_virtual_device", "version": "generic_android22.textpb"},
+          {"dependency": "android_virtual_device", "version": "android_31_google_apis_x64.textpb"},
           {"dependency": "avd_cipd_version", "version": "build_id:8733065022087935185"}
         ]
   linux_desktop:
@@ -90,7 +93,7 @@ platform_properties:
         [
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
         ]
-      os: Mac-14
+      os: Mac-14|Mac-15.5
       device_type: none
       cpu: arm64
       $flutter/osx_sdk : >-
@@ -103,7 +106,7 @@ platform_properties:
         [
           {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
         ]
-      os: Mac-14
+      os: Mac-14|Mac-15.5
       device_type: none
       cpu: x86
       $flutter/osx_sdk : >-
@@ -114,7 +117,7 @@ platform_properties:
 targets:
   - name: Linux repo_checks
     recipe: packages/packages
-    timeout: 30
+    timeout: 60
     properties:
       add_recipes_cq: "true"
       target_file: repo_checks.yaml
@@ -322,21 +325,21 @@ targets:
     timeout: 30
     properties:
       target_file: analyze_legacy.yaml
-      channel: "3.24.5"
+      channel: "3.32.8"
       env_variables: >-
         {
-          "CHANNEL": "3.24.5"
+          "CHANNEL": "3.32.8"
         }
 
   - name: Linux analyze_legacy N-2
     recipe: packages/packages
     timeout: 30
     properties:
       target_file: analyze_legacy.yaml
-      channel: "3.22.3"
+      channel: "3.29.3"
       env_variables: >-
         {
-          "CHANNEL": "3.22.3"
+          "CHANNEL": "3.29.3"
         }
 
   - name: Linux_android custom_package_tests master
@@ -353,7 +356,7 @@ targets:
       # web_benchmarks needs Chrome.
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"},
+          {"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
           {"dependency": "ninja", "version": "version:1.9.0"},
@@ -376,7 +379,7 @@ targets:
       # See comments on 'master' version above.
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"},
+          {"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "cmake", "version": "build_id:8787856497187628321"},
           {"dependency": "ninja", "version": "version:1.9.0"},
@@ -391,70 +394,31 @@ targets:
   ### Android tasks ###
   - name: Linux_android android_build_all_packages master
     recipe: packages/packages
-    timeout: 30
+    timeout: 60
     properties:
       version_file: flutter_master.version
       # This builds the all_packages app only in a current JDK.
-      target_file: android_build_all_packages_jdk17.yaml
-      channel: master
-      env_variables: >-
-        {
-          "CHANNEL": "master"
-        }
-
-  - name: Linux_android android_build_all_packages_legacy master
-    recipe: packages/packages
-    timeout: 30
-    properties:
-      version_file: flutter_master.version
-      # TODO(stuartmorgan): Once stable requires JDK 17, and the
-      # legacy project is updated accordingly, this entire target
-      # can be merged back into android_build_all_packages.
-      # This file only builds a *legacy* version of the project.
-      target_file: android_build_all_packages_legacy.yaml
+      target_file: android_build_all_packages.yaml
       channel: master
-      # The legacy project build requires an older JDK.
-      dependencies: >-
-        [
-          {"dependency": "open_jdk", "version": "version:11"}
-        ]
       env_variables: >-
         {
           "CHANNEL": "master"
         }
 
   - name: Linux_android android_build_all_packages stable
     recipe: packages/packages
-    timeout: 30
+    timeout: 60
     properties:
       add_recipes_cq: "true"
       version_file: flutter_stable.version
       # This builds the all_packages app only in a current JDK.
-      target_file: android_build_all_packages_jdk17.yaml
+      target_file: android_build_all_packages.yaml
       channel: stable
       env_variables: >-
         {
           "CHANNEL": "stable"
         }
 
-  - name: Linux_android android_build_all_packages_legacy stable
-    recipe: packages/packages
-    timeout: 30
-    properties:
-      version_file: flutter_stable.version
-      # This file only builds a *legacy* version of the project.
-      target_file: android_build_all_packages_legacy.yaml
-      channel: stable
-      # The legacy project build requires an older JDK.
-      dependencies: >-
-        [
-          {"dependency": "open_jdk", "version": "version:11"}
-        ]
-      env_variables: >-
-        {
-          "CHANNEL": "stable"
-        }
-
   - name: Linux_android android_platform_tests_shard_1 master
     recipe: packages/packages
     timeout: 60
@@ -465,7 +429,7 @@ targets:
       package_sharding: "--shardIndex 0 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
+          {"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
         ]
       env_variables: >-
         {
@@ -483,7 +447,7 @@ targets:
       package_sharding: "--shardIndex 1 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
+          {"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
         ]
       env_variables: >-
         {
@@ -501,7 +465,7 @@ targets:
       package_sharding: "--shardIndex 2 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
+          {"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
         ]
       env_variables: >-
         {
@@ -519,7 +483,7 @@ targets:
       package_sharding: "--shardIndex 3 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
+          {"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
         ]
       env_variables: >-
         {
@@ -537,7 +501,7 @@ targets:
       package_sharding: "--shardIndex 4 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
+          {"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
         ]
       env_variables: >-
         {
@@ -555,7 +519,7 @@ targets:
       package_sharding: "--shardIndex 5 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
+          {"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
         ]
       env_variables: >-
         {
@@ -574,7 +538,7 @@ targets:
       package_sharding: "--shardIndex 0 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
+          {"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
         ]
       env_variables: >-
         {
@@ -593,7 +557,7 @@ targets:
       package_sharding: "--shardIndex 1 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
+          {"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
         ]
       env_variables: >-
         {
@@ -612,7 +576,7 @@ targets:
       package_sharding: "--shardIndex 2 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
+          {"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
         ]
       env_variables: >-
         {
@@ -631,7 +595,7 @@ targets:
       package_sharding: "--shardIndex 3 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
+          {"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
         ]
       env_variables: >-
         {
@@ -650,7 +614,7 @@ targets:
       package_sharding: "--shardIndex 4 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
+          {"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
         ]
       env_variables: >-
         {
@@ -669,7 +633,7 @@ targets:
       package_sharding: "--shardIndex 5 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
+          {"dependency": "android_virtual_device", "version": "android_36_google_apis_x64.textpb"}
         ]
       env_variables: >-
         {
@@ -1073,10 +1037,6 @@ targets:
     properties:
       version_file: flutter_master.version
       target_file: macos_repo_checks.yaml
-      dependencies: >
-        [
-          {"dependency": "swift_format", "version": "build_id:8797338979890974865"}
-        ]
 
   ### macOS desktop tasks ###
   # macos-platform_tests builds all the packages on ARM, so this build is run
@@ -1146,10 +1106,6 @@ targets:
         {
           "CHANNEL": "master"
         }
-      dependencies: >
-        [
-          {"dependency": "swift_format", "version": "build_id:8797338979890974865"}
-        ]
 
   - name: Mac_arm64 custom_package_tests stable
     recipe: packages/packages
@@ -1162,10 +1118,6 @@ targets:
         {
           "CHANNEL": "stable"
         }
-      dependencies: >
-        [
-          {"dependency": "swift_format", "version": "build_id:8797338979890974865"}
-        ]
 
   ### iOS tasks ###
   # ios_platform_tests builds all the packages on ARM, so this build is run
@@ -1479,7 +1431,6 @@ targets:
     recipe: packages/packages
     presubmit: false
     timeout: 30
-    bringup: true # https://github.com/flutter/flutter/issues/134083
     properties:
       add_recipes_cq: "true"
       target_file: windows_build_all_packages.yaml
@@ -1514,7 +1465,6 @@ targets:
     recipe: packages/packages
     presubmit: false
     timeout: 30
-    bringup: true
     properties:
       target_file: windows_build_all_packages.yaml
       channel: stable

.ci/flutter_master.version

@@ -1 +1 @@
-a0b1b3253416b1f19e3f105b596eb6e4c5813ef4
+e11e2c11288b6a3f9f9bb3dcfb9bb459a75e048c

.ci/flutter_stable.version

@@ -1 +1 @@
-c23637390482d4cf9598c3ce3f2be31aa7332daf
+9f455d2486bcb28cad87b062475f42edc959f636

.ci/legacy_project/README.md

@@ -37,16 +37,23 @@ and then deleting everything but `android/` from it:
 - Added license boilerplate.
 - Replaced `jcenter` in build.gradle with `mavenCentral`, due to the
   jcenter.bintray.com shutdown.
-- Update `compileSdkVersion` from 30 to 33 to maintain compatibility
-  with plugins that use API 34.
-- Updates `gradle-wrapper.properties` from `6.7` to `6.7.1`, to add
-  support for the Kotlin gradle plugin. If a user runs into this
-  error, the error message is clear on how to upgrade.
-- Modifies `build.gradle` to upgrade the Android Gradle Plugin (AGP)
-  from version 4.1.0 to 7.0.0. If a user runs into an error with
-  the AGP version, the warning is clear on how to upgrade
-  the version to one that we support.
+- Update `compileSdkVersion` from 30 to `flutter.compileSdkVersion` in
+  `build.gradle` to maintain compatibility with plugins that use
+  Flutter's most recently supported API version.
 - Modifies `gradle-wrapper.properties` to upgrade the Gradle version
-  from 6.7.1 to 7.0.2. If a user runs into an error with the Gradle
+  from 8.4 to 8.7. If a user runs into an error with the Gradle
   version, the warning is clear on how to upgrade the version to
-  one that we support.
+  one that we support.
+- Modifies `settings.gradle` to upgrade the Android Gradle Plugin (AGP)
+  from version 8.3.0 (originally set in `build.gradle`; see bullet below)
+  to 8.6.0. If a user runs into an error with the AGP version, the warning
+  is clear on how to upgrade the version to one that we support.
+- Refactor plugin to use declarative Gradle apply instead of the
+  imperative apply (this includes moving where the Android Gradle
+  Plugin (AGP) version is set from `build.gradle` to `settings.gradle`).
+- Modifies `settings.gradle` to upgrade the Kotlin Gradle Plugin (KGP)
+  from version 1.9.0 to 2.1.0. If a user runs into an error with the AGP version,
+  the warning is clear on how to upgrade the version to one that we support.
+- Modifies `gradle.properties` to not set android.enableJetifier=true.
+- Update `app/build.gradle` to enable library desugaring to support
+  `interactive_media_ads` plugin.

.ci/legacy_project/all_packages/android/app/build.gradle

@@ -26,6 +26,10 @@ android {
     namespace = "com.example.all_packages"
     compileSdkVersion flutter.compileSdkVersion
 
+    compileOptions {
+      coreLibraryDesugaringEnabled true
+    }
+
     defaultConfig {
         applicationId "com.example.all_packages"
         minSdkVersion flutter.minSdkVersion
@@ -44,3 +48,7 @@ android {
 flutter {
     source '../..'
 }
+
+dependencies {
+  coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
+}

.ci/legacy_project/all_packages/android/app/src/main/java/com/example/all_packages/MainActivity.java

@@ -1,4 +1,4 @@
-// Copyright 2013 The Flutter Authors. All rights reserved.
+// Copyright 2013 The Flutter Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.