From 145d70c1971bb50c545dc8f2eb2998470228ca4b Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Tue, 2 Jun 2020 11:00:19 -0700 Subject: [PATCH] Rename integration test ios_app_with_watch_companion -> ios_app_with_extensions (#58458) --- ...dart => ios_app_with_extensions_test.dart} | 6 ++--- dev/devicelab/manifest.yaml | 4 ++-- .../.gitignore | 0 .../.metadata | 0 .../ios_app_with_extensions/README.md | 5 +++++ .../ios/.gitignore | 0 .../ios/Flutter/AppFrameworkInfo.plist | 0 .../ios/Flutter/Debug.xcconfig | 0 .../ios/Flutter/Release.xcconfig | 0 .../ios/Runner.xcodeproj/project.pbxproj | 21 ++++++++---------- .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../xcshareddata/WorkspaceSettings.xcsettings | 0 .../xcshareddata/xcschemes/Runner.xcscheme | 0 .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../xcshareddata/WorkspaceSettings.xcsettings | 0 .../ios/Runner/AppDelegate.swift | 0 .../AppIcon.appiconset/Contents.json | 0 .../Icon-App-1024x1024@1x.png | Bin .../AppIcon.appiconset/Icon-App-20x20@1x.png | Bin .../AppIcon.appiconset/Icon-App-20x20@2x.png | Bin .../AppIcon.appiconset/Icon-App-20x20@3x.png | Bin .../AppIcon.appiconset/Icon-App-29x29@1x.png | Bin .../AppIcon.appiconset/Icon-App-29x29@2x.png | Bin .../AppIcon.appiconset/Icon-App-29x29@3x.png | Bin .../AppIcon.appiconset/Icon-App-40x40@1x.png | Bin .../AppIcon.appiconset/Icon-App-40x40@2x.png | Bin .../AppIcon.appiconset/Icon-App-40x40@3x.png | Bin .../AppIcon.appiconset/Icon-App-60x60@2x.png | Bin .../AppIcon.appiconset/Icon-App-60x60@3x.png | Bin .../AppIcon.appiconset/Icon-App-76x76@1x.png | Bin .../AppIcon.appiconset/Icon-App-76x76@2x.png | Bin .../Icon-App-83.5x83.5@2x.png | Bin .../LaunchImage.imageset/Contents.json | 0 .../LaunchImage.imageset/LaunchImage.png | Bin .../LaunchImage.imageset/LaunchImage@2x.png | Bin .../LaunchImage.imageset/LaunchImage@3x.png | Bin .../LaunchImage.imageset/README.md | 0 .../Runner/Base.lproj/LaunchScreen.storyboard | 0 .../ios/Runner/Base.lproj/Main.storyboard | 0 .../ios/Runner/Info.plist | 2 +- .../ios/Runner/Runner-Bridging-Header.h | 0 .../Circular.imageset/Contents.json | 0 .../Contents.json | 0 .../Extra Large.imageset/Contents.json | 0 .../Graphic Bezel.imageset/Contents.json | 0 .../Graphic Circular.imageset/Contents.json | 0 .../Graphic Corner.imageset/Contents.json | 0 .../Contents.json | 0 .../Modular.imageset/Contents.json | 0 .../Utilitarian.imageset/Contents.json | 0 .../Assets.xcassets/Contents.json | 0 .../ios/watch Extension/ContentView.swift | 0 .../watch Extension/ExtensionDelegate.swift | 0 .../watch Extension/HostingController.swift | 0 .../ios/watch Extension/Info.plist | 2 +- .../Preview Assets.xcassets/Contents.json | 0 .../AppIcon.appiconset/Contents.json | 0 .../ios/watch/Assets.xcassets/Contents.json | 0 .../ios/watch/Base.lproj/Interface.storyboard | 0 .../ios/watch/Info.plist | 4 ++-- .../lib/main.dart | 0 .../pubspec.yaml | 3 +-- .../ios_app_with_watch_companion/README.md | 16 ------------- 65 files changed, 24 insertions(+), 39 deletions(-) rename dev/devicelab/bin/tasks/{ios_app_with_watch_companion.dart => ios_app_with_extensions_test.dart} (97%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/.gitignore (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/.metadata (100%) create mode 100644 dev/integration_tests/ios_app_with_extensions/README.md rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/.gitignore (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Flutter/AppFrameworkInfo.plist (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Flutter/Debug.xcconfig (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Flutter/Release.xcconfig (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner.xcodeproj/project.pbxproj (97%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner.xcworkspace/contents.xcworkspacedata (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner/AppDelegate.swift (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner/Base.lproj/LaunchScreen.storyboard (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner/Base.lproj/Main.storyboard (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner/Info.plist (97%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/Runner/Runner-Bridging-Header.h (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/watch Extension/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/watch Extension/Assets.xcassets/Complication.complicationset/Contents.json (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/watch Extension/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/watch Extension/Assets.xcassets/Complication.complicationset/Graphic Bezel.imageset/Contents.json (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/watch Extension/Assets.xcassets/Complication.complicationset/Graphic Circular.imageset/Contents.json (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/watch Extension/Assets.xcassets/Complication.complicationset/Graphic Corner.imageset/Contents.json (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/watch Extension/Assets.xcassets/Complication.complicationset/Graphic Large Rectangular.imageset/Contents.json (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/watch Extension/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/watch Extension/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/watch Extension/Assets.xcassets/Contents.json (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/watch Extension/ContentView.swift (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/watch Extension/ExtensionDelegate.swift (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/watch Extension/HostingController.swift (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/watch Extension/Info.plist (94%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/watch Extension/Preview Content/Preview Assets.xcassets/Contents.json (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/watch/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/watch/Assets.xcassets/Contents.json (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/watch/Base.lproj/Interface.storyboard (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/ios/watch/Info.plist (92%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/lib/main.dart (100%) rename dev/integration_tests/{ios_app_with_watch_companion => ios_app_with_extensions}/pubspec.yaml (98%) delete mode 100644 dev/integration_tests/ios_app_with_watch_companion/README.md diff --git a/dev/devicelab/bin/tasks/ios_app_with_watch_companion.dart b/dev/devicelab/bin/tasks/ios_app_with_extensions_test.dart similarity index 97% rename from dev/devicelab/bin/tasks/ios_app_with_watch_companion.dart rename to dev/devicelab/bin/tasks/ios_app_with_extensions_test.dart index 82cf8fa2eb..4349a18f3b 100644 --- a/dev/devicelab/bin/tasks/ios_app_with_watch_companion.dart +++ b/dev/devicelab/bin/tasks/ios_app_with_extensions_test.dart @@ -17,14 +17,14 @@ Future main() async { String watchDeviceID; String phoneDeviceID; final Directory tempDir = Directory.systemTemp - .createTempSync('ios_app_with_watch_companion_test'); + .createTempSync('ios_app_with_extensions_test'); final Directory projectDir = - Directory(path.join(tempDir.path, 'app_with_companion')); + Directory(path.join(tempDir.path, 'app_with_extensions')); try { mkdir(projectDir); recursiveCopy( Directory(path.join(flutterDirectory.path, 'dev', 'integration_tests', - 'ios_app_with_watch_companion')), + 'ios_app_with_extensions')), projectDir, ); diff --git a/dev/devicelab/manifest.yaml b/dev/devicelab/manifest.yaml index 49c9fdbc79..0711a661af 100644 --- a/dev/devicelab/manifest.yaml +++ b/dev/devicelab/manifest.yaml @@ -683,9 +683,9 @@ tasks: # required_agent_capabilities: ["mac/ios"] # flaky: true - ios_app_with_watch_companion: + ios_app_with_extensions_test: description: > - Checks that an iOS app with a watchOS companion can be build for physical and simulated devices. + Checks that an iOS app with extensions can be built for physical and simulated devices. stage: devicelab_ios required_agent_capabilities: ["mac/ios"] diff --git a/dev/integration_tests/ios_app_with_watch_companion/.gitignore b/dev/integration_tests/ios_app_with_extensions/.gitignore similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/.gitignore rename to dev/integration_tests/ios_app_with_extensions/.gitignore diff --git a/dev/integration_tests/ios_app_with_watch_companion/.metadata b/dev/integration_tests/ios_app_with_extensions/.metadata similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/.metadata rename to dev/integration_tests/ios_app_with_extensions/.metadata diff --git a/dev/integration_tests/ios_app_with_extensions/README.md b/dev/integration_tests/ios_app_with_extensions/README.md new file mode 100644 index 0000000000..b7eb35445e --- /dev/null +++ b/dev/integration_tests/ios_app_with_extensions/README.md @@ -0,0 +1,5 @@ +# iOS Extensions Test + +Integration test to test building an iOS app with +non-Flutter features: +- watchOS app and extension diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/.gitignore b/dev/integration_tests/ios_app_with_extensions/ios/.gitignore similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/.gitignore rename to dev/integration_tests/ios_app_with_extensions/ios/.gitignore diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Flutter/AppFrameworkInfo.plist b/dev/integration_tests/ios_app_with_extensions/ios/Flutter/AppFrameworkInfo.plist similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Flutter/AppFrameworkInfo.plist rename to dev/integration_tests/ios_app_with_extensions/ios/Flutter/AppFrameworkInfo.plist diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Flutter/Debug.xcconfig b/dev/integration_tests/ios_app_with_extensions/ios/Flutter/Debug.xcconfig similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Flutter/Debug.xcconfig rename to dev/integration_tests/ios_app_with_extensions/ios/Flutter/Debug.xcconfig diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Flutter/Release.xcconfig b/dev/integration_tests/ios_app_with_extensions/ios/Flutter/Release.xcconfig similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Flutter/Release.xcconfig rename to dev/integration_tests/ios_app_with_extensions/ios/Flutter/Release.xcconfig diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner.xcodeproj/project.pbxproj b/dev/integration_tests/ios_app_with_extensions/ios/Runner.xcodeproj/project.pbxproj similarity index 97% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner.xcodeproj/project.pbxproj rename to dev/integration_tests/ios_app_with_extensions/ios/Runner.xcodeproj/project.pbxproj index 256dc2d95c..2e18f9e802 100644 --- a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner.xcodeproj/project.pbxproj +++ b/dev/integration_tests/ios_app_with_extensions/ios/Runner.xcodeproj/project.pbxproj @@ -436,7 +436,6 @@ /* Begin XCBuildConfiguration section */ 249021D3217E4FDB00AE95B9 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -506,7 +505,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.watchCompanionTest; + PRODUCT_BUNDLE_IDENTIFIER = io.flutter.extensionTest; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -536,7 +535,7 @@ MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_LDFLAGS = ""; - PRODUCT_BUNDLE_IDENTIFIER = com.example.watchCompanionTest.watchkitapp.watchkitextension; + PRODUCT_BUNDLE_IDENTIFIER = io.flutter.extensionTest.watchkitapp.watchkitextension; PRODUCT_NAME = "${TARGET_NAME}"; SDKROOT = watchos; SKIP_INSTALL = YES; @@ -569,7 +568,7 @@ ); MTL_FAST_MATH = YES; OTHER_LDFLAGS = ""; - PRODUCT_BUNDLE_IDENTIFIER = com.example.watchCompanionTest.watchkitapp.watchkitextension; + PRODUCT_BUNDLE_IDENTIFIER = io.flutter.extensionTest.watchkitapp.watchkitextension; PRODUCT_NAME = "${TARGET_NAME}"; SDKROOT = watchos; SKIP_INSTALL = YES; @@ -601,7 +600,7 @@ ); MTL_FAST_MATH = YES; OTHER_LDFLAGS = ""; - PRODUCT_BUNDLE_IDENTIFIER = com.example.watchCompanionTest.watchkitapp.watchkitextension; + PRODUCT_BUNDLE_IDENTIFIER = io.flutter.extensionTest.watchkitapp.watchkitextension; PRODUCT_NAME = "${TARGET_NAME}"; SDKROOT = watchos; SKIP_INSTALL = YES; @@ -630,7 +629,7 @@ MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_LDFLAGS = ""; - PRODUCT_BUNDLE_IDENTIFIER = com.example.watchCompanionTest.watchkitapp; + PRODUCT_BUNDLE_IDENTIFIER = io.flutter.extensionTest.watchkitapp; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = watchos; SKIP_INSTALL = YES; @@ -659,7 +658,7 @@ MARKETING_VERSION = 1.0.0; MTL_FAST_MATH = YES; OTHER_LDFLAGS = ""; - PRODUCT_BUNDLE_IDENTIFIER = com.example.watchCompanionTest.watchkitapp; + PRODUCT_BUNDLE_IDENTIFIER = io.flutter.extensionTest.watchkitapp; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = watchos; SKIP_INSTALL = YES; @@ -687,7 +686,7 @@ MARKETING_VERSION = 1.0.0; MTL_FAST_MATH = YES; OTHER_LDFLAGS = ""; - PRODUCT_BUNDLE_IDENTIFIER = com.example.watchCompanionTest.watchkitapp; + PRODUCT_BUNDLE_IDENTIFIER = io.flutter.extensionTest.watchkitapp; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = watchos; SKIP_INSTALL = YES; @@ -700,7 +699,6 @@ }; 97C147031CF9000F007C117D /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -756,7 +754,6 @@ }; 97C147041CF9000F007C117D /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -828,7 +825,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.watchCompanionTest; + PRODUCT_BUNDLE_IDENTIFIER = io.flutter.extensionTest; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -858,7 +855,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.watchCompanionTest; + PRODUCT_BUNDLE_IDENTIFIER = io.flutter.extensionTest; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/dev/integration_tests/ios_app_with_extensions/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to dev/integration_tests/ios_app_with_extensions/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/dev/integration_tests/ios_app_with_extensions/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to dev/integration_tests/ios_app_with_extensions/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/dev/integration_tests/ios_app_with_extensions/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to dev/integration_tests/ios_app_with_extensions/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/dev/integration_tests/ios_app_with_extensions/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme rename to dev/integration_tests/ios_app_with_extensions/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner.xcworkspace/contents.xcworkspacedata b/dev/integration_tests/ios_app_with_extensions/ios/Runner.xcworkspace/contents.xcworkspacedata similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner.xcworkspace/contents.xcworkspacedata rename to dev/integration_tests/ios_app_with_extensions/ios/Runner.xcworkspace/contents.xcworkspacedata diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/dev/integration_tests/ios_app_with_extensions/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to dev/integration_tests/ios_app_with_extensions/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/dev/integration_tests/ios_app_with_extensions/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to dev/integration_tests/ios_app_with_extensions/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner/AppDelegate.swift b/dev/integration_tests/ios_app_with_extensions/ios/Runner/AppDelegate.swift similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner/AppDelegate.swift rename to dev/integration_tests/ios_app_with_extensions/ios/Runner/AppDelegate.swift diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json rename to dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png rename to dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png rename to dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png rename to dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png rename to dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png rename to dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png rename to dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png rename to dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png rename to dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png rename to dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png rename to dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png rename to dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png rename to dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png rename to dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png rename to dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png rename to dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json rename to dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png rename to dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png rename to dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png rename to dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md rename to dev/integration_tests/ios_app_with_extensions/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Base.lproj/LaunchScreen.storyboard b/dev/integration_tests/ios_app_with_extensions/ios/Runner/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Base.lproj/LaunchScreen.storyboard rename to dev/integration_tests/ios_app_with_extensions/ios/Runner/Base.lproj/LaunchScreen.storyboard diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Base.lproj/Main.storyboard b/dev/integration_tests/ios_app_with_extensions/ios/Runner/Base.lproj/Main.storyboard similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Base.lproj/Main.storyboard rename to dev/integration_tests/ios_app_with_extensions/ios/Runner/Base.lproj/Main.storyboard diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Info.plist b/dev/integration_tests/ios_app_with_extensions/ios/Runner/Info.plist similarity index 97% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Info.plist rename to dev/integration_tests/ios_app_with_extensions/ios/Runner/Info.plist index 50f90b6a78..46f097cc5f 100644 --- a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Info.plist +++ b/dev/integration_tests/ios_app_with_extensions/ios/Runner/Info.plist @@ -11,7 +11,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - watchCompanionTest + Flutter Extension Test CFBundlePackageType APPL CFBundleShortVersionString diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Runner-Bridging-Header.h b/dev/integration_tests/ios_app_with_extensions/ios/Runner/Runner-Bridging-Header.h similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/Runner/Runner-Bridging-Header.h rename to dev/integration_tests/ios_app_with_extensions/ios/Runner/Runner-Bridging-Header.h diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json b/dev/integration_tests/ios_app_with_extensions/ios/watch Extension/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json rename to dev/integration_tests/ios_app_with_extensions/ios/watch Extension/Assets.xcassets/Complication.complicationset/Circular.imageset/Contents.json diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/Assets.xcassets/Complication.complicationset/Contents.json b/dev/integration_tests/ios_app_with_extensions/ios/watch Extension/Assets.xcassets/Complication.complicationset/Contents.json similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/Assets.xcassets/Complication.complicationset/Contents.json rename to dev/integration_tests/ios_app_with_extensions/ios/watch Extension/Assets.xcassets/Complication.complicationset/Contents.json diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json b/dev/integration_tests/ios_app_with_extensions/ios/watch Extension/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json rename to dev/integration_tests/ios_app_with_extensions/ios/watch Extension/Assets.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/Assets.xcassets/Complication.complicationset/Graphic Bezel.imageset/Contents.json b/dev/integration_tests/ios_app_with_extensions/ios/watch Extension/Assets.xcassets/Complication.complicationset/Graphic Bezel.imageset/Contents.json similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/Assets.xcassets/Complication.complicationset/Graphic Bezel.imageset/Contents.json rename to dev/integration_tests/ios_app_with_extensions/ios/watch Extension/Assets.xcassets/Complication.complicationset/Graphic Bezel.imageset/Contents.json diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/Assets.xcassets/Complication.complicationset/Graphic Circular.imageset/Contents.json b/dev/integration_tests/ios_app_with_extensions/ios/watch Extension/Assets.xcassets/Complication.complicationset/Graphic Circular.imageset/Contents.json similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/Assets.xcassets/Complication.complicationset/Graphic Circular.imageset/Contents.json rename to dev/integration_tests/ios_app_with_extensions/ios/watch Extension/Assets.xcassets/Complication.complicationset/Graphic Circular.imageset/Contents.json diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/Assets.xcassets/Complication.complicationset/Graphic Corner.imageset/Contents.json b/dev/integration_tests/ios_app_with_extensions/ios/watch Extension/Assets.xcassets/Complication.complicationset/Graphic Corner.imageset/Contents.json similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/Assets.xcassets/Complication.complicationset/Graphic Corner.imageset/Contents.json rename to dev/integration_tests/ios_app_with_extensions/ios/watch Extension/Assets.xcassets/Complication.complicationset/Graphic Corner.imageset/Contents.json diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/Assets.xcassets/Complication.complicationset/Graphic Large Rectangular.imageset/Contents.json b/dev/integration_tests/ios_app_with_extensions/ios/watch Extension/Assets.xcassets/Complication.complicationset/Graphic Large Rectangular.imageset/Contents.json similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/Assets.xcassets/Complication.complicationset/Graphic Large Rectangular.imageset/Contents.json rename to dev/integration_tests/ios_app_with_extensions/ios/watch Extension/Assets.xcassets/Complication.complicationset/Graphic Large Rectangular.imageset/Contents.json diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json b/dev/integration_tests/ios_app_with_extensions/ios/watch Extension/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json rename to dev/integration_tests/ios_app_with_extensions/ios/watch Extension/Assets.xcassets/Complication.complicationset/Modular.imageset/Contents.json diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json b/dev/integration_tests/ios_app_with_extensions/ios/watch Extension/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json rename to dev/integration_tests/ios_app_with_extensions/ios/watch Extension/Assets.xcassets/Complication.complicationset/Utilitarian.imageset/Contents.json diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/Assets.xcassets/Contents.json b/dev/integration_tests/ios_app_with_extensions/ios/watch Extension/Assets.xcassets/Contents.json similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/Assets.xcassets/Contents.json rename to dev/integration_tests/ios_app_with_extensions/ios/watch Extension/Assets.xcassets/Contents.json diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/ContentView.swift b/dev/integration_tests/ios_app_with_extensions/ios/watch Extension/ContentView.swift similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/ContentView.swift rename to dev/integration_tests/ios_app_with_extensions/ios/watch Extension/ContentView.swift diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/ExtensionDelegate.swift b/dev/integration_tests/ios_app_with_extensions/ios/watch Extension/ExtensionDelegate.swift similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/ExtensionDelegate.swift rename to dev/integration_tests/ios_app_with_extensions/ios/watch Extension/ExtensionDelegate.swift diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/HostingController.swift b/dev/integration_tests/ios_app_with_extensions/ios/watch Extension/HostingController.swift similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/HostingController.swift rename to dev/integration_tests/ios_app_with_extensions/ios/watch Extension/HostingController.swift diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/Info.plist b/dev/integration_tests/ios_app_with_extensions/ios/watch Extension/Info.plist similarity index 94% rename from dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/Info.plist rename to dev/integration_tests/ios_app_with_extensions/ios/watch Extension/Info.plist index e3513736ff..3063ec4ba9 100644 --- a/dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/Info.plist +++ b/dev/integration_tests/ios_app_with_extensions/ios/watch Extension/Info.plist @@ -25,7 +25,7 @@ NSExtensionAttributes WKAppBundleIdentifier - com.example.watchCompanionTest.watchkitapp + io.flutter.extensionTest.watchkitapp NSExtensionPointIdentifier com.apple.watchkit diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/Preview Content/Preview Assets.xcassets/Contents.json b/dev/integration_tests/ios_app_with_extensions/ios/watch Extension/Preview Content/Preview Assets.xcassets/Contents.json similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/watch Extension/Preview Content/Preview Assets.xcassets/Contents.json rename to dev/integration_tests/ios_app_with_extensions/ios/watch Extension/Preview Content/Preview Assets.xcassets/Contents.json diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/watch/Assets.xcassets/AppIcon.appiconset/Contents.json b/dev/integration_tests/ios_app_with_extensions/ios/watch/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/watch/Assets.xcassets/AppIcon.appiconset/Contents.json rename to dev/integration_tests/ios_app_with_extensions/ios/watch/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/watch/Assets.xcassets/Contents.json b/dev/integration_tests/ios_app_with_extensions/ios/watch/Assets.xcassets/Contents.json similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/watch/Assets.xcassets/Contents.json rename to dev/integration_tests/ios_app_with_extensions/ios/watch/Assets.xcassets/Contents.json diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/watch/Base.lproj/Interface.storyboard b/dev/integration_tests/ios_app_with_extensions/ios/watch/Base.lproj/Interface.storyboard similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/ios/watch/Base.lproj/Interface.storyboard rename to dev/integration_tests/ios_app_with_extensions/ios/watch/Base.lproj/Interface.storyboard diff --git a/dev/integration_tests/ios_app_with_watch_companion/ios/watch/Info.plist b/dev/integration_tests/ios_app_with_extensions/ios/watch/Info.plist similarity index 92% rename from dev/integration_tests/ios_app_with_watch_companion/ios/watch/Info.plist rename to dev/integration_tests/ios_app_with_extensions/ios/watch/Info.plist index f4f57a8fb8..a1c6ef0c27 100644 --- a/dev/integration_tests/ios_app_with_watch_companion/ios/watch/Info.plist +++ b/dev/integration_tests/ios_app_with_extensions/ios/watch/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - watchCompanionTest + Flutter Extension Test CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -26,7 +26,7 @@ UIInterfaceOrientationPortraitUpsideDown WKCompanionAppBundleIdentifier - com.example.watchCompanionTest + io.flutter.extensionTest WKWatchKitApp diff --git a/dev/integration_tests/ios_app_with_watch_companion/lib/main.dart b/dev/integration_tests/ios_app_with_extensions/lib/main.dart similarity index 100% rename from dev/integration_tests/ios_app_with_watch_companion/lib/main.dart rename to dev/integration_tests/ios_app_with_extensions/lib/main.dart diff --git a/dev/integration_tests/ios_app_with_watch_companion/pubspec.yaml b/dev/integration_tests/ios_app_with_extensions/pubspec.yaml similarity index 98% rename from dev/integration_tests/ios_app_with_watch_companion/pubspec.yaml rename to dev/integration_tests/ios_app_with_extensions/pubspec.yaml index f3a1f08c02..53a7b08d23 100644 --- a/dev/integration_tests/ios_app_with_watch_companion/pubspec.yaml +++ b/dev/integration_tests/ios_app_with_extensions/pubspec.yaml @@ -1,5 +1,4 @@ -name: watchCompanionTest -description: A new Flutter project. +name: ios_app_with_extensions # The following defines the version and build number for your application. # A version number is three numbers separated by dots, like 1.2.43 diff --git a/dev/integration_tests/ios_app_with_watch_companion/README.md b/dev/integration_tests/ios_app_with_watch_companion/README.md deleted file mode 100644 index 0bb356e8c3..0000000000 --- a/dev/integration_tests/ios_app_with_watch_companion/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# watchCompanionTest - -A new Flutter project. - -## Getting Started - -This project is a starting point for a Flutter application. - -A few resources to get you started if this is your first Flutter project: - -- [Lab: Write your first Flutter app](https://flutter.dev/docs/get-started/codelab) -- [Cookbook: Useful Flutter samples](https://flutter.dev/docs/cookbook) - -For help getting started with Flutter, view our -[online documentation](https://flutter.dev/docs), which offers tutorials, -samples, guidance on mobile development, and a full API reference.