Rename and disallow files named .

ci/analyze.sh

@@ -28,7 +28,10 @@ function follow_links() (
 )
 
 SCRIPT_DIR=$(follow_links "$(dirname -- "${BASH_SOURCE[0]}")")
-SRC_DIR="$(cd "$SCRIPT_DIR/../.."; pwd -P)"
+SRC_DIR="$(
+  cd "$SCRIPT_DIR/../.."
+  pwd -P
+)"
 FLUTTER_DIR="$SRC_DIR/flutter"
 DART_BIN="$SRC_DIR/out/host_debug_unopt/dart-sdk/bin"
 DART="$DART_BIN/dart"
@@ -58,15 +61,26 @@ echo ""
 
 # Check that dart libraries conform.
 echo "Checking the integrity of the Web SDK"
-(cd "$FLUTTER_DIR/web_sdk"; "$DART" pub get)
-(cd "$FLUTTER_DIR/web_sdk/web_test_utils"; "$DART" pub get)
-(cd "$FLUTTER_DIR/web_sdk/web_engine_tester"; "$DART" pub get)
+(
+  cd "$FLUTTER_DIR/web_sdk"
+  "$DART" pub get
+)
+(
+  cd "$FLUTTER_DIR/web_sdk/web_test_utils"
+  "$DART" pub get
+)
+(
+  cd "$FLUTTER_DIR/web_sdk/web_engine_tester"
+  "$DART" pub get
+)
 
 "$DART" analyze --fatal-infos --fatal-warnings "$FLUTTER_DIR/web_sdk"
 
 WEB_SDK_TEST_FILES="$FLUTTER_DIR/web_sdk/test/*"
-for testFile in $WEB_SDK_TEST_FILES
-do
+for testFile in $WEB_SDK_TEST_FILES; do
   echo "Running $testFile"
-  (cd "$FLUTTER_DIR"; FLUTTER_DIR="$FLUTTER_DIR" "$DART" --enable-asserts $testFile)
+  (
+    cd "$FLUTTER_DIR"
+    FLUTTER_DIR="$FLUTTER_DIR" "$DART" --enable-asserts $testFile
+  )
 done

ci/format.sh

@@ -18,7 +18,7 @@ unset CDPATH
 function follow_links() (
   cd -P "$(dirname -- "$1")"
   file="$PWD/$(basename -- "$1")"
-  while [[ -h "$file" ]]; do
+  while [[ -L "$file" ]]; do
     cd -P "$(dirname -- "$file")"
     file="$(readlink -- "$file")"
     cd -P "$(dirname -- "$file")"
@@ -28,10 +28,27 @@ function follow_links() (
 )
 
 SCRIPT_DIR=$(follow_links "$(dirname -- "${BASH_SOURCE[0]}")")
-SRC_DIR="$(cd "$SCRIPT_DIR/../.."; pwd -P)"
+SRC_DIR="$(
+  cd "$SCRIPT_DIR/../.."
+  pwd -P
+)"
 DART_SDK_DIR="${SRC_DIR}/third_party/dart/tools/sdks/dart-sdk"
 DART="${DART_SDK_DIR}/bin/dart"
 
+# Check if a file named **/GeneratedPluginRegistrant.java exists in the project.
+# If it does, fail the build and print a message to the user pointing them to
+# the file and instructing them to remove it.
+#
+# See: https://github.com/flutter/flutter/issues/143782.
+GENERATED_PLUGIN_REGISTRANT_PATH=$(find "$SRC_DIR/flutter" -name "GeneratedPluginRegistrant.java")
+if [[ -n "$GENERATED_PLUGIN_REGISTRANT_PATH" ]]; then
+  echo "GeneratedPluginRegistrant.java found in the project."
+  echo "This file is generated by Flutter tooling and should not be checked in."
+  echo "Please remove it from the project and try again."
+  echo "Path: $GENERATED_PLUGIN_REGISTRANT_PATH"
+  exit 1
+fi
+
 cd "$SCRIPT_DIR"
 "$DART" \
   --disable-dart-dev \

