Merge branch 'flutter:main' into code-block-lint

.ci.yaml

@@ -31,7 +31,7 @@ platform_properties:
           {"dependency": "android_sdk", "version": "version:33v6"},
           {"dependency": "open_jdk", "version": "version:17"},
           {"dependency": "curl", "version": "version:7.64.0"},
-          {"dependency": "avd_cipd_version", "version": "build_id:8759428741582061553"}
+          {"dependency": "avd_cipd_version", "version": "build_id:8739520057779466577"}
         ]
   linux_android_legacy:
     properties:
@@ -44,7 +44,7 @@ platform_properties:
           {"dependency": "open_jdk", "version": "version:17"},
           {"dependency": "curl", "version": "version:7.64.0"},
           {"dependency": "android_virtual_device", "version": "generic_android22.textpb"},
-          {"dependency": "avd_cipd_version", "version": "build_id:8759428741582061553"}
+          {"dependency": "avd_cipd_version", "version": "build_id:8739520057779466577"}
         ]
   linux_desktop:
     properties:

.ci/flutter_master.version

@@ -1 +1 @@
-cc13cd1f11916857ec5adbe43ce4e747fb07a5d5
+6790525ce673734ef3a913e301a7001e2f500703

.ci/flutter_stable.version

@@ -1 +1 @@
-80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
+2663184aa79047d0a33a14a3b607954f8fdd8730

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

