Merge branch 'master' into master

Author: zijiehe-google-com

DEPS

@@ -14,7 +14,7 @@ vars = {
   'flutter_git': 'https://flutter.googlesource.com',
   'skia_git': 'https://skia.googlesource.com',
   'llvm_git': 'https://llvm.googlesource.com',
-  'skia_revision': 'c16b145749d44524b7d5b096c1ec5229c7bcb16a',
+  'skia_revision': 'ac14158663eae191ebc38d11047b1b86d4bb1012',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -794,7 +794,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': '1elkOxihZuTEiTXzYFBwMHM_ooFm50eMLLVPZKzGMy4C'
+        'version': 'QMun2itYrV_zUYrvWen6ythcyEPiRCsgaJvUAiqpwn0C'
        }
      ],
      'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

bin/internal/engine.merge_method

@@ -1 +1 @@
-01d3d5c1dca374fb6d342c47a94c73f93d99fc73
+70b41e1adff02b30a37a149b5ef1ddfcaf0debcc

bin/internal/flutter_packages.version

@@ -34,7 +34,7 @@ if (keystorePropertiesFile.exists()) {
 
 android {
     namespace "com.example.a11y_assessments"
-    compileSdk flutter.compileSdkVersion
+    compileSdk = flutter.compileSdkVersion
 
     // Flutter's CI installs the NDK at a non-standard path.
     // This non-standard structure is initially created by
@@ -46,12 +46,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
 
     sourceSets {
@@ -63,10 +63,10 @@ android {
         applicationId "dev.flutter.a11yassessments"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion flutter.minSdkVersion
-        targetSdkVersion flutter.targetSdkVersion
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
+        minSdk = flutter.minSdkVersion
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutterVersionCode.toInteger()
+        versionName = flutterVersionName
     }
    signingConfigs {
        release {

dev/a11y_assessments/android/app/build.gradle

@@ -14,7 +14,7 @@ android {
     }
 
     namespace "dev.flutter.multipleflutters"
-    compileSdk 35
+    compileSdk = 35
 
     // Flutter's CI installs the NDK at a non-standard path.
     // This non-standard structure is initially created by
@@ -26,20 +26,20 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '17'
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 
     defaultConfig {
         applicationId "dev.flutter.multipleflutters"
-        minSdkVersion 24
-        targetSdkVersion 35
-        versionCode 1
-        versionName "1.0"
+        minSdk = 24
+        targetSdk = 35
+        versionCode = 1
+        versionName = "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

dev/benchmarks/multiple_flutters/android/app/build.gradle

@@ -39,7 +39,7 @@ dependencies:
   webview_flutter: 4.9.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   webview_flutter_android: 3.16.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   webview_flutter_platform_interface: 2.10.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  webview_flutter_wkwebview: 3.18.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  webview_flutter_wkwebview: 3.18.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
 
 dev_dependencies:
   flutter_test:
@@ -90,4 +90,4 @@ flutter:
     - packages/flutter_gallery_assets/people/square/ali.png
     - packages/flutter_gallery_assets/places/india_chettinad_silk_maker.png
 
-# PUBSPEC CHECKSUM: 4458
+# PUBSPEC CHECKSUM: 5b59

dev/benchmarks/platform_views_layout/pubspec.yaml

@@ -247,6 +247,36 @@ Future<void> frameworkTestsRunner() async {
     await runFixTests('integration_test');
     await runFixTests('flutter_driver');
     await runPrivateTests();
+
+    // Run java unit tests for integration_test
+    //
+    // Generate Gradle wrapper if it doesn't exist.
+    Process.runSync(
+      flutter,
+      <String>['build', 'apk', '--config-only'],
+      workingDirectory: path.join(
+        flutterRoot,
+        'packages',
+        'integration_test',
+        'example',
+        'android',
+      ),
+    );
+    await runCommand(
+      path.join(flutterRoot, 'packages', 'integration_test', 'example', 'android', 'gradlew$bat'),
+      <String>[
+        ':integration_test:testDebugUnitTest',
+        '--tests',
+        'dev.flutter.plugins.integration_test.FlutterDeviceScreenshotTest',
+      ],
+      workingDirectory: path.join(
+        flutterRoot,
+        'packages',
+        'integration_test',
+        'example',
+        'android',
+      ),
+    );
   }
 
   Future<void> runMisc() async {
@@ -289,35 +319,6 @@ Future<void> frameworkTestsRunner() async {
         '--exclude-tags=web',
       ],
     );
-    // Run java unit tests for integration_test
-    //
-    // Generate Gradle wrapper if it doesn't exist.
-    Process.runSync(
-      flutter,
-      <String>['build', 'apk', '--config-only'],
-      workingDirectory: path.join(
-        flutterRoot,
-        'packages',
-        'integration_test',
-        'example',
-        'android',
-      ),
-    );
-    await runCommand(
-      path.join(flutterRoot, 'packages', 'integration_test', 'example', 'android', 'gradlew$bat'),
-      <String>[
-        ':integration_test:testDebugUnitTest',
-        '--tests',
-        'dev.flutter.plugins.integration_test.FlutterDeviceScreenshotTest',
-      ],
-      workingDirectory: path.join(
-        flutterRoot,
-        'packages',
-        'integration_test',
-        'example',
-        'android',
-      ),
-    );
     await runFlutterTest(path.join(flutterRoot, 'packages', 'flutter_goldens'));
     await runFlutterTest(path.join(flutterRoot, 'packages', 'flutter_localizations'));
     await runFlutterTest(path.join(flutterRoot, 'packages', 'flutter_test'));

dev/bots/suite_runners/run_framework_tests.dart

@@ -18,6 +18,9 @@
     <file name="dev/integration_tests/spell_check/android/app/src/main/kotlin/com/example/sc_int_test/MainActivity.kt">
         <error line="1" column="9" source="standard:package-name" />
     </file>
+    <file name="dev/integration_tests/spell_check/android/app/src/main/kotlin/com/example/sc_int_test/MainApplication.kt">
+        <error line="5" column="9" source="standard:package-name" />
+    </file>
     <file name="dev/manual_tests/android/app/src/main/kotlin/dev/flutter/manual_tests/MainActivity.kt">
         <error line="1" column="9" source="standard:package-name" />
     </file>

dev/bots/test/analyze-test-input/ktlint-baseline.xml

@@ -150,6 +150,51 @@ class NextContext extends Context {
           }
         }
 
+        await pushWorkingBranch(framework, state.framework);
+      case pb.ReleasePhase.UPDATE_ENGINE_VERSION:
+        final Remote upstream = Remote.upstream(state.framework.upstream.url);
+        final FrameworkRepository framework = FrameworkRepository(
+          checkouts,
+          initialRef: state.framework.workingBranch,
+          upstreamRemote: upstream,
+          previousCheckoutLocation: state.framework.checkoutPath,
+        );
+        final String rev = await framework.reverseParse('HEAD');
+        final File engineVersionFile = (await framework.checkoutDirectory)
+            .childDirectory('bin')
+            .childDirectory('internal')
+            .childFile('engine.version');
+
+        engineVersionFile.writeAsStringSync(rev);
+
+        // Must force add since it is gitignored
+        await framework.git.run(
+          const <String>['add', 'bin/internal/engine.version', '--force'],
+          'adding engine.version file',
+          workingDirectory: (await framework.checkoutDirectory).path,
+        );
+        final String revision = await framework.commit(
+          'Create engine.version file pointing to $rev',
+        );
+        // append to list of cherrypicks so we know a PR is required
+        state.framework.cherrypicks.add(
+          pb.Cherrypick.create()
+            ..appliedRevision = revision
+            ..state = pb.CherrypickState.COMPLETED,
+        );
+
+        if (!autoAccept) {
+          final bool response = await prompt(
+            'Are you ready to push your framework branch to the repository '
+            '${state.framework.mirror.url}?',
+          );
+          if (!response) {
+            stdio.printError('Aborting command.');
+            updateState(state, stdio.logs);
+            return;
+          }
+        }
+
         await pushWorkingBranch(framework, state.framework);
       case pb.ReleasePhase.PUBLISH_VERSION:
         final String command = '''

dev/conductor/core/lib/src/next.dart

@@ -20,15 +20,18 @@ import 'package:protobuf/protobuf.dart' as $pb;
 class ReleasePhase extends $pb.ProtobufEnum {
   static const ReleasePhase APPLY_FRAMEWORK_CHERRYPICKS =
       ReleasePhase._(0, _omitEnumNames ? '' : 'APPLY_FRAMEWORK_CHERRYPICKS');
+  static const ReleasePhase UPDATE_ENGINE_VERSION =
+      ReleasePhase._(1, _omitEnumNames ? '' : 'UPDATE_ENGINE_VERSION');
   static const ReleasePhase PUBLISH_VERSION =
-      ReleasePhase._(1, _omitEnumNames ? '' : 'PUBLISH_VERSION');
+      ReleasePhase._(2, _omitEnumNames ? '' : 'PUBLISH_VERSION');
   static const ReleasePhase VERIFY_RELEASE =
-      ReleasePhase._(2, _omitEnumNames ? '' : 'VERIFY_RELEASE');
+      ReleasePhase._(3, _omitEnumNames ? '' : 'VERIFY_RELEASE');
   static const ReleasePhase RELEASE_COMPLETED =
-      ReleasePhase._(3, _omitEnumNames ? '' : 'RELEASE_COMPLETED');
+      ReleasePhase._(4, _omitEnumNames ? '' : 'RELEASE_COMPLETED');
 
   static const $core.List<ReleasePhase> values = <ReleasePhase>[
     APPLY_FRAMEWORK_CHERRYPICKS,
+    UPDATE_ENGINE_VERSION,
     PUBLISH_VERSION,
     VERIFY_RELEASE,
     RELEASE_COMPLETED,