Merge branch 'main' into remove_kotlin_bom

.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
+e7da16df76cd239ec9ed07f0d0caf78154e63986

.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:

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

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/animations/test/open_container_test.dart

@@ -37,7 +37,7 @@ void main() {
       ));
 
       // Closed container has the expected properties.
-      final StatefulElement srcMaterialElement = tester.firstElement(
+      final Element srcMaterialElement = tester.firstElement(
         find.ancestor(
           of: find.text('Closed'),
           matching: find.byType(Material),
@@ -62,7 +62,7 @@ void main() {
       await tester.pump();
 
       // On the first frame of the animation everything still looks like before.
-      final StatefulElement destMaterialElement = tester.firstElement(
+      final Element destMaterialElement = tester.firstElement(
         find.ancestor(
           of: find.text('Closed'),
           matching: find.byType(Material),
@@ -162,7 +162,7 @@ void main() {
       await tester.pump(const Duration(milliseconds: 1));
       expect(find.text('Closed'), findsNothing); // No longer in the tree.
       expect(find.text('Open'), findsOneWidget);
-      final StatefulElement finalMaterialElement = tester.firstElement(
+      final Element finalMaterialElement = tester.firstElement(
         find.ancestor(
           of: find.text('Open'),
           matching: find.byType(Material),
@@ -213,7 +213,7 @@ void main() {
       // Open container has the expected properties.
       expect(find.text('Closed'), findsNothing);
       expect(find.text('Open'), findsOneWidget);
-      final StatefulElement initialMaterialElement = tester.firstElement(
+      final Element initialMaterialElement = tester.firstElement(
         find.ancestor(
           of: find.text('Open'),
           matching: find.byType(Material),
@@ -237,7 +237,7 @@ void main() {
 
       expect(find.text('Closed'), findsOneWidget);
       expect(find.text('Open'), findsOneWidget);
-      final StatefulElement materialElement = tester.firstElement(
+      final Element materialElement = tester.firstElement(
         find.ancestor(
           of: find.text('Open'),
           matching: find.byType(Material),
@@ -328,7 +328,7 @@ void main() {
       await tester.pump(const Duration(milliseconds: 1));
       expect(find.text('Open'), findsNothing); // No longer in the tree.
       expect(find.text('Closed'), findsOneWidget);
-      final StatefulElement finalMaterialElement = tester.firstElement(
+      final Element finalMaterialElement = tester.firstElement(
         find.ancestor(
           of: find.text('Closed'),
           matching: find.byType(Material),
@@ -380,7 +380,7 @@ void main() {
     ));
 
     // Closed container has the expected properties.
-    final StatefulElement srcMaterialElement = tester.firstElement(
+    final Element srcMaterialElement = tester.firstElement(
       find.ancestor(
         of: find.text('Closed'),
         matching: find.byType(Material),
@@ -405,7 +405,7 @@ void main() {
     await tester.pump();
 
     // On the first frame of the animation everything still looks like before.
-    final StatefulElement destMaterialElement = tester.firstElement(
+    final Element destMaterialElement = tester.firstElement(
       find.ancestor(
         of: find.text('Closed'),
         matching: find.byType(Material),
@@ -509,7 +509,7 @@ void main() {
     await tester.pump(const Duration(milliseconds: 1));
     expect(find.text('Closed'), findsNothing); // No longer in the tree.
     expect(find.text('Open'), findsOneWidget);
-    final StatefulElement finalMaterialElement = tester.firstElement(
+    final Element finalMaterialElement = tester.firstElement(
       find.ancestor(
         of: find.text('Open'),
         matching: find.byType(Material),
@@ -558,7 +558,7 @@ void main() {
     // Open container has the expected properties.
     expect(find.text('Closed'), findsNothing);
     expect(find.text('Open'), findsOneWidget);
-    final StatefulElement initialMaterialElement = tester.firstElement(
+    final Element initialMaterialElement = tester.firstElement(
       find.ancestor(
         of: find.text('Open'),
         matching: find.byType(Material),
@@ -583,7 +583,7 @@ void main() {
 
     expect(find.text('Closed'), findsOneWidget);
     expect(find.text('Open'), findsOneWidget);
-    final StatefulElement materialElement = tester.firstElement(
+    final Element materialElement = tester.firstElement(
       find.ancestor(
         of: find.text('Open'),
         matching: find.byType(Material),
@@ -684,7 +684,7 @@ void main() {
     await tester.pump(const Duration(milliseconds: 1));
     expect(find.text('Open'), findsNothing); // No longer in the tree.
     expect(find.text('Closed'), findsOneWidget);
-    final StatefulElement finalMaterialElement = tester.firstElement(
+    final Element finalMaterialElement = tester.firstElement(
       find.ancestor(
         of: find.text('Closed'),
         matching: find.byType(Material),

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_android_camerax/CHANGELOG.md

@@ -1,8 +1,20 @@
-## 0.6.7+3
+## 0.6.8+3
 
 * Removes dependency on org.jetbrains.kotlin:kotlin-bom.
 * Updates minimum supported SDK version to Flutter 3.24/Dart 3.5.
 
+## 0.6.8+2
+
+* Marks uses of `Camera2Interop` with `@OptIn` annotation.
+
+## 0.6.8+1
+
+* Re-lands support for Impeller.
+
+## 0.6.8
+
+* Updates Guava version to 33.3.0.
+
 ## 0.6.7+2
 
 * Updates lint checks to ignore NewerVersionAvailable.

packages/camera/camera_android_camerax/android/build.gradle

@@ -66,7 +66,7 @@ dependencies {
     implementation "androidx.camera:camera-camera2:${camerax_version}"
     implementation "androidx.camera:camera-lifecycle:${camerax_version}"
     implementation "androidx.camera:camera-video:${camerax_version}"
-    implementation 'com.google.guava:guava:33.2.1-android'
+    implementation 'com.google.guava:guava:33.3.0-android'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-inline:5.0.0'
     testImplementation 'androidx.test:core:1.4.0'

packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/Camera2CameraControlHostApiImpl.java

@@ -10,6 +10,7 @@
 import androidx.annotation.VisibleForTesting;
 import androidx.camera.camera2.interop.Camera2CameraControl;
 import androidx.camera.camera2.interop.CaptureRequestOptions;
+import androidx.camera.camera2.interop.ExperimentalCamera2Interop;
 import androidx.camera.core.CameraControl;
 import androidx.core.content.ContextCompat;
 import com.google.common.util.concurrent.FutureCallback;
@@ -134,6 +135,7 @@ public void addCaptureRequestOptions(
    * Retrieves the {@link Camera2CameraControl} instance associated with the specified {@code
    * identifier}.
    */
+  @OptIn(markerClass = ExperimentalCamera2Interop.class)
   private Camera2CameraControl getCamera2CameraControlInstance(@NonNull Long identifier) {
     return Objects.requireNonNull(instanceManager.getInstance(identifier));
   }

packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/Camera2CameraInfoFlutterApiImpl.java

@@ -6,7 +6,9 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.OptIn;
 import androidx.camera.camera2.interop.Camera2CameraInfo;
+import androidx.camera.camera2.interop.ExperimentalCamera2Interop;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugins.camerax.GeneratedCameraXLibrary.Camera2CameraInfoFlutterApi;
 
@@ -19,6 +21,7 @@ public Camera2CameraInfoFlutterApiImpl(
     this.instanceManager = instanceManager;
   }
 
+  @OptIn(markerClass = ExperimentalCamera2Interop.class)
   void create(@NonNull Camera2CameraInfo camera2CameraInfo, @Nullable Reply<Void> reply) {
     if (!instanceManager.containsInstance(camera2CameraInfo)) {
       create(instanceManager.addHostCreatedInstance(camera2CameraInfo), reply);

packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/Camera2CameraInfoHostApiImpl.java

@@ -84,6 +84,7 @@ public Camera2CameraInfoHostApiImpl(
     this.proxy = proxy;
   }
 
+  @OptIn(markerClass = ExperimentalCamera2Interop.class)
   @Override
   @NonNull
   public Long createFrom(@NonNull Long cameraInfoIdentifier) {
@@ -115,6 +116,7 @@ public Long getSensorOrientation(@NonNull Long identifier) {
     return proxy.getSensorOrientation(getCamera2CameraInfoInstance(identifier));
   }
 
+  @OptIn(markerClass = ExperimentalCamera2Interop.class)
   private Camera2CameraInfo getCamera2CameraInfoInstance(@NonNull Long identifier) {
     return Objects.requireNonNull(instanceManager.getInstance(identifier));
   }

packages/camera/camera_android_camerax/android/src/main/java/io/flutter/plugins/camerax/CameraXProxy.java

@@ -5,9 +5,7 @@
 package io.flutter.plugins.camerax;
 
 import android.app.Activity;
-import android.graphics.SurfaceTexture;
 import android.util.Size;
-import android.view.Surface;
 import androidx.annotation.NonNull;
 import androidx.camera.core.CameraSelector;
 import androidx.camera.core.ImageAnalysis;
@@ -51,11 +49,6 @@ public class CameraXProxy {
     return new Preview.Builder();
   }
 
-  /** Creates a {@link Surface} instance from the specified {@link SurfaceTexture}. */
-  public @NonNull Surface createSurface(@NonNull SurfaceTexture surfaceTexture) {
-    return new Surface(surfaceTexture);
-  }
-
   /**
    * Creates an instance of the {@link SystemServicesFlutterApiImpl}.
    *