Merge branch 'main' into deprecation-ios-14

.ci/flutter_master.version

@@ -1 +1 @@
-a0c04534f5ead3e9f0d6a861e07d8e32c7318919
+b8f89f70bf4e8c304fc909b58e23f2358983bb41

.ci/flutter_stable.version

@@ -1 +1 @@
-80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819
+5874a72aa4c779a02553007c47dacbefba2374dc

README.md

@@ -2,7 +2,6 @@
 
 [![Release Status](https:/flutter/packages/actions/workflows/release.yml/badge.svg)](https:/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:/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/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

@@ -689,7 +689,6 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
  showInSnackBar('Audio access is restricted.');
  default:
  _showCameraException(e);
- break;
  }
  }
 

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

@@ -699,7 +699,6 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
  showInSnackBar('Unknown permission error.');
  default:
  _showCameraException(e);
- break;
  }
  }
 

packages/camera/camera_android_camerax/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 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,13 +66,9 @@ 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'
  testImplementation 'org.robolectric:robolectric:4.10.3'
-
- // org.jetbrains.kotlin:kotlin-bom artifact purpose is to align kotlin stdlib and related code versions.
- // See: https://youtrack.jetbrains.com/issue/KT-55297/kotlin-stdlib-should-declare-constraints-on-kotlin-stdlib-jdk8-and-kotlin-stdlib-jdk7
- implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.10"))
 }

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}.
  *

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

@@ -4,7 +4,6 @@
 
 package io.flutter.plugins.camerax;
 
-import android.graphics.SurfaceTexture;
 import android.util.Size;
 import android.view.Surface;
 import androidx.annotation.NonNull;
@@ -25,7 +24,7 @@ public class PreviewHostApiImpl implements PreviewHostApi {
  private final TextureRegistry textureRegistry;
 
  @VisibleForTesting public @NonNull CameraXProxy cameraXProxy = new CameraXProxy();
- @VisibleForTesting public @Nullable TextureRegistry.SurfaceTextureEntry flutterSurfaceTexture;
+ @VisibleForTesting public @Nullable TextureRegistry.SurfaceProducer flutterSurfaceProducer;
 
  public PreviewHostApiImpl(
  @NonNull BinaryMessenger binaryMessenger,
@@ -62,12 +61,11 @@ public void create(
  @Override
  public @NonNull Long setSurfaceProvider(@NonNull Long identifier) {
  Preview preview = getPreviewInstance(identifier);
- flutterSurfaceTexture = textureRegistry.createSurfaceTexture();
- SurfaceTexture surfaceTexture = flutterSurfaceTexture.surfaceTexture();
- Preview.SurfaceProvider surfaceProvider = createSurfaceProvider(surfaceTexture);
+ flutterSurfaceProducer = textureRegistry.createSurfaceProducer();
+ Preview.SurfaceProvider surfaceProvider = createSurfaceProvider(flutterSurfaceProducer);
  preview.setSurfaceProvider(surfaceProvider);
 
- return flutterSurfaceTexture.id();
+ return flutterSurfaceProducer.id();
  }
 
  /**
@@ -76,13 +74,32 @@ public void create(
  */
  @VisibleForTesting
  public @NonNull Preview.SurfaceProvider createSurfaceProvider(
- @NonNull SurfaceTexture surfaceTexture) {
+ @NonNull TextureRegistry.SurfaceProducer surfaceProducer) {
  return new Preview.SurfaceProvider() {
  @Override
  public void onSurfaceRequested(@NonNull SurfaceRequest request) {
- surfaceTexture.setDefaultBufferSize(
+ // Set callback for surfaceProducer to invalidate Surfaces that it produces when they
+ // get destroyed.
+ surfaceProducer.setCallback(
+ new TextureRegistry.SurfaceProducer.Callback() {
+ @Override
+ public void onSurfaceCreated() {
+ // Do nothing. The Preview.SurfaceProvider will handle this whenever a new
+ // Surface is needed.
+ }
+
+ @Override
+ public void onSurfaceDestroyed() {
+ // Invalidate the SurfaceRequest so that CameraX knows to to make a new request
+ // for a surface.
+ request.invalidate();
+ }
+ });
+
+ // Provide surface.
+ surfaceProducer.setSize(
  request.getResolution().getWidth(), request.getResolution().getHeight());
- Surface flutterSurface = cameraXProxy.createSurface(surfaceTexture);
+ Surface flutterSurface = surfaceProducer.getSurface();
  request.provideSurface(
  flutterSurface,
  Executors.newSingleThreadExecutor(),
@@ -133,8 +150,8 @@ String getProvideSurfaceErrorDescription(int resultCode) {
  */
  @Override
  public void releaseFlutterSurfaceTexture() {
- if (flutterSurfaceTexture != null) {
- flutterSurfaceTexture.release();
+ if (flutterSurfaceProducer != null) {
+ flutterSurfaceProducer.release();
  }
  }