From f8544df0eaf77e65a13c5d6490038bdf030e7feb Mon Sep 17 00:00:00 2001 From: "auto-submit[bot]" <98614782+auto-submit[bot]@users.noreply.github.com> Date: Thu, 25 Jan 2024 22:10:17 +0000 Subject: [PATCH] Reverts "Rename `integration_tests/external_ui` but do not touch anything else..." (#142265) Reverts flutter/flutter#142238 Initiated by: eliasyishak This change reverts the following previous change: Original Description: Part of https://github.com/flutter/flutter/issues/142178. --- dev/devicelab/lib/tasks/integration_tests.dart | 2 +- .../{external_textures => external_ui}/README.md | 0 .../android/app/build.gradle | 0 .../android/app/src/main/AndroidManifest.xml | 2 +- .../app/src/main/java/io/flutter/externalui/MainActivity.java | 0 .../{external_textures => external_ui}/android/build.gradle | 0 .../android/buildscript-gradle.lockfile | 0 .../android/gradle.properties | 0 .../android/gradle/wrapper/gradle-wrapper.properties | 0 .../android/project-app.lockfile | 0 .../android/settings.gradle | 0 .../ios/Flutter/AppFrameworkInfo.plist | 0 .../ios/Flutter/Debug.xcconfig | 0 .../ios/Flutter/Release.xcconfig | 0 .../ios/Runner.xcodeproj/project.pbxproj | 0 .../project.xcworkspace/contents.xcworkspacedata | 0 .../project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist | 0 .../Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme | 0 .../ios/Runner.xcworkspace/contents.xcworkspacedata | 0 .../ios/Runner/AppDelegate.h | 0 .../ios/Runner/AppDelegate.m | 0 .../ios/Runner/Base.lproj/LaunchScreen.storyboard | 0 .../ios/Runner/Base.lproj/Main.storyboard | 0 .../{external_textures => external_ui}/ios/Runner/Info.plist | 0 .../{external_textures => external_ui}/ios/Runner/main.m | 0 .../lib/frame_rate_main.dart | 0 .../{external_textures => external_ui}/pubspec.yaml | 4 ++-- .../test_driver/frame_rate_main_test.dart | 0 28 files changed, 4 insertions(+), 4 deletions(-) rename dev/integration_tests/{external_textures => external_ui}/README.md (100%) rename dev/integration_tests/{external_textures => external_ui}/android/app/build.gradle (100%) rename dev/integration_tests/{external_textures => external_ui}/android/app/src/main/AndroidManifest.xml (97%) rename dev/integration_tests/{external_textures => external_ui}/android/app/src/main/java/io/flutter/externalui/MainActivity.java (100%) rename dev/integration_tests/{external_textures => external_ui}/android/build.gradle (100%) rename dev/integration_tests/{external_textures => external_ui}/android/buildscript-gradle.lockfile (100%) rename dev/integration_tests/{external_textures => external_ui}/android/gradle.properties (100%) rename dev/integration_tests/{external_textures => external_ui}/android/gradle/wrapper/gradle-wrapper.properties (100%) rename dev/integration_tests/{external_textures => external_ui}/android/project-app.lockfile (100%) rename dev/integration_tests/{external_textures => external_ui}/android/settings.gradle (100%) rename dev/integration_tests/{external_textures => external_ui}/ios/Flutter/AppFrameworkInfo.plist (100%) rename dev/integration_tests/{external_textures => external_ui}/ios/Flutter/Debug.xcconfig (100%) rename dev/integration_tests/{external_textures => external_ui}/ios/Flutter/Release.xcconfig (100%) rename dev/integration_tests/{external_textures => external_ui}/ios/Runner.xcodeproj/project.pbxproj (100%) rename dev/integration_tests/{external_textures => external_ui}/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename dev/integration_tests/{external_textures => external_ui}/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename dev/integration_tests/{external_textures => external_ui}/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme (100%) rename dev/integration_tests/{external_textures => external_ui}/ios/Runner.xcworkspace/contents.xcworkspacedata (100%) rename dev/integration_tests/{external_textures => external_ui}/ios/Runner/AppDelegate.h (100%) rename dev/integration_tests/{external_textures => external_ui}/ios/Runner/AppDelegate.m (100%) rename dev/integration_tests/{external_textures => external_ui}/ios/Runner/Base.lproj/LaunchScreen.storyboard (100%) rename dev/integration_tests/{external_textures => external_ui}/ios/Runner/Base.lproj/Main.storyboard (100%) rename dev/integration_tests/{external_textures => external_ui}/ios/Runner/Info.plist (100%) rename dev/integration_tests/{external_textures => external_ui}/ios/Runner/main.m (100%) rename dev/integration_tests/{external_textures => external_ui}/lib/frame_rate_main.dart (100%) rename dev/integration_tests/{external_textures => external_ui}/pubspec.yaml (98%) rename dev/integration_tests/{external_textures => external_ui}/test_driver/frame_rate_main_test.dart (100%) diff --git a/dev/devicelab/lib/tasks/integration_tests.dart b/dev/devicelab/lib/tasks/integration_tests.dart index 70177e16451..84579a53374 100644 --- a/dev/devicelab/lib/tasks/integration_tests.dart +++ b/dev/devicelab/lib/tasks/integration_tests.dart @@ -42,7 +42,7 @@ TaskFunction createIntegrationTestFlavorsTest({Map? environment} TaskFunction createExternalUiFrameRateIntegrationTest() { return DriverTest( - '${flutterDirectory.path}/dev/integration_tests/external_textures', + '${flutterDirectory.path}/dev/integration_tests/external_ui', 'lib/frame_rate_main.dart', ).call; } diff --git a/dev/integration_tests/external_textures/README.md b/dev/integration_tests/external_ui/README.md similarity index 100% rename from dev/integration_tests/external_textures/README.md rename to dev/integration_tests/external_ui/README.md diff --git a/dev/integration_tests/external_textures/android/app/build.gradle b/dev/integration_tests/external_ui/android/app/build.gradle similarity index 100% rename from dev/integration_tests/external_textures/android/app/build.gradle rename to dev/integration_tests/external_ui/android/app/build.gradle diff --git a/dev/integration_tests/external_textures/android/app/src/main/AndroidManifest.xml b/dev/integration_tests/external_ui/android/app/src/main/AndroidManifest.xml similarity index 97% rename from dev/integration_tests/external_textures/android/app/src/main/AndroidManifest.xml rename to dev/integration_tests/external_ui/android/app/src/main/AndroidManifest.xml index b8198efc1c9..505106a5c3b 100644 --- a/dev/integration_tests/external_textures/android/app/src/main/AndroidManifest.xml +++ b/dev/integration_tests/external_ui/android/app/src/main/AndroidManifest.xml @@ -9,7 +9,7 @@ found in the LICENSE file. --> + android:label="external_ui"> =3.2.0-0 <4.0.0' diff --git a/dev/integration_tests/external_textures/test_driver/frame_rate_main_test.dart b/dev/integration_tests/external_ui/test_driver/frame_rate_main_test.dart similarity index 100% rename from dev/integration_tests/external_textures/test_driver/frame_rate_main_test.dart rename to dev/integration_tests/external_ui/test_driver/frame_rate_main_test.dart