ci/test/format_no_generated_java_test.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+#
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+set -e
+
+# Needed because if it is set, cd may print the path it changed to.
+unset CDPATH
+
+# On Mac OS, readlink -f doesn't work, so follow_links traverses the path one
+# link at a time, and then cds into the link destination and find out where it
+# ends up.
+#
+# The function is enclosed in a subshell to avoid changing the working directory
+# of the caller.
+function follow_links() (
+  cd -P "$(dirname -- "$1")"
+  file="$PWD/$(basename -- "$1")"
+  while [[ -L "$file" ]]; do
+    cd -P "$(dirname -- "$file")"
+    file="$(readlink -- "$file")"
+    cd -P "$(dirname -- "$file")"
+    file="$PWD/$(basename -- "$file")"
+  done
+  echo "$file"
+)
+
+SCRIPT_DIR=$(follow_links "$(dirname -- "${BASH_SOURCE[0]}")")
+SRC_DIR="$(
+  cd "$SCRIPT_DIR/../../.."
+  pwd -P
+)"
+FLUTTER_DIR="$SRC_DIR/flutter"
+
+# Creates a file named `GeneratedPluginRegistrant.java` in the project.
+# This file is generated by Flutter tooling and should not be checked in.
+touch "$FLUTTER_DIR/GeneratedPluginRegistrant.java"
+
+# Create a trap that, on exit, removes the file.
+function cleanup() {
+  rm -f "$FLUTTER_DIR/GeneratedPluginRegistrant.java"
+}
+trap cleanup EXIT
+
+# Runs ../format.sh and verifies that it fails with the expected error message.
+# If it fails, the script prints an error message and exits with a non-zero status.
+"$FLUTTER_DIR/ci/format.sh" || {
+  echo "PASS: analyze.sh failed as expected"
+  exit 0
+}
+
+echo "FAIL: format.sh did not fail as expected"
+exit 1

shell/platform/android/test/io/flutter/embedding/android/FlutterActivityTest.java