@@ -25,6 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
+    namespace = "com.example.all_packages"
     compileSdkVersion 33
 
     defaultConfig {

.ci/targets/ios_platform_tests.yaml

@@ -18,7 +18,7 @@ tasks:
   - name: xcode analyze deprecation
     # Ensure we don't accidentally introduce deprecated code.
     script: .ci/scripts/tool_runner.sh
-    args: ["xcode-analyze", "--ios", "--ios-min-version=13.0"]
+    args: ["xcode-analyze", "--ios", "--ios-min-version=14.0", "--exclude=script/configs/exclude_xcode_deprecation.yaml"]
   - name: native test
     script: .ci/scripts/tool_runner.sh
     # Simulator name and version must match name and version in create_simulator.sh

.ci/targets/macos_platform_tests.yaml

@@ -15,7 +15,7 @@ tasks:
   - name: xcode analyze deprecation
     # Ensure we don't accidentally introduce deprecated code.
     script: .ci/scripts/tool_runner.sh
-    args: ["xcode-analyze", "--macos", "--macos-min-version=12.3"]
+    args: ["xcode-analyze", "--macos", "--macos-min-version=14.0", "--exclude=script/configs/exclude_xcode_deprecation.yaml"]
   - name: native test
     script: .ci/scripts/tool_runner.sh
     args: ["native-test", "--macos"]

.github/labeler.yml

@@ -108,6 +108,11 @@
     - any-glob-to-any-file:
       - packages/in_app_purchase/**/*
 
+'p: interactive_media_ads':
+  - changed-files:
+    - any-glob-to-any-file:
+      - packages/interactive_media_ads/**/*
+
 'p: ios_platform_images':
   - changed-files:
     - any-glob-to-any-file:

.github/workflows/release.yml

@@ -36,7 +36,7 @@ jobs:
         cd $GITHUB_WORKSPACE
     # Checks out a copy of the repo.
     - name: Check out code
-      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
       with:
         fetch-depth: 0 # Fetch all history so the tool can get all the tags to determine version.
     - name: Set up tools

CODEOWNERS

@@ -45,6 +45,7 @@ packages/web_benchmarks/**                               @yjbanov
 packages/webview_flutter/**                              @bparrishMines
 packages/xdg_directories/**                              @stuartmorgan
 third_party/packages/cupertino_icons/**                  @MitchellGoodwin
+third_party/packages/cupertino_icons/test/goldens/**     @LongCatIsLooong
 
 # Plugin platform implementation rules. These should stay last, since the last
 # matching entry takes precedence.
@@ -62,9 +63,8 @@ packages/video_player/video_player_web/**                @ditman
 packages/webview_flutter/webview_flutter_web/**          @ditman
 
 # - Android
-# TODO(matanlurey): Remove @matanlurey after https://github.com/flutter/flutter/issues/151018.
-packages/camera/camera_android/**                        @camsim99 @matanlurey
-packages/camera/camera_android_camerax/**                @camsim99 @matanlurey
+packages/camera/camera_android/**                        @camsim99
+packages/camera/camera_android_camerax/**                @camsim99
 packages/espresso/**                                     @reidbaker
 packages/file_selector/file_selector_android/**          @gmackall
 packages/flutter_plugin_android_lifecycle/**             @reidbaker

README.md

@@ -2,7 +2,6 @@
 
 [![Release Status](https://github.com/flutter/packages/actions/workflows/release.yml/badge.svg)](https://github.com/flutter/packages/actions/workflows/release.yml)
 [![Flutter CI Status](https://flutter-dashboard.appspot.com/api/public/build-status-badge?repo=packages)](https://flutter-dashboard.appspot.com/#/build?repo=packages)
-[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/flutter/packages/badge)](https://deps.dev/project/github/flutter%2Fpackages)
 
 This repo is a companion repo to the main [flutter repo](
 https://github.com/flutter/flutter). It contains the source code for Flutter's

analysis_options.yaml

@@ -132,7 +132,7 @@ linter:
     # - one_member_abstracts # too many false positives
     - only_throw_errors # this does get disabled in a few places where we have legacy code that uses strings et al
     - overridden_fields
-    - package_api_docs
+    # - package_api_docs # Deprecated (https://github.com/dart-lang/linter/issues/5107)
     - package_names
     - package_prefixed_library_names
     # - parameter_assignments # we do this commonly

packages/animations/example/android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.5.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

packages/animations/example/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip

packages/camera/camera/example/android/app/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

packages/camera/camera/example/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.5.1'
     }
 }
 

packages/camera/camera/example/android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip

packages/camera/camera/example/lib/main.dart

@@ -534,7 +534,7 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
           onPressed: cameraController != null &&
                   cameraController.value.isInitialized &&
                   cameraController.value.isRecordingVideo
-              ? (cameraController.value.isRecordingPaused)
+              ? cameraController.value.isRecordingPaused
                   ? onResumeButtonPressed
                   : onPauseButtonPressed
               : null,
@@ -689,7 +689,6 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
           showInSnackBar('Audio access is restricted.');
         default:
           _showCameraException(e);
-          break;
       }
     }
 

packages/camera/camera/pubspec.yaml

@@ -32,7 +32,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  mockito: 5.4.4
+  mockito: ^5.4.4
   plugin_platform_interface: ^2.1.7
 
 topics:

packages/camera/camera_android/CHANGELOG.md

@@ -1,3 +1,24 @@
+## 0.10.9+16
+
+* Updates annotations lib to 1.9.0.
+
+## 0.10.9+15
+
+* Converts Dart to native platform calls to Pigeon.
+
+## 0.10.9+14
+
+* Converts native to Dart platform calls to Pigeon.
+
+## 0.10.9+13
+
+* Converts `getAvailableCameras` to Pigeon.
+
+## 0.10.9+12
+
+* Updates Java compatibility version to 11.
+* Updates minimum supported SDK version to Flutter 3.24/Dart 3.5.
+
 ## 0.10.9+11
 
 * Updates annotations lib to 1.8.2.

packages/camera/camera_android/android/build.gradle

@@ -30,10 +30,7 @@ android {
 buildFeatures {
         buildConfig true
     }
-    // Conditional for compatibility with AGP <4.2.
-    if (project.android.hasProperty("namespace")) {
-        namespace 'io.flutter.plugins.camera'
-    }
+    namespace 'io.flutter.plugins.camera'
     compileSdk 34
 
     defaultConfig {
@@ -46,14 +43,18 @@ buildFeatures {
         disable 'AndroidGradlePluginVersion', 'InvalidPackage', 'GradleDependency', 'NewerVersionAvailable'
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     testOptions {
         unitTests.includeAndroidResources = true
         unitTests.returnDefaultValues = true
         unitTests.all {
+            // The org.gradle.jvmargs property that may be set in gradle.properties does not impact
+            // the Java heap size when running the Android unit tests. The following property here
+            // sets the heap size to a size large enough to run the robolectric tests across
+            // multiple SDK levels.
             jvmArgs "-Xmx1g"
             testLogging {
                events "passed", "skipped", "failed", "standardOut", "standardError"
@@ -65,7 +66,7 @@ buildFeatures {
 }
 
 dependencies {
-    implementation 'androidx.annotation:annotation:1.8.2'
+    implementation 'androidx.annotation:annotation:1.9.0'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-inline:5.0.0'
     testImplementation 'androidx.test:core:1.4.0'