@@ -38,7 +38,7 @@
 import io.flutter.embedding.engine.plugins.activity.ActivityAware;
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding.OnSaveInstanceStateListener;
-import io.flutter.plugins.GeneratedPluginRegistrant;
+import io.flutter.plugins.FakeGeneratedPluginRegistrant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -59,7 +59,7 @@ public class FlutterActivityTest {
   @Before
   public void setUp() {
     FlutterInjector.reset();
-    GeneratedPluginRegistrant.clearRegisteredEngines();
+    FakeGeneratedPluginRegistrant.clearRegisteredEngines();
     FlutterJNI mockFlutterJNI = mock(FlutterJNI.class);
     when(mockFlutterJNI.isAttached()).thenReturn(true);
     FlutterJNI.Factory mockFlutterJNIFactory = mock(FlutterJNI.Factory.class);
@@ -70,7 +70,7 @@ public void setUp() {
 
   @After
   public void tearDown() {
-    GeneratedPluginRegistrant.clearRegisteredEngines();
+    FakeGeneratedPluginRegistrant.clearRegisteredEngines();
     FlutterInjector.reset();
   }
 
@@ -310,7 +310,7 @@ public void itRegistersPluginsAtConfigurationTime() {
     // configureFlutterEngine which registers the plugins.
     activity.onCreate(null);
 
-    List<FlutterEngine> registeredEngines = GeneratedPluginRegistrant.getRegisteredEngines();
+    List<FlutterEngine> registeredEngines = FakeGeneratedPluginRegistrant.getRegisteredEngines();
     assertEquals(1, registeredEngines.size());
     assertEquals(activity.getFlutterEngine(), registeredEngines.get(0));
   }
@@ -423,7 +423,7 @@ public void itDoesNotRegisterPluginsTwiceWhenUsingACachedEngine() {
     FlutterActivityWithProvidedEngine flutterActivity = activityController.get();
     flutterActivity.configureFlutterEngine(flutterActivity.getFlutterEngine());
 
-    List<FlutterEngine> registeredEngines = GeneratedPluginRegistrant.getRegisteredEngines();
+    List<FlutterEngine> registeredEngines = FakeGeneratedPluginRegistrant.getRegisteredEngines();
     // This might cause the plugins to be registered twice, once by the FlutterEngine constructor,
     // and once by the default FlutterActivity.configureFlutterEngine implementation.
     // Test that it doesn't happen.

shell/platform/android/test/io/flutter/embedding/android/FlutterFragmentActivityTest.java

@@ -26,7 +26,7 @@
 import io.flutter.embedding.engine.FlutterEngine;
 import io.flutter.embedding.engine.FlutterJNI;
 import io.flutter.embedding.engine.loader.FlutterLoader;
-import io.flutter.plugins.GeneratedPluginRegistrant;
+import io.flutter.plugins.FakeGeneratedPluginRegistrant;
 import java.util.List;
 import org.junit.After;
 import org.junit.Before;
@@ -43,7 +43,7 @@ public class FlutterFragmentActivityTest {
   @Before
   public void setUp() {
     FlutterInjector.reset();
-    GeneratedPluginRegistrant.clearRegisteredEngines();
+    FakeGeneratedPluginRegistrant.clearRegisteredEngines();
     FlutterJNI mockFlutterJNI = mock(FlutterJNI.class);
     when(mockFlutterJNI.isAttached()).thenReturn(true);
     FlutterJNI.Factory mockFlutterJNIFactory = mock(FlutterJNI.Factory.class);
@@ -54,7 +54,7 @@ public void setUp() {
 
   @After
   public void tearDown() {
-    GeneratedPluginRegistrant.clearRegisteredEngines();
+    FakeGeneratedPluginRegistrant.clearRegisteredEngines();
     FlutterInjector.reset();
   }
 
@@ -117,7 +117,7 @@ public void itRegistersPluginsAtConfigurationTime() {
       scenario.onActivity(
           activity -> {
             List<FlutterEngine> registeredEngines =
-                GeneratedPluginRegistrant.getRegisteredEngines();
+                FakeGeneratedPluginRegistrant.getRegisteredEngines();
             assertEquals(1, registeredEngines.size());
             assertEquals(activity.getFlutterEngine(), registeredEngines.get(0));
           });
@@ -131,13 +131,13 @@ public void itDoesNotRegisterPluginsTwiceWhenUsingACachedEngine() {
       scenario.onActivity(
           activity -> {
             List<FlutterEngine> registeredEngines =
-                GeneratedPluginRegistrant.getRegisteredEngines();
+                FakeGeneratedPluginRegistrant.getRegisteredEngines();
             assertEquals(1, registeredEngines.size());
             assertEquals(activity.getFlutterEngine(), registeredEngines.get(0));
           });
     }
 
-    List<FlutterEngine> registeredEngines = GeneratedPluginRegistrant.getRegisteredEngines();
+    List<FlutterEngine> registeredEngines = FakeGeneratedPluginRegistrant.getRegisteredEngines();
     // This might cause the plugins to be registered twice, once by the FlutterEngine constructor,
     // and once by the default FlutterFragmentActivity.configureFlutterEngine implementation.
     // Test that it doesn't happen.
@@ -149,7 +149,7 @@ public void itReturnsValueFromMetaDataWhenCallsShouldHandleDeepLinkingCase1()
       throws PackageManager.NameNotFoundException {
     FlutterFragmentActivity activity =
         Robolectric.buildActivity(FlutterFragmentActivityWithProvidedEngine.class).get();
-    assertTrue(GeneratedPluginRegistrant.getRegisteredEngines().isEmpty());
+    assertTrue(FakeGeneratedPluginRegistrant.getRegisteredEngines().isEmpty());
     Bundle bundle = new Bundle();
     bundle.putBoolean(HANDLE_DEEPLINKING_META_DATA_KEY, true);
     FlutterFragmentActivity spyFlutterActivity = spy(activity);
@@ -175,7 +175,7 @@ public void itReturnsValueFromMetaDataWhenCallsShouldHandleDeepLinkingCase3()
       throws PackageManager.NameNotFoundException {
     FlutterFragmentActivity activity =
         Robolectric.buildActivity(FlutterFragmentActivityWithProvidedEngine.class).get();
-    assertTrue(GeneratedPluginRegistrant.getRegisteredEngines().isEmpty());
+    assertTrue(FakeGeneratedPluginRegistrant.getRegisteredEngines().isEmpty());
     // Creates an empty bundle.
     Bundle bundle = new Bundle();
     FlutterFragmentActivity spyFlutterActivity = spy(activity);

shell/platform/android/test/io/flutter/embedding/engine/FlutterEngineGroupComponentTest.java

@@ -27,7 +27,7 @@
 import io.flutter.embedding.engine.loader.FlutterLoader;
 import io.flutter.embedding.engine.systemchannels.NavigationChannel;
 import io.flutter.plugin.platform.PlatformViewsController;
-import io.flutter.plugins.GeneratedPluginRegistrant;
+import io.flutter.plugins.FakeGeneratedPluginRegistrant;
 import java.util.ArrayList;
 import java.util.List;
 import org.junit.After;
@@ -58,7 +58,7 @@ public void setUp() {
     jniAttached = false;
     when(mockFlutterJNI.isAttached()).thenAnswer(invocation -> jniAttached);
     doAnswer(invocation -> jniAttached = true).when(mockFlutterJNI).attachToNative();
-    GeneratedPluginRegistrant.clearRegisteredEngines();
+    FakeGeneratedPluginRegistrant.clearRegisteredEngines();
 
     when(mockFlutterLoader.findAppBundlePath()).thenReturn("some/path/to/flutter_assets");
 
@@ -103,7 +103,7 @@ FlutterEngine createEngine(
 
   @After
   public void tearDown() {
-    GeneratedPluginRegistrant.clearRegisteredEngines();
+    FakeGeneratedPluginRegistrant.clearRegisteredEngines();
     engineGroupUnderTest = null;
     firstEngineUnderTest = null;
   }
@@ -281,7 +281,7 @@ public void createEngineSupportMoreParams() {
     when(FlutterInjector.instance().flutterLoader().automaticallyRegisterPlugins())
         .thenReturn(true);
     assertTrue(FlutterInjector.instance().flutterLoader().automaticallyRegisterPlugins());
-    assertEquals(0, GeneratedPluginRegistrant.getRegisteredEngines().size());
+    assertEquals(0, FakeGeneratedPluginRegistrant.getRegisteredEngines().size());
 
     FlutterEngine firstEngine =
         engineGroup.createAndRunEngine(
@@ -291,7 +291,7 @@ public void createEngineSupportMoreParams() {
                 .setWaitForRestorationData(waitForRestorationData)
                 .setAutomaticallyRegisterPlugins(automaticallyRegisterPlugins));
 
-    assertEquals(1, GeneratedPluginRegistrant.getRegisteredEngines().size());
+    assertEquals(1, FakeGeneratedPluginRegistrant.getRegisteredEngines().size());
     assertEquals(controller, firstEngine.getPlatformViewsController());
     assertEquals(
         waitForRestorationData, firstEngine.getRestorationChannel().waitForRestorationData);
@@ -331,7 +331,7 @@ public void spawnEngineSupportMoreParams() {
     when(FlutterInjector.instance().flutterLoader().automaticallyRegisterPlugins())
         .thenReturn(true);
     assertTrue(FlutterInjector.instance().flutterLoader().automaticallyRegisterPlugins());
-    assertEquals(0, GeneratedPluginRegistrant.getRegisteredEngines().size());
+    assertEquals(0, FakeGeneratedPluginRegistrant.getRegisteredEngines().size());
 
     FlutterEngine secondEngine =
         engineGroupUnderTest.createAndRunEngine(
@@ -344,6 +344,6 @@ public void spawnEngineSupportMoreParams() {
     assertEquals(
         waitForRestorationData, secondEngine.getRestorationChannel().waitForRestorationData);
     assertEquals(controller, secondEngine.getPlatformViewsController());
-    assertEquals(0, GeneratedPluginRegistrant.getRegisteredEngines().size());
+    assertEquals(0, FakeGeneratedPluginRegistrant.getRegisteredEngines().size());
   }
 }