From 1e510ff636a598c74206d0b8cc96ea99c82ba77a Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Thu, 9 Jul 2020 15:52:49 -0700 Subject: [PATCH] Turn on add-to-app iOS platform unit tests (#61007) --- .cirrus.yml | 11 - dev/bots/test.dart | 12 - dev/devicelab/bin/tasks/module_test_ios.dart | 83 +-- dev/devicelab/lib/framework/ios.dart | 84 +++ dev/integration_tests/ios_add2app/.gitignore | 69 -- dev/integration_tests/ios_add2app/Podfile | 15 - dev/integration_tests/ios_add2app/README.md | 28 - .../ios_add2app/build_and_test.sh | 26 - .../ios_add2app/flutterapp/.gitignore | 42 -- .../ios_add2app/flutterapp/.metadata | 10 - .../ios_add2app.xcodeproj/project.pbxproj | 654 ------------------ .../xcschemes/ios_add2appTests.xcscheme | 63 -- .../contents.xcworkspacedata | 10 - .../xcshareddata/IDEWorkspaceChecks.plist | 8 - .../ios_add2app/ios_add2app/AppDelegate.h | 13 - .../ios_add2app/ios_add2app/AppDelegate.m | 53 -- .../AppIcon.appiconset/Contents.json | 122 ---- .../Icon-App-1024x1024@1x.png | Bin 10932 -> 0 bytes .../AppIcon.appiconset/Icon-App-20x20@1x.png | Bin 564 -> 0 bytes .../AppIcon.appiconset/Icon-App-20x20@2x.png | Bin 1283 -> 0 bytes .../AppIcon.appiconset/Icon-App-20x20@3x.png | Bin 1588 -> 0 bytes .../AppIcon.appiconset/Icon-App-29x29@1x.png | Bin 1025 -> 0 bytes .../AppIcon.appiconset/Icon-App-29x29@2x.png | Bin 1716 -> 0 bytes .../AppIcon.appiconset/Icon-App-29x29@3x.png | Bin 1920 -> 0 bytes .../AppIcon.appiconset/Icon-App-40x40@1x.png | Bin 1283 -> 0 bytes .../AppIcon.appiconset/Icon-App-40x40@2x.png | Bin 1895 -> 0 bytes .../AppIcon.appiconset/Icon-App-40x40@3x.png | Bin 2665 -> 0 bytes .../AppIcon.appiconset/Icon-App-60x60@2x.png | Bin 2665 -> 0 bytes .../AppIcon.appiconset/Icon-App-60x60@3x.png | Bin 3831 -> 0 bytes .../AppIcon.appiconset/Icon-App-76x76@1x.png | Bin 1888 -> 0 bytes .../AppIcon.appiconset/Icon-App-76x76@2x.png | Bin 3294 -> 0 bytes .../Icon-App-83.5x83.5@2x.png | Bin 3612 -> 0 bytes .../ios_add2app/Assets.xcassets/Contents.json | 6 - .../ios_add2app/ios_add2app/Info.plist | 43 -- .../ios_add2app/Launch Screen.storyboard | 50 -- .../ios_add2app/ios_add2app/main.m | 12 - .../FlutterViewControllerTests.m | 27 - .../ios_add2appTests/IntegrationTests.m | 186 ----- .../FlutterUITests/FlutterUITests.m | 98 +++ .../FlutterUITests}/Info.plist | 2 +- .../Host.xcodeproj/project.pbxproj | 320 ++++++++- .../xcshareddata/xcschemes/Host.xcscheme} | 36 +- .../ios_host_app/Host/AppDelegate.h | 4 + .../ios_host_app/Host/AppDelegate.m | 47 +- .../Host/Base.lproj/LaunchScreen.storyboard | 33 +- .../Host/Base.lproj/Main.storyboard | 24 - .../Host}/DualFlutterViewController.h | 0 .../Host}/DualFlutterViewController.m | 0 .../Host}/FullScreenViewController.h | 0 .../Host}/FullScreenViewController.m | 0 .../Host}/HybridViewController.h | 0 .../Host}/HybridViewController.m | 0 .../ios_host_app/Host/Info.plist | 2 - .../Host}/MainViewController.h | 0 .../Host}/MainViewController.m | 2 +- .../Host}/NativeViewController.h | 0 .../Host}/NativeViewController.m | 0 .../ios_host_app/Host/ViewController.h | 8 - .../ios_host_app/Host/ViewController.m | 30 - .../ios_host_app/Host/main.m | 6 +- dev/integration_tests/ios_host_app/Podfile | 5 + dev/integration_tests/ios_host_app/README.md | 28 +- .../flutterapp/lib/main} | 0 .../flutterapp/lib/marquee} | 0 64 files changed, 662 insertions(+), 1610 deletions(-) delete mode 100644 dev/integration_tests/ios_add2app/.gitignore delete mode 100644 dev/integration_tests/ios_add2app/Podfile delete mode 100644 dev/integration_tests/ios_add2app/README.md delete mode 100755 dev/integration_tests/ios_add2app/build_and_test.sh delete mode 100644 dev/integration_tests/ios_add2app/flutterapp/.gitignore delete mode 100644 dev/integration_tests/ios_add2app/flutterapp/.metadata delete mode 100644 dev/integration_tests/ios_add2app/ios_add2app.xcodeproj/project.pbxproj delete mode 100644 dev/integration_tests/ios_add2app/ios_add2app.xcodeproj/xcshareddata/xcschemes/ios_add2appTests.xcscheme delete mode 100644 dev/integration_tests/ios_add2app/ios_add2app.xcworkspace/contents.xcworkspacedata delete mode 100644 dev/integration_tests/ios_add2app/ios_add2app.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 dev/integration_tests/ios_add2app/ios_add2app/AppDelegate.h delete mode 100644 dev/integration_tests/ios_add2app/ios_add2app/AppDelegate.m delete mode 100644 dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Contents.json delete mode 100644 dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png delete mode 100644 dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png delete mode 100644 dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png delete mode 100644 dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png delete mode 100644 dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png delete mode 100644 dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png delete mode 100644 dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png delete mode 100644 dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png delete mode 100644 dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png delete mode 100644 dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png delete mode 100644 dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png delete mode 100644 dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png delete mode 100644 dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png delete mode 100644 dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png delete mode 100644 dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png delete mode 100644 dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/Contents.json delete mode 100644 dev/integration_tests/ios_add2app/ios_add2app/Info.plist delete mode 100644 dev/integration_tests/ios_add2app/ios_add2app/Launch Screen.storyboard delete mode 100644 dev/integration_tests/ios_add2app/ios_add2app/main.m delete mode 100644 dev/integration_tests/ios_add2app/ios_add2appTests/FlutterViewControllerTests.m delete mode 100644 dev/integration_tests/ios_add2app/ios_add2appTests/IntegrationTests.m create mode 100644 dev/integration_tests/ios_host_app/FlutterUITests/FlutterUITests.m rename dev/integration_tests/{ios_add2app/ios_add2appTests => ios_host_app/FlutterUITests}/Info.plist (93%) rename dev/integration_tests/{ios_add2app/ios_add2app.xcodeproj/xcshareddata/xcschemes/ios_add2app.xcscheme => ios_host_app/Host.xcodeproj/xcshareddata/xcschemes/Host.xcscheme} (67%) delete mode 100644 dev/integration_tests/ios_host_app/Host/Base.lproj/Main.storyboard rename dev/integration_tests/{ios_add2app/ios_add2app => ios_host_app/Host}/DualFlutterViewController.h (100%) rename dev/integration_tests/{ios_add2app/ios_add2app => ios_host_app/Host}/DualFlutterViewController.m (100%) rename dev/integration_tests/{ios_add2app/ios_add2app => ios_host_app/Host}/FullScreenViewController.h (100%) rename dev/integration_tests/{ios_add2app/ios_add2app => ios_host_app/Host}/FullScreenViewController.m (100%) rename dev/integration_tests/{ios_add2app/ios_add2app => ios_host_app/Host}/HybridViewController.h (100%) rename dev/integration_tests/{ios_add2app/ios_add2app => ios_host_app/Host}/HybridViewController.m (100%) rename dev/integration_tests/{ios_add2app/ios_add2app => ios_host_app/Host}/MainViewController.h (100%) rename dev/integration_tests/{ios_add2app/ios_add2app => ios_host_app/Host}/MainViewController.m (99%) rename dev/integration_tests/{ios_add2app/ios_add2app => ios_host_app/Host}/NativeViewController.h (100%) rename dev/integration_tests/{ios_add2app/ios_add2app => ios_host_app/Host}/NativeViewController.m (100%) delete mode 100644 dev/integration_tests/ios_host_app/Host/ViewController.h delete mode 100644 dev/integration_tests/ios_host_app/Host/ViewController.m rename dev/integration_tests/{ios_add2app/flutterapp/lib/main.dart => ios_host_app/flutterapp/lib/main} (100%) rename dev/integration_tests/{ios_add2app/flutterapp/lib/marquee.dart => ios_host_app/flutterapp/lib/marquee} (100%) diff --git a/.cirrus.yml b/.cirrus.yml index d9f5eea4b3a..eebdbcae0b0 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -272,8 +272,6 @@ task: - name: hostonly_devicelab_tests-3_last-linux << : *LINUX_SHARD_TEMPLATE - # TODO(ianh): name: add_to_app_tests-linux - - name: docs-linux # linux-only only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter/**', 'packages/flutter_test/**', 'packages/flutter_drive/**', 'packages/flutter_localizations/**', 'packages/flutter_goldens/**', 'bin/**') || $CIRRUS_PR == ''" environment: @@ -508,8 +506,6 @@ task: CPU: 4 MEMORY: 6G - # TODO(ianh): name: add_to_app_tests-windows - - name: customer_testing-windows environment: # As of December 2019, the customer_testing-windows shard got faster with more CPUs up to 4 @@ -624,13 +620,6 @@ task: - name: hostonly_devicelab_tests-3_last-macos << : *MACOS_SHARD_TEMPLATE - - name: add_to_app_tests-macos - only_if: "changesInclude('.cirrus.yml', 'dev/**', 'bin/**') || $CIRRUS_PR == ''" # https://github.com/flutter/flutter/issues/41940 - skip: true # https://github.com/flutter/flutter/pull/42444 - script: - - ulimit -S -n 2048 # https://github.com/flutter/flutter/issues/2976 - - dart --enable-asserts dev/bots/test.dart - - name: customer_testing-macos script: - ulimit -S -n 2048 # https://github.com/flutter/flutter/issues/2976 diff --git a/dev/bots/test.dart b/dev/bots/test.dart index d9c3991c73f..1579b6af41b 100644 --- a/dev/bots/test.dart +++ b/dev/bots/test.dart @@ -121,7 +121,6 @@ Future main(List args) async { await _runSmokeTests(); print('═' * 80); await selectShard(const { - 'add_to_app_tests': _runAddToAppTests, 'add_to_app_life_cycle_tests': _runAddToAppLifeCycleTests, 'build_tests': _runBuildTests, 'firebase_test_lab_tests': _runFirebaseTestLabTests, @@ -525,17 +524,6 @@ Future _flutterBuildDart2js(String relativePathToApplication, String targe ); } -Future _runAddToAppTests() async { - if (Platform.isMacOS) { - print('${green}Running add-to-app iOS integration tests$reset...'); - final String addToAppDir = path.join(flutterRoot, 'dev', 'integration_tests', 'ios_add2app'); - await runCommand('./build_and_test.sh', - [], - workingDirectory: addToAppDir, - ); - } -} - Future _runAddToAppLifeCycleTests() async { if (Platform.isMacOS) { print('${green}Running add-to-app life cycle iOS integration tests$reset...'); diff --git a/dev/devicelab/bin/tasks/module_test_ios.dart b/dev/devicelab/bin/tasks/module_test_ios.dart index 53413cc7b5f..f20fff9208a 100644 --- a/dev/devicelab/bin/tasks/module_test_ios.dart +++ b/dev/devicelab/bin/tasks/module_test_ios.dart @@ -6,6 +6,7 @@ import 'dart:async'; import 'dart:io'; import 'package:flutter_devicelab/framework/framework.dart'; +import 'package:flutter_devicelab/framework/ios.dart'; import 'package:flutter_devicelab/framework/utils.dart'; import 'package:path/path.dart' as path; @@ -30,6 +31,18 @@ Future main() async { ); }); + // Copy test dart files to new module app. + final Directory flutterModuleLibSource = Directory(path.join(flutterDirectory.path, 'dev', 'integration_tests', 'ios_host_app', 'flutterapp', 'lib')); + final Directory flutterModuleLibDestination = Directory(path.join(projectDir.path, 'lib')); + + // These test files don't have a .dart prefix so the analyzer will ignore them. They aren't in a + // package and don't work on their own outside of the test module just created. + final File main = File(path.join(flutterModuleLibSource.path, 'main')); + main.copySync(path.join(flutterModuleLibDestination.path, 'main.dart')); + + final File marquee = File(path.join(flutterModuleLibSource.path, 'marquee')); + marquee.copySync(path.join(flutterModuleLibDestination.path, 'marquee.dart')); + section('Build ephemeral host app in release mode without CocoaPods'); await inDirectory(projectDir, () async { @@ -181,42 +194,6 @@ Future main() async { return TaskResult.failure('Building ephemeral host app Podfile.lock does not contain expected pods'); } - section('Clean build'); - - await inDirectory(projectDir, () async { - await flutter('clean'); - }); - - section('Make iOS host app editable'); - - await inDirectory(projectDir, () async { - await flutter( - 'make-host-app-editable', - options: ['ios'], - ); - }); - - section('Build editable host app'); - - await inDirectory(projectDir, () async { - await flutter( - 'build', - options: ['ios', '--no-codesign'], - ); - }); - - final bool editableHostAppBuilt = exists(Directory(path.join( - projectDir.path, - 'build', - 'ios', - 'iphoneos', - 'Runner.app', - ))); - - if (!editableHostAppBuilt) { - return TaskResult.failure('Failed to build editable host .app'); - } - section('Add to existing iOS Objective-C app'); final Directory objectiveCHostApp = Directory(path.join(tempDir.path, 'hello_host_app')); @@ -277,10 +254,34 @@ Future main() async { ); } + section('Run platform unit tests'); + await testWithNewiOSSimulator('TestAdd2AppSim', (String deviceId) => + inDirectory(objectiveCHostApp, () => + exec( + 'xcodebuild', + [ + '-workspace', + 'Host.xcworkspace', + '-scheme', + 'Host', + '-configuration', + 'Debug', + '-destination', + 'id=$deviceId', + 'test', + 'CODE_SIGNING_ALLOWED=NO', + 'CODE_SIGNING_REQUIRED=NO', + 'CODE_SIGN_IDENTITY=-', + 'EXPANDED_CODE_SIGN_IDENTITY=-', + 'COMPILER_INDEX_STORE_ENABLE=NO', + ], + ) + ) + ); + section('Fail building existing Objective-C iOS app if flutter script fails'); - int xcodebuildExitCode = 0; - await inDirectory(objectiveCHostApp, () async { - xcodebuildExitCode = await exec( + final int xcodebuildExitCode = await inDirectory(objectiveCHostApp, () => + exec( 'xcodebuild', [ '-workspace', @@ -298,8 +299,8 @@ Future main() async { 'COMPILER_INDEX_STORE_ENABLE=NO', ], canFail: true, - ); - }); + ) + ); if (xcodebuildExitCode != 65) { // 65 returned on PhaseScriptExecution failure. return TaskResult.failure('Host Objective-C app build succeeded though flutter script failed'); diff --git a/dev/devicelab/lib/framework/ios.dart b/dev/devicelab/lib/framework/ios.dart index 2022c2c9807..80aa03c3993 100644 --- a/dev/devicelab/lib/framework/ios.dart +++ b/dev/devicelab/lib/framework/ios.dart @@ -7,6 +7,8 @@ import 'dart:convert'; import 'utils.dart'; +typedef SimulatorFunction = Future Function(String deviceId); + void _checkExitCode(int code) { if (code != 0) { throw Exception( @@ -99,3 +101,85 @@ Future containsBitcode(String pathToBinary) async { }); return !emptyBitcodeMarkerFound; } + +/// Creates and boots a new simulator, passes the new simulator's identifier to +/// `testFunction`, then shuts down and deletes simulator. +Future testWithNewiOSSimulator( + String deviceName, + SimulatorFunction testFunction, { + String deviceTypeId = 'com.apple.CoreSimulator.SimDeviceType.iPhone-11', +}) async { + // Xcode 11.4 simctl create makes the runtime argument optional, and defaults to latest. + // TODO(jmagman): Remove runtime parsing when devicelab upgrades to Xcode 11.4 https://github.com/flutter/flutter/issues/54889 + final String availableRuntimes = await eval( + 'xcrun', + [ + 'simctl', + 'list', + 'runtimes', + ], + workingDirectory: flutterDirectory.path, + ); + + String iOSSimRuntime; + + final RegExp iOSRuntimePattern = RegExp(r'iOS .*\) - (.*)'); + + for (final String runtime in LineSplitter.split(availableRuntimes)) { + // These seem to be in order, so allow matching multiple lines so it grabs + // the last (hopefully latest) one. + final RegExpMatch iOSRuntimeMatch = iOSRuntimePattern.firstMatch(runtime); + if (iOSRuntimeMatch != null) { + iOSSimRuntime = iOSRuntimeMatch.group(1).trim(); + continue; + } + } + if (iOSSimRuntime == null) { + throw 'No iOS simulator runtime found. Available runtimes:\n$availableRuntimes'; + } + + final String deviceId = await eval( + 'xcrun', + [ + 'simctl', + 'create', + deviceName, + deviceTypeId, + iOSSimRuntime, + ], + workingDirectory: flutterDirectory.path, + ); + await eval( + 'xcrun', + [ + 'simctl', + 'boot', + deviceId, + ], + workingDirectory: flutterDirectory.path, + ); + + await testFunction(deviceId); + + if (deviceId != null && deviceId != '') { + await eval( + 'xcrun', + [ + 'simctl', + 'shutdown', + deviceId + ], + canFail: true, + workingDirectory: flutterDirectory.path, + ); + await eval( + 'xcrun', + [ + 'simctl', + 'delete', + deviceId], + canFail: true, + workingDirectory: flutterDirectory.path, + ); + } +} diff --git a/dev/integration_tests/ios_add2app/.gitignore b/dev/integration_tests/ios_add2app/.gitignore deleted file mode 100644 index 39e7c6e37df..00000000000 --- a/dev/integration_tests/ios_add2app/.gitignore +++ /dev/null @@ -1,69 +0,0 @@ -# Xcode -# -# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore - -.DS_Store - -## Build generated -build/ -DerivedData/ -Pods/ - -## Various settings -*.pbxuser -!default.pbxuser -*.mode1v3 -!default.mode1v3 -*.mode2v3 -!default.mode2v3 -*.perspectivev3 -!default.perspectivev3 -xcuserdata/ - -## Other -*.moved-aside -*.xccheckout -*.xcscmblueprint - -## Obj-C/Swift specific -*.hmap -*.ipa -*.dSYM.zip -*.dSYM - -# CocoaPods -# -# We recommend against adding the Pods directory to your .gitignore. However -# you should judge for yourself, the pros and cons are mentioned at: -# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control -# -# Pods/ -# -# Add this line if you want to avoid checking in source code from the Xcode workspace -# *.xcworkspace - -# Carthage -# -# Add this line if you want to avoid checking in source code from Carthage dependencies. -# Carthage/Checkouts - -Carthage/Build - -# fastlane -# -# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the -# screenshots whenever they are needed. -# For more information about the recommended setup visit: -# https://docs.fastlane.tools/best-practices/source-control/#source-control - -fastlane/report.xml -fastlane/Preview.html -fastlane/screenshots/**/*.png -fastlane/test_output - -# Code Injection -# -# After new code Injection tools there's a generated folder /iOSInjectionProject -# https://github.com/johnno1962/injectionforxcode - -iOSInjectionProject/ \ No newline at end of file diff --git a/dev/integration_tests/ios_add2app/Podfile b/dev/integration_tests/ios_add2app/Podfile deleted file mode 100644 index 11981e2fe21..00000000000 --- a/dev/integration_tests/ios_add2app/Podfile +++ /dev/null @@ -1,15 +0,0 @@ -platform :ios, '12.0' - -flutter_application_path = 'flutterapp/' - -load File.join(flutter_application_path, '.ios', 'Flutter', 'podhelper.rb') - -target 'ios_add2app' do - install_all_flutter_pods(flutter_application_path) -end - -target 'ios_add2appTests' do - inherit! :search_paths - install_flutter_engine_pod - pod 'EarlGrey' -end diff --git a/dev/integration_tests/ios_add2app/README.md b/dev/integration_tests/ios_add2app/README.md deleted file mode 100644 index 7ab05bb13ef..00000000000 --- a/dev/integration_tests/ios_add2app/README.md +++ /dev/null @@ -1,28 +0,0 @@ -# iOS Add2App Test - -This application demonstrates some basic functionality for Add2App, -along with a native iOS ViewController as a baseline and to demonstrate -interaction. - -The following functionality is currently implemented: - -1. A regular iOS view controller (UIViewController), similar to the default - `flutter create` template (NativeViewController.m). -1. A FlutterViewController subclass that takes over full screen. Demos showing - this both from a cold/fresh engine state and a warm engine state - (FullScreenViewController.m). -1. A demo of pushing a FlutterViewController on as a child view. -1. A demo of showing both the native and the Flutter views using a platform - channel to interact with each other (HybridViewController.m). -1. A demo of showing two FlutterViewControllers simultaneously - (DualViewController.m). - -A few key things are tested here (IntegrationTests.m): - -1. The ability to pre-warm the engine and attach/detatch a ViewController from - it. -1. The ability to use platform channels to communicate between views. -1. The ability to simultaneously run two instances of the engine. -1. That a FlutterViewController can be freed when no longer in use (also tested - from FlutterViewControllerTests.m). -1. That a FlutterEngine can be freed when no longer in use. \ No newline at end of file diff --git a/dev/integration_tests/ios_add2app/build_and_test.sh b/dev/integration_tests/ios_add2app/build_and_test.sh deleted file mode 100755 index 40fa2c7b328..00000000000 --- a/dev/integration_tests/ios_add2app/build_and_test.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash -# Copyright 2014 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 - -cd "$(dirname "$0")" - -pushd flutterapp -../../../../bin/flutter build ios --debug --simulator --no-codesign -popd - -pod install -os_version=$(xcrun --show-sdk-version --sdk iphonesimulator) - -PRETTY="cat" -if which xcpretty; then - PRETTY="xcpretty" -fi - -set -o pipefail && xcodebuild \ - -workspace ios_add2app.xcworkspace \ - -scheme ios_add2appTests \ - -sdk "iphonesimulator$os_version" \ - -destination "OS=$os_version,name=iPhone X" test | $PRETTY diff --git a/dev/integration_tests/ios_add2app/flutterapp/.gitignore b/dev/integration_tests/ios_add2app/flutterapp/.gitignore deleted file mode 100644 index 86f469179f5..00000000000 --- a/dev/integration_tests/ios_add2app/flutterapp/.gitignore +++ /dev/null @@ -1,42 +0,0 @@ -.DS_Store -.dart_tool/ - -.packages -.pub/ - -.idea/ -.vagrant/ -.sconsign.dblite -.svn/ - -*.swp -profile - -DerivedData/ - -.generated/ - -*.pbxuser -*.mode1v3 -*.mode2v3 -*.perspectivev3 - -!default.pbxuser -!default.mode1v3 -!default.mode2v3 -!default.perspectivev3 - -xcuserdata - -*.moved-aside - -*.pyc -*sync/ -Icon? -.tags* - -build/ -.android/ -.ios/ -.flutter-plugins -.flutter-plugins-dependencies diff --git a/dev/integration_tests/ios_add2app/flutterapp/.metadata b/dev/integration_tests/ios_add2app/flutterapp/.metadata deleted file mode 100644 index 04ff028c3d5..00000000000 --- a/dev/integration_tests/ios_add2app/flutterapp/.metadata +++ /dev/null @@ -1,10 +0,0 @@ -# This file tracks properties of this Flutter project. -# Used by Flutter tool to assess capabilities and perform upgrades etc. -# -# This file should be version controlled and should not be manually edited. - -version: - revision: 06179457d553b96b4d7421a08ac90535ca2c9632 - channel: unknown - -project_type: module diff --git a/dev/integration_tests/ios_add2app/ios_add2app.xcodeproj/project.pbxproj b/dev/integration_tests/ios_add2app/ios_add2app.xcodeproj/project.pbxproj deleted file mode 100644 index 8bbb7c38549..00000000000 --- a/dev/integration_tests/ios_add2app/ios_add2app.xcodeproj/project.pbxproj +++ /dev/null @@ -1,654 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 51; - objects = { - -/* Begin PBXBuildFile section */ - 09C65652A2B48A21C94FF831 /* EarlGrey.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE1EF0F5719FBB45225A9EC3 /* EarlGrey.framework */; }; - 24D2933821A29628008787A5 /* IntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 24D2933721A29628008787A5 /* IntegrationTests.m */; }; - 24E221BA21A28A0B008ADF09 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 24E221B921A28A0B008ADF09 /* AppDelegate.m */; }; - 24E221C821A28A0C008ADF09 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 24E221C721A28A0C008ADF09 /* main.m */; }; - 24E221DB21A28B23008ADF09 /* HybridViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 24E221D021A28B22008ADF09 /* HybridViewController.m */; }; - 24E221DC21A28B23008ADF09 /* DualFlutterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 24E221D121A28B22008ADF09 /* DualFlutterViewController.m */; }; - 24E221DD21A28B23008ADF09 /* FullScreenViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 24E221D321A28B23008ADF09 /* FullScreenViewController.m */; }; - 24E221DE21A28B23008ADF09 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 24E221D421A28B23008ADF09 /* MainViewController.m */; }; - 24E221DF21A28B23008ADF09 /* NativeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 24E221D621A28B23008ADF09 /* NativeViewController.m */; }; - 24E221E021A28B23008ADF09 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 24E221D721A28B23008ADF09 /* Launch Screen.storyboard */; }; - 24E221E221A28B36008ADF09 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 24E221E121A28B36008ADF09 /* Assets.xcassets */; }; - 24E7A1FE21A2AF26003A7FAD /* FlutterViewControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 24E7A1FD21A2AF26003A7FAD /* FlutterViewControllerTests.m */; }; - 4C21FEB4D629B570C74073D1 /* libPods-ios_add2appTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F90B141A9A8A680033E97924 /* libPods-ios_add2appTests.a */; }; - 8BDD73EC12DFA6CD2AC4EEDA /* EarlGrey.framework in EarlGrey Copy Files */ = {isa = PBXBuildFile; fileRef = DE1EF0F5719FBB45225A9EC3 /* EarlGrey.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - DB9A200AFEB7AAE22B4E12E4 /* libPods-ios_add2app.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7A318514E0307AE0FF0EFC76 /* libPods-ios_add2app.a */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 24D2933A21A29628008787A5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 24E221AD21A28A0B008ADF09 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 24E221B421A28A0B008ADF09; - remoteInfo = ios_add2app; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXCopyFilesBuildPhase section */ - C155689B0EB46CB1FF251109 /* EarlGrey Copy Files */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "$(TEST_HOST)/../"; - dstSubfolderSpec = 0; - files = ( - 8BDD73EC12DFA6CD2AC4EEDA /* EarlGrey.framework in EarlGrey Copy Files */, - ); - name = "EarlGrey Copy Files"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 16D27B9BE77DC8804292A9A9 /* Pods-ios_add2appUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ios_add2appUITests.release.xcconfig"; path = "Pods/Target Support Files/Pods-ios_add2appUITests/Pods-ios_add2appUITests.release.xcconfig"; sourceTree = ""; }; - 24D2933521A29627008787A5 /* ios_add2appTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ios_add2appTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 24D2933721A29628008787A5 /* IntegrationTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IntegrationTests.m; sourceTree = ""; }; - 24D2933921A29628008787A5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 24E221B521A28A0B008ADF09 /* ios_add2app.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ios_add2app.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 24E221B821A28A0B008ADF09 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - 24E221B921A28A0B008ADF09 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - 24E221C621A28A0C008ADF09 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 24E221C721A28A0C008ADF09 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 24E221CF21A28B22008ADF09 /* FullScreenViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FullScreenViewController.h; sourceTree = ""; }; - 24E221D021A28B22008ADF09 /* HybridViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HybridViewController.m; sourceTree = ""; }; - 24E221D121A28B22008ADF09 /* DualFlutterViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DualFlutterViewController.m; sourceTree = ""; }; - 24E221D221A28B23008ADF09 /* MainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainViewController.h; sourceTree = ""; }; - 24E221D321A28B23008ADF09 /* FullScreenViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FullScreenViewController.m; sourceTree = ""; }; - 24E221D421A28B23008ADF09 /* MainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainViewController.m; sourceTree = ""; }; - 24E221D521A28B23008ADF09 /* DualFlutterViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DualFlutterViewController.h; sourceTree = ""; }; - 24E221D621A28B23008ADF09 /* NativeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NativeViewController.m; sourceTree = ""; }; - 24E221D721A28B23008ADF09 /* Launch Screen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = ""; }; - 24E221D821A28B23008ADF09 /* HybridViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HybridViewController.h; sourceTree = ""; }; - 24E221D921A28B23008ADF09 /* NativeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeViewController.h; sourceTree = ""; }; - 24E221E121A28B36008ADF09 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 24E7A1FD21A2AF26003A7FAD /* FlutterViewControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FlutterViewControllerTests.m; sourceTree = ""; }; - 36DA6BEAA5127D74EC6E3E13 /* Pods-ios_add2appUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ios_add2appUITests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ios_add2appUITests/Pods-ios_add2appUITests.debug.xcconfig"; sourceTree = ""; }; - 52EA0B290EEBC1D28BF6E803 /* libPods-ios_add2appUITests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ios_add2appUITests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 74266A4D94FA1C3157B5B560 /* Pods-ios_add2appTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ios_add2appTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ios_add2appTests/Pods-ios_add2appTests.debug.xcconfig"; sourceTree = ""; }; - 762E954C71D922C091619CD4 /* Pods-ios_add2app-ios_add2appTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ios_add2app-ios_add2appTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ios_add2app-ios_add2appTests/Pods-ios_add2app-ios_add2appTests.debug.xcconfig"; sourceTree = ""; }; - 7A318514E0307AE0FF0EFC76 /* libPods-ios_add2app.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ios_add2app.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 83017A33946358F55BAE24E1 /* Pods-ios_add2appTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ios_add2appTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-ios_add2appTests/Pods-ios_add2appTests.release.xcconfig"; sourceTree = ""; }; - 98A4882F55A3E107DFCB67D8 /* Pods-ios_add2app-ios_add2appTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ios_add2app-ios_add2appTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-ios_add2app-ios_add2appTests/Pods-ios_add2app-ios_add2appTests.release.xcconfig"; sourceTree = ""; }; - A18D4CDABD6795975FD6B49F /* Pods-ios_add2app.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ios_add2app.release.xcconfig"; path = "Pods/Target Support Files/Pods-ios_add2app/Pods-ios_add2app.release.xcconfig"; sourceTree = ""; }; - CCFA174387D083C931FB85D0 /* Pods-ios_add2app.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ios_add2app.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ios_add2app/Pods-ios_add2app.debug.xcconfig"; sourceTree = ""; }; - DE1EF0F5719FBB45225A9EC3 /* EarlGrey.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = EarlGrey.framework; path = Pods/EarlGrey/EarlGrey/EarlGrey.framework; sourceTree = SOURCE_ROOT; }; - F90B141A9A8A680033E97924 /* libPods-ios_add2appTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ios_add2appTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 24D2933221A29627008787A5 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 09C65652A2B48A21C94FF831 /* EarlGrey.framework in Frameworks */, - 4C21FEB4D629B570C74073D1 /* libPods-ios_add2appTests.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 24E221B221A28A0B008ADF09 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - DB9A200AFEB7AAE22B4E12E4 /* libPods-ios_add2app.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 24D2933621A29628008787A5 /* ios_add2appTests */ = { - isa = PBXGroup; - children = ( - 24D2933721A29628008787A5 /* IntegrationTests.m */, - 24E7A1FD21A2AF26003A7FAD /* FlutterViewControllerTests.m */, - 24D2933921A29628008787A5 /* Info.plist */, - ); - path = ios_add2appTests; - sourceTree = ""; - }; - 24E221AC21A28A0B008ADF09 = { - isa = PBXGroup; - children = ( - 24E221B721A28A0B008ADF09 /* ios_add2app */, - 24D2933621A29628008787A5 /* ios_add2appTests */, - 24E221B621A28A0B008ADF09 /* Products */, - F8E51775C9B1473BB9A1386D /* Pods */, - 8403FDDD872DC11EF3710BB4 /* Frameworks */, - ); - sourceTree = ""; - }; - 24E221B621A28A0B008ADF09 /* Products */ = { - isa = PBXGroup; - children = ( - 24E221B521A28A0B008ADF09 /* ios_add2app.app */, - 24D2933521A29627008787A5 /* ios_add2appTests.xctest */, - ); - name = Products; - sourceTree = ""; - }; - 24E221B721A28A0B008ADF09 /* ios_add2app */ = { - isa = PBXGroup; - children = ( - 24E221E121A28B36008ADF09 /* Assets.xcassets */, - 24E221D521A28B23008ADF09 /* DualFlutterViewController.h */, - 24E221D121A28B22008ADF09 /* DualFlutterViewController.m */, - 24E221CF21A28B22008ADF09 /* FullScreenViewController.h */, - 24E221D321A28B23008ADF09 /* FullScreenViewController.m */, - 24E221D821A28B23008ADF09 /* HybridViewController.h */, - 24E221D021A28B22008ADF09 /* HybridViewController.m */, - 24E221D721A28B23008ADF09 /* Launch Screen.storyboard */, - 24E221D221A28B23008ADF09 /* MainViewController.h */, - 24E221D421A28B23008ADF09 /* MainViewController.m */, - 24E221D921A28B23008ADF09 /* NativeViewController.h */, - 24E221D621A28B23008ADF09 /* NativeViewController.m */, - 24E221B821A28A0B008ADF09 /* AppDelegate.h */, - 24E221B921A28A0B008ADF09 /* AppDelegate.m */, - 24E221C621A28A0C008ADF09 /* Info.plist */, - 24E221C721A28A0C008ADF09 /* main.m */, - ); - path = ios_add2app; - sourceTree = ""; - }; - 8403FDDD872DC11EF3710BB4 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 7A318514E0307AE0FF0EFC76 /* libPods-ios_add2app.a */, - DE1EF0F5719FBB45225A9EC3 /* EarlGrey.framework */, - 52EA0B290EEBC1D28BF6E803 /* libPods-ios_add2appUITests.a */, - F90B141A9A8A680033E97924 /* libPods-ios_add2appTests.a */, - ); - name = Frameworks; - sourceTree = ""; - }; - F8E51775C9B1473BB9A1386D /* Pods */ = { - isa = PBXGroup; - children = ( - CCFA174387D083C931FB85D0 /* Pods-ios_add2app.debug.xcconfig */, - A18D4CDABD6795975FD6B49F /* Pods-ios_add2app.release.xcconfig */, - 36DA6BEAA5127D74EC6E3E13 /* Pods-ios_add2appUITests.debug.xcconfig */, - 16D27B9BE77DC8804292A9A9 /* Pods-ios_add2appUITests.release.xcconfig */, - 74266A4D94FA1C3157B5B560 /* Pods-ios_add2appTests.debug.xcconfig */, - 83017A33946358F55BAE24E1 /* Pods-ios_add2appTests.release.xcconfig */, - 762E954C71D922C091619CD4 /* Pods-ios_add2app-ios_add2appTests.debug.xcconfig */, - 98A4882F55A3E107DFCB67D8 /* Pods-ios_add2app-ios_add2appTests.release.xcconfig */, - ); - name = Pods; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 24D2933421A29627008787A5 /* ios_add2appTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 24D2933C21A29628008787A5 /* Build configuration list for PBXNativeTarget "ios_add2appTests" */; - buildPhases = ( - DE5CDCD8B3565EAB9F38F455 /* [CP] Check Pods Manifest.lock */, - 24D2933121A29627008787A5 /* Sources */, - 24D2933221A29627008787A5 /* Frameworks */, - 24D2933321A29627008787A5 /* Resources */, - C155689B0EB46CB1FF251109 /* EarlGrey Copy Files */, - E32E699BE7026038F5987095 /* [CP] Embed Pods Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - 24D2933B21A29628008787A5 /* PBXTargetDependency */, - ); - name = ios_add2appTests; - productName = ios_add2appTests; - productReference = 24D2933521A29627008787A5 /* ios_add2appTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; - 24E221B421A28A0B008ADF09 /* ios_add2app */ = { - isa = PBXNativeTarget; - buildConfigurationList = 24E221CB21A28A0C008ADF09 /* Build configuration list for PBXNativeTarget "ios_add2app" */; - buildPhases = ( - 4375EE880A727341E9C9A57D /* [CP] Check Pods Manifest.lock */, - 52B3E7E8995E582399C42407 /* [CP-User] Run Flutter Build ios_add2app_flutter Script */, - 24E221B121A28A0B008ADF09 /* Sources */, - 24E221B221A28A0B008ADF09 /* Frameworks */, - 24E221B321A28A0B008ADF09 /* Resources */, - 7FADF19EC61F97E525982780 /* [CP] Embed Pods Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = ios_add2app; - productName = ios_add2app; - productReference = 24E221B521A28A0B008ADF09 /* ios_add2app.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 24E221AD21A28A0B008ADF09 /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 1000; - ORGANIZATIONNAME = Flutter.io; - TargetAttributes = { - 24D2933421A29627008787A5 = { - CreatedOnToolsVersion = 10.0; - TestTargetID = 24E221B421A28A0B008ADF09; - }; - 24E221B421A28A0B008ADF09 = { - CreatedOnToolsVersion = 10.0; - }; - }; - }; - buildConfigurationList = 24E221B021A28A0B008ADF09 /* Build configuration list for PBXProject "ios_add2app" */; - compatibilityVersion = "Xcode 9.3"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 24E221AC21A28A0B008ADF09; - productRefGroup = 24E221B621A28A0B008ADF09 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 24E221B421A28A0B008ADF09 /* ios_add2app */, - 24D2933421A29627008787A5 /* ios_add2appTests */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 24D2933321A29627008787A5 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 24E221B321A28A0B008ADF09 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 24E221E021A28B23008ADF09 /* Launch Screen.storyboard in Resources */, - 24E221E221A28B36008ADF09 /* Assets.xcassets in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 4375EE880A727341E9C9A57D /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-ios_add2app-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - 52B3E7E8995E582399C42407 /* [CP-User] Run Flutter Build ios_add2app_flutter Script */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${SRCROOT}/flutterapp/.metadata", - "${SRCROOT}/flutterapp/.ios/Flutter/App.framework/App", - "${SRCROOT}/flutterapp/.ios/Flutter/engine/Flutter.framework/Flutter", - "${SRCROOT}/flutterapp/.ios/Flutter/flutter_export_environment.sh", - ); - name = "[CP-User] Run Flutter Build ios_add2app_flutter Script"; - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "set -e\nset -u\nsource \"${SRCROOT}/flutterapp/.ios/Flutter/flutter_export_environment.sh\"\n\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/xcode_backend.sh build"; - }; - 7FADF19EC61F97E525982780 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-ios_add2app/Pods-ios_add2app-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-ios_add2app/Pods-ios_add2app-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ios_add2app/Pods-ios_add2app-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - DE5CDCD8B3565EAB9F38F455 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-ios_add2appTests-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - E32E699BE7026038F5987095 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-ios_add2appTests/Pods-ios_add2appTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-ios_add2appTests/Pods-ios_add2appTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ios_add2appTests/Pods-ios_add2appTests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 24D2933121A29627008787A5 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 24E7A1FE21A2AF26003A7FAD /* FlutterViewControllerTests.m in Sources */, - 24D2933821A29628008787A5 /* IntegrationTests.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 24E221B121A28A0B008ADF09 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 24E221C821A28A0C008ADF09 /* main.m in Sources */, - 24E221DE21A28B23008ADF09 /* MainViewController.m in Sources */, - 24E221DD21A28B23008ADF09 /* FullScreenViewController.m in Sources */, - 24E221DC21A28B23008ADF09 /* DualFlutterViewController.m in Sources */, - 24E221DB21A28B23008ADF09 /* HybridViewController.m in Sources */, - 24E221DF21A28B23008ADF09 /* NativeViewController.m in Sources */, - 24E221BA21A28A0B008ADF09 /* AppDelegate.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 24D2933B21A29628008787A5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 24E221B421A28A0B008ADF09 /* ios_add2app */; - targetProxy = 24D2933A21A29628008787A5 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin XCBuildConfiguration section */ - 24D2933D21A29628008787A5 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 74266A4D94FA1C3157B5B560 /* Pods-ios_add2appTests.debug.xcconfig */; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = S8QB4VV633; - INFOPLIST_FILE = ios_add2appTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = "org.test.ios-add2appTests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ios_add2app.app/ios_add2app"; - }; - name = Debug; - }; - 24D2933E21A29628008787A5 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 83017A33946358F55BAE24E1 /* Pods-ios_add2appTests.release.xcconfig */; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = S8QB4VV633; - INFOPLIST_FILE = ios_add2appTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = "org.test.ios-add2appTests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ios_add2app.app/ios_add2app"; - }; - name = Release; - }; - 24E221C921A28A0C008ADF09 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_TREAT_WARNINGS_AS_ERRORS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_PEDANTIC = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - WARNING_CFLAGS = "-Wno-gnu"; - WARNING_LDFLAGS = ( - "-Wall", - "-Werror", - ); - }; - name = Debug; - }; - 24E221CA21A28A0C008ADF09 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_NO_COMMON_BLOCKS = YES; - GCC_TREAT_WARNINGS_AS_ERRORS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_PEDANTIC = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - SDKROOT = iphoneos; - VALIDATE_PRODUCT = YES; - WARNING_CFLAGS = "-Wno-gnu"; - WARNING_LDFLAGS = ( - "-Wall", - "-Werror", - ); - }; - name = Release; - }; - 24E221CC21A28A0C008ADF09 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = CCFA174387D083C931FB85D0 /* Pods-ios_add2app.debug.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = S8QB4VV633; - INFOPLIST_FILE = ios_add2app/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = "org.test.ios-add2app"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 24E221CD21A28A0C008ADF09 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = A18D4CDABD6795975FD6B49F /* Pods-ios_add2app.release.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = S8QB4VV633; - INFOPLIST_FILE = ios_add2app/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = "org.test.ios-add2app"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 24D2933C21A29628008787A5 /* Build configuration list for PBXNativeTarget "ios_add2appTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 24D2933D21A29628008787A5 /* Debug */, - 24D2933E21A29628008787A5 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 24E221B021A28A0B008ADF09 /* Build configuration list for PBXProject "ios_add2app" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 24E221C921A28A0C008ADF09 /* Debug */, - 24E221CA21A28A0C008ADF09 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 24E221CB21A28A0C008ADF09 /* Build configuration list for PBXNativeTarget "ios_add2app" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 24E221CC21A28A0C008ADF09 /* Debug */, - 24E221CD21A28A0C008ADF09 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 24E221AD21A28A0B008ADF09 /* Project object */; -} diff --git a/dev/integration_tests/ios_add2app/ios_add2app.xcodeproj/xcshareddata/xcschemes/ios_add2appTests.xcscheme b/dev/integration_tests/ios_add2app/ios_add2app.xcodeproj/xcshareddata/xcschemes/ios_add2appTests.xcscheme deleted file mode 100644 index faa80f9f85c..00000000000 --- a/dev/integration_tests/ios_add2app/ios_add2app.xcodeproj/xcshareddata/xcschemes/ios_add2appTests.xcscheme +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dev/integration_tests/ios_add2app/ios_add2app.xcworkspace/contents.xcworkspacedata b/dev/integration_tests/ios_add2app/ios_add2app.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index a22b612a0c9..00000000000 --- a/dev/integration_tests/ios_add2app/ios_add2app.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/dev/integration_tests/ios_add2app/ios_add2app.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/dev/integration_tests/ios_add2app/ios_add2app.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d981003d6..00000000000 --- a/dev/integration_tests/ios_add2app/ios_add2app.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/dev/integration_tests/ios_add2app/ios_add2app/AppDelegate.h b/dev/integration_tests/ios_add2app/ios_add2app/AppDelegate.h deleted file mode 100644 index 3a6c5601742..00000000000 --- a/dev/integration_tests/ios_add2app/ios_add2app/AppDelegate.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2014 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. - -#import -#import - -@interface AppDelegate : FlutterAppDelegate - -@property(nonatomic, strong) FlutterEngine* engine; -@property(nonatomic, strong) FlutterBasicMessageChannel* reloadMessageChannel; - -@end diff --git a/dev/integration_tests/ios_add2app/ios_add2app/AppDelegate.m b/dev/integration_tests/ios_add2app/ios_add2app/AppDelegate.m deleted file mode 100644 index ed1389f87a1..00000000000 --- a/dev/integration_tests/ios_add2app/ios_add2app/AppDelegate.m +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright 2014 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. - -#import "AppDelegate.h" -#import "MainViewController.h" - -@interface AppDelegate () - -@end - -static NSString *_kReloadChannelName = @"reload"; - -@implementation AppDelegate { - MainViewController *_mainViewController; - UINavigationController *_navigationController; - FlutterEngine *_engine; - FlutterBasicMessageChannel *_reloadMessageChannel; -} - -- (FlutterEngine *)engine { - return _engine; -} - -- (FlutterBasicMessageChannel *)reloadMessabeChannel { - return _reloadMessageChannel; -} - -- (BOOL)application:(UIApplication *)application - didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; - - _mainViewController = [[MainViewController alloc] init]; - _navigationController = [[UINavigationController alloc] - initWithRootViewController:_mainViewController]; - - _navigationController.navigationBar.translucent = NO; - - _engine = [[FlutterEngine alloc] initWithName:@"test" project:nil]; - [_engine runWithEntrypoint:nil]; - - _reloadMessageChannel = [[FlutterBasicMessageChannel alloc] - initWithName:_kReloadChannelName - binaryMessenger:_engine.binaryMessenger - codec:[FlutterStringCodec sharedInstance]]; - - self.window.rootViewController = _navigationController; - [self.window makeKeyAndVisible]; - - return YES; -} - -@end diff --git a/dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Contents.json b/dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index d36b1fab2d9..00000000000 --- a/dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "images" : [ - { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" - }, - { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "Icon-App-20x20@3x.png", - "scale" : "3x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@3x.png", - "scale" : "3x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "Icon-App-40x40@3x.png", - "scale" : "3x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "Icon-App-60x60@2x.png", - "scale" : "2x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "Icon-App-60x60@3x.png", - "scale" : "3x" - }, - { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "Icon-App-20x20@1x.png", - "scale" : "1x" - }, - { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "Icon-App-40x40@1x.png", - "scale" : "1x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "Icon-App-76x76@1x.png", - "scale" : "1x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "Icon-App-76x76@2x.png", - "scale" : "2x" - }, - { - "size" : "83.5x83.5", - "idiom" : "ipad", - "filename" : "Icon-App-83.5x83.5@2x.png", - "scale" : "2x" - }, - { - "size" : "1024x1024", - "idiom" : "ios-marketing", - "filename" : "Icon-App-1024x1024@1x.png", - "scale" : "1x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} diff --git a/dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png deleted file mode 100644 index b6a5d3f48e4e0fec02ff52437b182c553efd1c00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10932 zcmeHN2~<R zh`|8`A_N>jnSu(UMFx?8j8PC!!VDphaL#`F42fd#7Vlc`zIE4n%Y~eiz4y1j|NDpi z?<@|nSJ-HM`qifhf@m%MamgwK83`XpBA<+azdF#2QsT{X@z0A9BsoHJVErigKH1~P zRX-!ho@ofe4MPw){D}J+K>~~rq}d%o%+4Xmgze|kRxX4C>Km5XEI|PAFFNzuNd%dm zzjVoB`=H9!8Yl0Kvc-9w0G$6dx!kMW*Eju^=3f?0o-t$U)GHRB-_ptGc%r}RxlL{U z594Nx3LA0oOp3q$3;sZ^!++3&bGZ!o-*6w?;oOhf z=A+Qb$scV5!RbG+&2S}BQ6YH!FKb0``VVX~T$dzyeSa3=9=_98)_7Z{SspqgJ$MRU z7xBn&41zpQ)%5dr4e`tmh%S+$3-JLRk&DLFC>t)q21$H5$O+fat1-`o21z628fpkq z%4%l9b!-re!W?9SX#5_6SYrFgL8%ToSju{TFz-VEme}QC0T5fO(BEZ111RaK=Dg2f z5CAIHecf9c*?Z1bUB4>>q^w7hD!A0r-@Nu_!`#dr(LXj|=UESd?^DGgGQV zidf2`ZT@pzXf7}!NH4q(0IMcxsUGDih(0{kRSez&z?CFA0RVXsVFw3^u=^KMtt95q z43q$b*6#uQDLoiCAF_{RFc{!H^moH_cmll#Fc^KXi{9GDl{>%+3qyfOE5;Zq|6#Hb zp^#1G+z^AXfRKaa9HK;%b3Ux~U@q?xg<2DXP%6k!3E)PA<#4$ui8eDy5|9hA5&{?v z(-;*1%(1~-NTQ`Is1_MGdQ{+i*ccd96ab$R$T3=% zw_KuOF@vI!A>>Y_2pl9L{9h1-C6H8<)J4gKI6{WzGBi<@u3P6hNsXG=bRq5c+z;Gc3VUCe;LIIFDmQAGy+=mRyF++u=drBWV8-^>0zcWx+)(|LcH)C(o z+}(GY=-?=3)7W4_?Q{Q0u{Y{(cO23&btXGIBDO`WmK40*!ocNIY9`h75Z-$KsZ2!zFrOk|!6UjMqS5(xo``OXh!SF(p`X|wQ4OBgWTy&c zrJlHsJ342pHlO?@Yo}THY9hUf4xw~h5E@UJo}6uNM=gyRReO?fvmWw#c89M$MLHl< zc9H6&Dm63IL}Uxdb`NU5NH#cJ?FZ@FL}tPIqF3ujhzxaj+_A!rT#alxAUj8`emyrM zooYSVTN6jtI#3&J`M%@$Dr%$TP}x7JscBm6e`)^WFdrFQ#R%1m}p5adKOe%!(b=~k4Pr3ST71A^!liwxZi zU8=2RhXm;muH-Vf_yc|f)q~9#D@Z4gD;Tz#b>k@SAwL`}Uq?atPjTHu?-U-y5kaQV zL0{LMUQJmabFkc=n%Hy6;Tb=Ugh%3^N)A%+TWkcA2|M(VZ+^_!1^q@^H|dbW&%`Qd z{8ZOD6nycipcvXt$GYz+#SqRR2OA3Bewyn9dg5=cpE+1jKwn%dA3>>D9OXKSGSiZi zhATIk7dulx^(Eh|EO(~1?D-}!h42E*^i|HDH0ISi_bI`m**kn_E3c)+FMo8lwpJc> zHWEf3Y?mz)(k?751$kMwJA2pd;9TDRJ=u=`COUl{llx&=TCfX-IhmNaeumUf4VE4? zq=(Nxy9TR*RRtEOagwx{)xZQ+8iwt=%NT! z@jrD-Zp+7gV5xLREK3$8;JVl8X(zU<=7WtAu{s;}{YJ>-yD4kHp>m-X*;xG;n20#jAXL_Zi8pcBvR6QHv+W+nZ>!3d5riYyP3FV_ub$Cjt zA*xRKlm(s+udE4?*#dDpGB`H z;v)2P)S~gW-}}c?*C--}LqF~QWNb8E@paLNIO>)|#V=Ay$1XxDNL@Q^) z_LSsYc^*^~9+}a2GIX0eachMtQg;?&3elpgrucCEP05s^_JCfpr2Pnweah3Y>7io5 z67!%O$p+6!SHoZ;rVuwiatg7Sm;&>V4X$Jg)~5eOtF!_&kz z1jb1s9!Lw8Zc@R)u%L|jFNGs+CzP>7vrQRGbf%=Sus4dvNn@c0&K;Hgmdg>$bJ2)z zX%_KWorRjs%xHe&=SXmheMCNUYqg^KVQ|5HQS?8`fF$9xrvdi5QXX|IsJ#e3r8#2k zz)0lzHJzwOXILd`kuqh8R?LW7F zto6|*7P`B?qTJb(TJlmJksxpP=6d=d)CVbYP-r4$hD(H~TG)0xL?8CLh&OVTkMk-T zYf%$taM2kgpbJnS{+6Xkn>iX@TuqQ?&cN6UjC9YF&%q{Ut3zv{UGe4M>-69@p)*(? zjXQZ$8^nfSen%a_j*T$pNowo{xiGEk$%Ck1aQhHUKjJH96XbLPXv+jk%ard#fu=@Q z$Ae`aWvE^{%tDfK>8GjkdLD zJE|jfdrmVbkfS>rN*+`#l%ZUi5_bMS<>-~WDNlpjSc3gQv9KOcK7kcp@|d?yaTmB^ zp5c!0;B$vxS|SszusMMj6at-EMMVAie!Jx@!qYTk4F?d_gm71T(<{~2|~P{jfGpsD)~-x0)E$>*ZI~~A9P&w>UQl#UV;;z84N0lGr|1L zSi9ujWZJT6tAQj&F1RgW=?As3v}+V|9>#&uNemd+Fz9$vG#Ptk>uT06bO8x@A;%l< zs1=QYC1|k&tv5E^`673|y8<1D=Kr$^2dBrL?(?NwQSo7n4S(Rni< zAH5;N4F}v$&{9>Efo*PB>T$&r1*^*`OTx4|ikV{d?B6HY;F25k{`OcZZ(us-RVwDx zUzJrCTBD$uz1ZFiSZ*$yX3c`ghG5WdBE$2g%&V7_F4c<#8j)TF_jFlKGTcdj@|Z>a z&kp09GVs!Zxsh^jG)}C)*I3ZD8$|Um`{D)nU=LKaEvnyx_J5%i-6Va?@*>=3(dQy` zOv%$_9l2B|+(t>qohkuU4r_P=R^6L#w%ZAlgKJTXc>KY|z0I<0!!XKF%RN#tUh0?7 zo&mDd(BFBOR&YFsKR7D3LD+X>+T1Br0a|9Osmff5CbBflb<2D8g-JfK* z&ZCu}gHBWT%@VZXv4*#$GWVcz4NS zUW`Eg+eXYmHkD1U{gn^+a}pPJ=0!^MIpSWCc{@wHRxyXEuuB9^>U&o{c{uJSWzxA? zIl8{#kiso|tAS zJ+q(EKiggeBE{==4|GRL3f6|STvOzrWuQXbl?gVyz6IGi_Fpz@ z*l9Y$SgA(5Gbj>Rgj|%pvYjZuATa9jajTL0f%JVr3$DIV=`lSHl=Iv;EjuGkBaI zeVE~2*A(04mm4xso+$46l@+Wh53?O{n~J^pIdZh0=Wv#F_x4jPQ5@=o*VJ2BgG|si z>ZrLz|6Kp12$kN)Z{fh5FRMn&7IYZ)PLhAQLHrCXG7h^`+LPWMU>I6Sd2b?2^&VUP z1Qhl1xY>ONWd8z^+p~G>JuTN9fcYtG_D&GH{Miv-sxTN`l%t(YbEz9F9xXKr=0Ku& zm6>b>n01zeRy%Y~EuQb9JgAJ~W;b@xFt>s)z?wvy+^9@5E zPXC!M_uSEUI`4}G7JcbX1;k{xzHz}qEwrfopdbEQjt{#bhkMSj9=f^owdGH z1I@eMYi%}qUg35bU1C}UczWu<%`!vIvL@`T@YT%Ta#XB=nln3Qo1q)s3`4aC?zx;F zSt-HW9An~W8hSVJo4;sq4wS41J6?MtJI-e@WmAidnb;xYu)>HrR)@pq(<#!Dfae!s zo|#R!(@U{z4EoffZ08Fd?K2!>`(9mai{BHgHJZk@&1dKaA{&>Wud{h8dSxpHj#i=1 z9QwPn9-zAvth)s)-=^0QQ}V4{H63R!0XCZ{wArJ->!S(c9fIO(SaI(R>#?;jn+OE8v|d4$70@itAv-IDZQ-52WupGq1TysYHl%a`h9KG&d=cJK>fv1Ebo5xhS-Ar zvt%Z8nVnxOXUe&LV`4lk(^J6_*J9gOQ;RbUzS3MDGQBin|MkX%O_c51=S#({;Lfue zto3N{=Udk39IJo%Jg#`YLDzw=mHDlG7hfhk+*Sc)W8m{%1f*xdszr^)0IQ^Lx` zpIbjMN0%Ag)Uz__E1C|xwqPM!KuGN;$Mzeg>UAA3{hMfE&oWtca8X2>Htg?=zSeg~ zrA+HbR%P-187KQ3CoTtVtc30fsd#cilcH%wm^{ODAAPnw=PYY^Rd zP`vw`VY?Q0tcN1-#x5B%efC82agDZewt(Dk;yv|q&R8nG{7pY^mgW>M9d7^0^__{^ zTTG}JL2ObO)11MSQ%rocU*d3cbi?1F^Zw(2mB<)!gwV3p?*61$o9U zD4_y&MiN8&3NFdJU-D~E*LB)QmitYz!z6Ap58^9g%T1=)In69Vc;kkIC4raRs?*d>YhqC7fH-(4sb`kP%CSX>jK1)FKaE{W0W3YK}+mApyv zpSCez4#NZ<8|p~*7v9{=QgD9~0qQ>u_P% zuinytH*uo%Uk=n?^8x($kWN_c+$s50H3Il80BpV8H=AS!3i|{7SpMQQtxKFU=FYmH zeY^jJh+g<4`m8v!^O>-NFLn~-RqlNxnZl2wd2A{Yc1G=Fa$d+Q&(N&rnPf+b7ser4x_TgJjitU_f4Z z;4Ro~ut27d?!YiD+QP@)T=77cR9~MK@bd~pY%X(h%L=(1M_DvEN~_~+xmZkm8A0Ga zQSWONI17_su5wpHg3sI?i9D+_Y|pCqVuHJNdHUauTD=R$Jb&2K_liQisqG$(sm=k9;L* z!L?*4B~hf6uioSX$zWJ?;q-SWXRFhz2Jt4%fOHA=Bwf|RzhwqdXGr78y$J)LR7&3T zE1WWz*>GPWKZ0%&@%6=fyx)5rzUpI;vy`u(RKzNG_1sI}IFCZ&UsR?8S! z!65@`-;RKl12LMka0L8&HsaA8{tWv8W-<}F|Nn<Px$?ny*JR5%f>l)FnDQ543{x%ZCiu33$Wg!pQFfT_}?5Q|_VSlIbLC`dpoMXL}9 zHfd9&47Mo(7D231gb+kjFxZHS4-m~7WurTH&doVX2KI5sU4v(sJ1@T9eCIKPjsqSr z)C01LsCxk=72-vXmX}CQD#BD;Cthymh&~=f$Q8nn0J<}ZrusBy4PvRNE}+1ceuj8u z0mW5k8fmgeLnTbWHGwfKA3@PdZxhn|PypR&^p?weGftrtCbjF#+zk_5BJh7;0`#Wr zgDpM_;Ax{jO##IrT`Oz;MvfwGfV$zD#c2xckpcXC6oou4ML~ezCc2EtnsQTB4tWNg z?4bkf;hG7IMfhgNI(FV5Gs4|*GyMTIY0$B=_*mso9Ityq$m^S>15>-?0(zQ<8Qy<_TjHE33(?_M8oaM zyc;NxzRVK@DL6RJnX%U^xW0Gpg(lXp(!uK1v0YgHjs^ZXSQ|m#lV7ip7{`C_J2TxPmfw%h$|%acrYHt)Re^PB%O&&=~a zhS(%I#+V>J-vjIib^<+s%ludY7y^C(P8nmqn9fp!i+?vr`bziDE=bx`%2W#Xyrj|i z!XQ4v1%L`m{7KT7q+LZNB^h8Ha2e=`Wp65^0;J00)_^G=au=8Yo;1b`CV&@#=jIBo zjN^JNVfYSs)+kDdGe7`1&8!?MQYKS?DuHZf3iogk_%#9E|5S zWeHrmAo>P;ejX7mwq#*}W25m^ZI+{(Z8fI?4jM_fffY0nok=+88^|*_DwcW>mR#e+ zX$F_KMdb6sRz!~7KkyN0G(3XQ+;z3X%PZ4gh;n-%62U<*VUKNv(D&Q->Na@Xb&u5Q3`3DGf+a8O5x7c#7+R+EAYl@R5us)CIw z7sT@_y~Ao@uL#&^LIh&QceqiT^+lb0YbFZt_SHOtWA%mgPEKVNvVgCsXy{5+zl*X8 zCJe)Q@y>wH^>l4;h1l^Y*9%-23TSmE>q5nI@?mt%n;Sj4Qq`Z+ib)a*a^cJc%E9^J zB;4s+K@rARbcBLT5P=@r;IVnBMKvT*)ew*R;&8vu%?Z&S>s?8?)3*YawM0P4!q$Kv zMmKh3lgE~&w&v%wVzH3Oe=jeNT=n@Y6J6TdHWTjXfX~-=1A1Bw`EW8rn}MqeI34nh zexFeA?&C3B2(E?0{drE@DA2pu(A#ElY&6el60Rn|Qpn-FkfQ8M93AfWIr)drgDFEU zghdWK)^71EWCP(@(=c4kfH1Y(4iugD4fve6;nSUpLT%!)MUHs1!zJYy4y||C+SwQ! z)KM&$7_tyM`sljP2fz6&Z;jxRn{Wup8IOUx8D4uh&(=O zx-7$a;U><*5L^!%xRlw)vAbh;sdlR||& ze}8_8%)c2Fwy=F&H|LM+p{pZB5DKTx>Y?F1N%BlZkXf!}JeGuMZk~LPi7{cidvUGB zAJ4LVeNV%XO>LTrklB#^-;8nb;}6l;1oW&WS=Mz*Az!4cqqQzbOSFq`$Q%PfD7srM zpKgP-D_0XPTRX*hAqeq0TDkJ;5HB1%$3Np)99#16c{ zJImlNL(npL!W|Gr_kxl1GVmF5&^$^YherS7+~q$p zt}{a=*RiD2Ikv6o=IM1kgc7zqpaZ;OB)P!1zz*i3{U()Dq#jG)egvK}@uFLa`oyWZ zf~=MV)|yJn`M^$N%ul5);JuQvaU1r2wt(}J_Qgyy`qWQI`hEeRX0uC@c1(dQ2}=U$ tNIIaX+dr)NRWXcxoR{>fqI{SF_dm1Ylv~=3YHI)h002ovPDHLkV1g(pWS;;4 diff --git a/dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png deleted file mode 100644 index f091b6b0bca859a3f474b03065bef75ba58a9e4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1588 zcmV-42Fv-0P)C1SqPt}wig>|5Crh^=oyX$BK<}M8eLU3e2hGT;=G|!_SP)7zNI6fqUMB=)y zRAZ>eDe#*r`yDAVgB_R*LB*MAc)8(b{g{9McCXW!lq7r(btRoB9!8B-#AI6JMb~YFBEvdsV)`mEQO^&#eRKx@b&x- z5lZm*!WfD8oCLzfHGz#u7sT0^VLMI1MqGxF^v+`4YYnVYgk*=kU?HsSz{v({E3lb9 z>+xILjBN)t6`=g~IBOelGQ(O990@BfXf(DRI5I$qN$0Gkz-FSc$3a+2fX$AedL4u{ z4V+5Ong(9LiGcIKW?_352sR;LtDPmPJXI{YtT=O8=76o9;*n%_m|xo!i>7$IrZ-{l z-x3`7M}qzHsPV@$v#>H-TpjDh2UE$9g6sysUREDy_R(a)>=eHw-WAyfIN z*qb!_hW>G)Tu8nSw9yn#3wFMiLcfc4pY0ek1}8(NqkBR@t4{~oC>ryc-h_ByH(Cg5 z>ao-}771+xE3um9lWAY1FeQFxowa1(!J(;Jg*wrg!=6FdRX+t_<%z&d&?|Bn){>zm zZQj(aA_HeBY&OC^jj*)N`8fa^ePOU72VpInJoI1?`ty#lvlNzs(&MZX+R%2xS~5Kh zX*|AU4QE#~SgPzOXe9>tRj>hjU@c1k5Y_mW*Jp3fI;)1&g3j|zDgC+}2Q_v%YfDax z!?umcN^n}KYQ|a$Lr+51Nf9dkkYFSjZZjkma$0KOj+;aQ&721~t7QUKx61J3(P4P1 zstI~7-wOACnWP4=8oGOwz%vNDqD8w&Q`qcNGGrbbf&0s9L0De{4{mRS?o0MU+nR_! zrvshUau0G^DeMhM_v{5BuLjb#Hh@r23lDAk8oF(C+P0rsBpv85EP>4CVMx#04MOfG z;P%vktHcXwTj~+IE(~px)3*MY77e}p#|c>TD?sMatC0Tu4iKKJ0(X8jxQY*gYtxsC z(zYC$g|@+I+kY;dg_dE>scBf&bP1Nc@Hz<3R)V`=AGkc;8CXqdi=B4l2k|g;2%#m& z*jfX^%b!A8#bI!j9-0Fi0bOXl(-c^AB9|nQaE`*)Hw+o&jS9@7&Gov#HbD~#d{twV zXd^Tr^mWLfFh$@Dr$e;PBEz4(-2q1FF0}c;~B5sA}+Q>TOoP+t>wf)V9Iy=5ruQa;z)y zI9C9*oUga6=hxw6QasLPnee@3^Rr*M{CdaL5=R41nLs(AHk_=Y+A9$2&H(B7!_pURs&8aNw7?`&Z&xY_Ye z)~D5Bog^td-^QbUtkTirdyK^mTHAOuptDflut!#^lnKqU md>ggs(5nOWAqO?umG&QVYK#ibz}*4>0000U6E9hRK9^#O7(mu>ETqrXGsduA8$)?`v2seloOCza43C{NQ$$gAOH**MCn0Q?+L7dl7qnbRdqZ8LSVp1ItDxhxD?t@5_yHg6A8yI zC*%Wgg22K|8E#!~cTNYR~@Y9KepMPrrB8cABapAFa=`H+UGhkXUZV1GnwR1*lPyZ;*K(i~2gp|@bzp8}og7e*#% zEnr|^CWdVV!-4*Y_7rFvlww2Ze+>j*!Z!pQ?2l->4q#nqRu9`ELo6RMS5=br47g_X zRw}P9a7RRYQ%2Vsd0Me{_(EggTnuN6j=-?uFS6j^u69elMypu?t>op*wBx<=Wx8?( ztpe^(fwM6jJX7M-l*k3kEpWOl_Vk3@(_w4oc}4YF4|Rt=2V^XU?#Yz`8(e?aZ@#li0n*=g^qOcVpd-Wbok=@b#Yw zqn8u9a)z>l(1kEaPYZ6hwubN6i<8QHgsu0oE) ziJ(p;Wxm>sf!K+cw>R-(^Y2_bahB+&KI9y^);#0qt}t-$C|Bo71lHi{_+lg#f%RFy z0um=e3$K3i6K{U_4K!EX?F&rExl^W|G8Z8;`5z-k}OGNZ0#WVb$WCpQu-_YsiqKP?BB# vzVHS-CTUF4Ozn5G+mq_~Qqto~ahA+K`|lyv3(-e}00000NkvXXu0mjfd`9t{ diff --git a/dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png deleted file mode 100644 index d0ef06e7edb86cdfe0d15b4b0d98334a86163658..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1716 zcmds$`#;kQ7{|XelZftyR5~xW7?MLxS4^|Hw3&P7^y)@A9Fj{Xm1~_CIV^XZ%SLBn zA;!r`GqGHg=7>xrB{?psZQs88ZaedDoagm^KF{a*>G|dJWRSe^I$DNW008I^+;Kjt z>9p3GNR^I;v>5_`+91i(*G;u5|L+Bu6M=(afLjtkya#yZ175|z$pU~>2#^Z_pCZ7o z1c6UNcv2B3?; zX%qdxCXQpdKRz=#b*q0P%b&o)5ZrNZt7$fiETSK_VaY=mb4GK`#~0K#~9^ zcY!`#Af+4h?UMR-gMKOmpuYeN5P*RKF!(tb`)oe0j2BH1l?=>y#S5pMqkx6i{*=V9JF%>N8`ewGhRE(|WohnD59R^$_36{4>S zDFlPC5|k?;SPsDo87!B{6*7eqmMdU|QZ84>6)Kd9wNfh90=y=TFQay-0__>=<4pk& zYDjgIhL-jQ9o>z32K)BgAH+HxamL{ZL~ozu)Qqe@a`FpH=oQRA8=L-m-1dam(Ix2V z?du;LdMO+ooBelr^_y4{|44tmgH^2hSzPFd;U^!1p>6d|o)(-01z{i&Kj@)z-yfWQ)V#3Uo!_U}q3u`(fOs`_f^ueFii1xBNUB z6MecwJN$CqV&vhc+)b(p4NzGGEgwWNs z@*lUV6LaduZH)4_g!cE<2G6#+hJrWd5(|p1Z;YJ7ifVHv+n49btR}dq?HHDjl{m$T z!jLZcGkb&XS2OG~u%&R$(X+Z`CWec%QKt>NGYvd5g20)PU(dOn^7%@6kQb}C(%=vr z{?RP(z~C9DPnL{q^@pVw@|Vx~@3v!9dCaBtbh2EdtoNHm4kGxp>i#ct)7p|$QJs+U z-a3qtcPvhihub?wnJqEt>zC@)2suY?%-96cYCm$Q8R%-8$PZYsx3~QOLMDf(piXMm zB=<63yQk1AdOz#-qsEDX>>c)EES%$owHKue;?B3)8aRd}m~_)>SL3h2(9X;|+2#7X z+#2)NpD%qJvCQ0a-uzZLmz*ms+l*N}w)3LRQ*6>|Ub-fyptY(keUxw+)jfwF5K{L9 z|Cl_w=`!l_o><384d&?)$6Nh(GAm=4p_;{qVn#hI8lqewW7~wUlyBM-4Z|)cZr?Rh z=xZ&Ol>4(CU85ea(CZ^aO@2N18K>ftl8>2MqetAR53_JA>Fal`^)1Y--Am~UDa4th zKfCYpcXky$XSFDWBMIl(q=Mxj$iMBX=|j9P)^fDmF(5(5$|?Cx}DKEJa&XZP%OyE`*GvvYQ4PV&!g2|L^Q z?YG}tx;sY@GzMmsY`7r$P+F_YLz)(e}% zyakqFB<6|x9R#TdoP{R$>o7y(-`$$p0NxJ6?2B8tH)4^yF(WhqGZlM3=9Ibs$%U1w zWzcss*_c0=v_+^bfb`kBFsI`d;ElwiU%frgRB%qBjn@!0U2zZehBn|{%uNIKBA7n= zzE`nnwTP85{g;8AkYxA68>#muXa!G>xH22D1I*SiD~7C?7Za+9y7j1SHiuSkKK*^O zsZ==KO(Ua#?YUpXl{ViynyT#Hzk=}5X$e04O@fsMQjb}EMuPWFO0e&8(2N(29$@Vd zn1h8Yd>6z(*p^E{c(L0Lg=wVdupg!z@WG;E0k|4a%s7Up5C0c)55XVK*|x9RQeZ1J@1v9MX;>n34(i>=YE@Iur`0Vah(inE3VUFZNqf~tSz{1fz3Fsn_x4F>o(Yo;kpqvBe-sbwH(*Y zu$JOl0b83zu$JMvy<#oH^Wl>aWL*?aDwnS0iEAwC?DK@aT)GHRLhnz2WCvf3Ba;o=aY7 z2{Asu5MEjGOY4O#Ggz@@J;q*0`kd2n8I3BeNuMmYZf{}pg=jTdTCrIIYuW~luKecn z+E-pHY%ohj@uS0%^ z&(OxwPFPD$+#~`H?fMvi9geVLci(`K?Kj|w{rZ9JgthFHV+=6vMbK~0)Ea<&WY-NC zy-PnZft_k2tfeQ*SuC=nUj4H%SQ&Y$gbH4#2sT0cU0SdFs=*W*4hKGpuR1{)mV;Qf5pw4? zfiQgy0w3fC*w&Bj#{&=7033qFR*<*61B4f9K%CQvxEn&bsWJ{&winp;FP!KBj=(P6 z4Z_n4L7cS;ao2)ax?Tm|I1pH|uLpDSRVghkA_UtFFuZ0b2#>!8;>-_0ELjQSD-DRd z4im;599VHDZYtnWZGAB25W-e(2VrzEh|etsv2YoP#VbIZ{aFkwPrzJ#JvCvA*mXS& z`}Q^v9(W4GiSs}#s7BaN!WA2bniM$0J(#;MR>uIJ^uvgD3GS^%*ikdW6-!VFUU?JV zZc2)4cMsX@j z5HQ^e3BUzOdm}yC-xA%SY``k$rbfk z;CHqifhU*jfGM@DkYCecD9vl*qr58l6x<8URB=&%{!Cu3RO*MrKZ4VO}V6R0a zZw3Eg^0iKWM1dcTYZ0>N899=r6?+adUiBKPciJw}L$=1f4cs^bio&cr9baLF>6#BM z(F}EXe-`F=f_@`A7+Q&|QaZ??Txp_dB#lg!NH=t3$G8&06MFhwR=Iu*Im0s_b2B@| znW>X}sy~m#EW)&6E&!*0%}8UAS)wjt+A(io#wGI@Z2S+Ms1Cxl%YVE800007ip7{`C_J2TxPmfw%h$|%acrYHt)Re^PB%O&&=~a zhS(%I#+V>J-vjIib^<+s%ludY7y^C(P8nmqn9fp!i+?vr`bziDE=bx`%2W#Xyrj|i z!XQ4v1%L`m{7KT7q+LZNB^h8Ha2e=`Wp65^0;J00)_^G=au=8Yo;1b`CV&@#=jIBo zjN^JNVfYSs)+kDdGe7`1&8!?MQYKS?DuHZf3iogk_%#9E|5S zWeHrmAo>P;ejX7mwq#*}W25m^ZI+{(Z8fI?4jM_fffY0nok=+88^|*_DwcW>mR#e+ zX$F_KMdb6sRz!~7KkyN0G(3XQ+;z3X%PZ4gh;n-%62U<*VUKNv(D&Q->Na@Xb&u5Q3`3DGf+a8O5x7c#7+R+EAYl@R5us)CIw z7sT@_y~Ao@uL#&^LIh&QceqiT^+lb0YbFZt_SHOtWA%mgPEKVNvVgCsXy{5+zl*X8 zCJe)Q@y>wH^>l4;h1l^Y*9%-23TSmE>q5nI@?mt%n;Sj4Qq`Z+ib)a*a^cJc%E9^J zB;4s+K@rARbcBLT5P=@r;IVnBMKvT*)ew*R;&8vu%?Z&S>s?8?)3*YawM0P4!q$Kv zMmKh3lgE~&w&v%wVzH3Oe=jeNT=n@Y6J6TdHWTjXfX~-=1A1Bw`EW8rn}MqeI34nh zexFeA?&C3B2(E?0{drE@DA2pu(A#ElY&6el60Rn|Qpn-FkfQ8M93AfWIr)drgDFEU zghdWK)^71EWCP(@(=c4kfH1Y(4iugD4fve6;nSUpLT%!)MUHs1!zJYy4y||C+SwQ! z)KM&$7_tyM`sljP2fz6&Z;jxRn{Wup8IOUx8D4uh&(=O zx-7$a;U><*5L^!%xRlw)vAbh;sdlR||& ze}8_8%)c2Fwy=F&H|LM+p{pZB5DKTx>Y?F1N%BlZkXf!}JeGuMZk~LPi7{cidvUGB zAJ4LVeNV%XO>LTrklB#^-;8nb;}6l;1oW&WS=Mz*Az!4cqqQzbOSFq`$Q%PfD7srM zpKgP-D_0XPTRX*hAqeq0TDkJ;5HB1%$3Np)99#16c{ zJImlNL(npL!W|Gr_kxl1GVmF5&^$^YherS7+~q$p zt}{a=*RiD2Ikv6o=IM1kgc7zqpaZ;OB)P!1zz*i3{U()Dq#jG)egvK}@uFLa`oyWZ zf~=MV)|yJn`M^$N%ul5);JuQvaU1r2wt(}J_Qgyy`qWQI`hEeRX0uC@c1(dQ2}=U$ tNIIaX+dr)NRWXcxoR{>fqI{SF_dm1Ylv~=3YHI)h002ovPDHLkV1g(pWS;;4 diff --git a/dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png deleted file mode 100644 index c8f9ed8f5cee1c98386d13b17e89f719e83555b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1895 zcmV-t2blPYP)FQtfgmafE#=YDCq`qUBt#QpG%*H6QHY765~R=q zZ6iudfM}q!Pz#~9JgOi8QJ|DSu?1-*(kSi1K4#~5?#|rh?sS)(-JQqX*}ciXJ56_H zdw=^s_srbAdqxlvGyrgGet#6T7_|j;95sL%MtM;q86vOxKM$f#puR)Bjv9Zvz9-di zXOTSsZkM83)E9PYBXC<$6(|>lNLVBb&&6y{NByFCp%6+^ALR@NCTse_wqvNmSWI-m z!$%KlHFH2omF!>#%1l3LTZg(s7eof$7*xB)ZQ0h?ejh?Ta9fDv59+u#MokW+1t8Zb zgHv%K(u9G^Lv`lh#f3<6!JVTL3(dCpxHbnbA;kKqQyd1~^Xe0VIaYBSWm6nsr;dFj z4;G-RyL?cYgsN1{L4ZFFNa;8)Rv0fM0C(~Tkit94 zz#~A)59?QjD&pAPSEQ)p8gP|DS{ng)j=2ux)_EzzJ773GmQ_Cic%3JJhC0t2cx>|v zJcVusIB!%F90{+}8hG3QU4KNeKmK%T>mN57NnCZ^56=0?&3@!j>a>B43pi{!u z7JyDj7`6d)qVp^R=%j>UIY6f+3`+qzIc!Y_=+uN^3BYV|o+$vGo-j-Wm<10%A=(Yk^beI{t%ld@yhKjq0iNjqN4XMGgQtbKubPM$JWBz}YA65k%dm*awtC^+f;a-x4+ddbH^7iDWGg&N0n#MW{kA|=8iMUiFYvMoDY@sPC#t$55gn6ykUTPAr`a@!(;np824>2xJthS z*ZdmT`g5-`BuJs`0LVhz+D9NNa3<=6m;cQLaF?tCv8)zcRSh66*Z|vXhG@$I%U~2l z?`Q zykI#*+rQ=z6Jm=Bui-SfpDYLA=|vzGE(dYm=OC8XM&MDo7ux4UF1~0J1+i%aCUpRe zt3L_uNyQ*cE(38Uy03H%I*)*Bh=Lb^Xj3?I^Hnbeq72(EOK^Y93CNp*uAA{5Lc=ky zx=~RKa4{iTm{_>_vSCm?$Ej=i6@=m%@VvAITnigVg{&@!7CDgs908761meDK5azA} z4?=NOH|PdvabgJ&fW2{Mo$Q0CcD8Qc84%{JPYt5EiG{MdLIAeX%T=D7NIP4%Hw}p9 zg)==!2Lbp#j{u_}hMiao9=!VSyx0gHbeCS`;q&vzeq|fs`y&^X-lso(Ls@-706qmA z7u*T5PMo_w3{se1t2`zWeO^hOvTsohG_;>J0wVqVe+n)AbQCx)yh9;w+J6?NF5Lmo zecS@ieAKL8%bVd@+-KT{yI|S}O>pYckUFs;ry9Ow$CD@ztz5K-*D$^{i(_1llhSh^ zEkL$}tsQt5>QA^;QgjgIfBDmcOgi5YDyu?t6vSnbp=1+@6D& z5MJ}B8q;bRlVoxasyhcUF1+)o`&3r0colr}QJ3hcSdLu;9;td>kf@Tcn<@9sIx&=m z;AD;SCh95=&p;$r{Xz3iWCO^MX83AGJ(yH&eTXgv|0=34#-&WAmw{)U7OU9!Wz^!7 zZ%jZFi@JR;>Mhi7S>V7wQ176|FdW2m?&`qa(ScO^CFPR80HucLHOTy%5s*HR0^8)i h0WYBP*#0Ks^FNSabJA*5${_#%002ovPDHLkV1oKhTl@e3 diff --git a/dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png deleted file mode 100644 index a6d6b8609df07bf62e5100a53a01510388bd2b22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2665 zcmV-v3YPVWP)oFh3q0MFesq&64WThn3$;G69TfjsAv=f2G9}p zgSx99+!YV6qME!>9MD13x)k(+XE7W?_O4LoLb5ND8 zaV{9+P@>42xDfRiYBMSgD$0!vssptcb;&?u9u(LLBKmkZ>RMD=kvD3h`sk6!QYtBa ztlZI#nu$8lJ^q2Z79UTgZe>BU73(Aospiq+?SdMt8lDZ;*?@tyWVZVS_Q7S&*tJaiRlJ z+aSMOmbg3@h5}v;A*c8SbqM3icg-`Cnwl;7Ts%A1RkNIp+Txl-Ckkvg4oxrqGA5ewEgYqwtECD<_3Egu)xGllKt&J8g&+=ac@Jq4-?w6M3b*>w5 z69N3O%=I^6&UL5gZ!}trC7bUj*12xLdkNs~Bz4QdJJ*UDZox2UGR}SNg@lmOvhCc~ z*f_UeXv(=#I#*7>VZx2ObEN~UoGUTl=-@)E;YtCRZ>SVp$p9yG5hEFZ!`wI!spd)n zSk+vK0Vin7FL{7f&6OB%f;SH22dtbcF<|9fi2Fp%q4kxL!b1#l^)8dUwJ zwEf{(wJj@8iYDVnKB`eSU+;ml-t2`@%_)0jDM`+a46xhDbBj2+&Ih>1A>6aky#(-SYyE{R3f#y57wfLs z6w1p~$bp;6!9DX$M+J~S@D6vJAaElETnsX4h9a5tvPhC3L@qB~bOzkL@^z0k_hS{T4PF*TDrgdXp+dzsE? z>V|VR035Pl9n5&-RePFdS{7KAr2vPOqR9=M$vXA1Yy5>w;EsF`;OK{2pkn-kpp9Pw z)r;5JfJKKaT$4qCb{TaXHjb$QA{y0EYy*+b1XI;6Ah- zw13P)xT`>~eFoJC!>{2XL(a_#upp3gaR1#5+L(Jmzp4TBnx{~WHedpJ1ch8JFk~Sw z>F+gN+i+VD?gMXwcIhn8rz`>e>J^TI3E-MW>f}6R-pL}>WMOa0k#jN+`RyUVUC;#D zg|~oS^$6%wpF{^Qr+}X>0PKcr3Fc&>Z>uv@C);pwDs@2bZWhYP!rvGx?_|q{d`t<*XEb#=aOb=N+L@CVBGqImZf&+a zCQEa3$~@#kC);pasdG=f6tuIi0PO-y&tvX%>Mv=oY3U$nD zJ#gMegnQ46pq+3r=;zmgcG+zRc9D~c>z+jo9&D+`E6$LmyFqlmCYw;-Zooma{sR@~ z)_^|YL1&&@|GXo*pivH7k!msl+$Sew3%XJnxajt0K%3M6Bd&YFNy9}tWG^aovK2eX z1aL1%7;KRDrA@eG-Wr6w+;*H_VD~qLiVI`{_;>o)k`{8xa3EJT1O_>#iy_?va0eR? zDV=N%;Zjb%Z2s$@O>w@iqt!I}tLjGk!=p`D23I}N4Be@$(|iSA zf3Ih7b<{zqpDB4WF_5X1(peKe+rASze%u8eKLn#KKXt;UZ+Adf$_TO+vTqshLLJ5c z52HucO=lrNVae5XWOLm!V@n-ObU11!b+DN<$RuU+YsrBq*lYT;?AwJpmNKniF0Q1< zJCo>Q$=v$@&y=sj6{r!Y&y&`0$-I}S!H_~pI&2H8Z1C|BX4VgZ^-! zje3-;x0PBD!M`v*J_)rL^+$<1VJhH*2Fi~aA7s&@_rUHYJ9zD=M%4AFQ`}k8OC$9s XsPq=LnkwKG00000NkvXXu0mjfhAk5^ diff --git a/dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png deleted file mode 100644 index a6d6b8609df07bf62e5100a53a01510388bd2b22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2665 zcmV-v3YPVWP)oFh3q0MFesq&64WThn3$;G69TfjsAv=f2G9}p zgSx99+!YV6qME!>9MD13x)k(+XE7W?_O4LoLb5ND8 zaV{9+P@>42xDfRiYBMSgD$0!vssptcb;&?u9u(LLBKmkZ>RMD=kvD3h`sk6!QYtBa ztlZI#nu$8lJ^q2Z79UTgZe>BU73(Aospiq+?SdMt8lDZ;*?@tyWVZVS_Q7S&*tJaiRlJ z+aSMOmbg3@h5}v;A*c8SbqM3icg-`Cnwl;7Ts%A1RkNIp+Txl-Ckkvg4oxrqGA5ewEgYqwtECD<_3Egu)xGllKt&J8g&+=ac@Jq4-?w6M3b*>w5 z69N3O%=I^6&UL5gZ!}trC7bUj*12xLdkNs~Bz4QdJJ*UDZox2UGR}SNg@lmOvhCc~ z*f_UeXv(=#I#*7>VZx2ObEN~UoGUTl=-@)E;YtCRZ>SVp$p9yG5hEFZ!`wI!spd)n zSk+vK0Vin7FL{7f&6OB%f;SH22dtbcF<|9fi2Fp%q4kxL!b1#l^)8dUwJ zwEf{(wJj@8iYDVnKB`eSU+;ml-t2`@%_)0jDM`+a46xhDbBj2+&Ih>1A>6aky#(-SYyE{R3f#y57wfLs z6w1p~$bp;6!9DX$M+J~S@D6vJAaElETnsX4h9a5tvPhC3L@qB~bOzkL@^z0k_hS{T4PF*TDrgdXp+dzsE? z>V|VR035Pl9n5&-RePFdS{7KAr2vPOqR9=M$vXA1Yy5>w;EsF`;OK{2pkn-kpp9Pw z)r;5JfJKKaT$4qCb{TaXHjb$QA{y0EYy*+b1XI;6Ah- zw13P)xT`>~eFoJC!>{2XL(a_#upp3gaR1#5+L(Jmzp4TBnx{~WHedpJ1ch8JFk~Sw z>F+gN+i+VD?gMXwcIhn8rz`>e>J^TI3E-MW>f}6R-pL}>WMOa0k#jN+`RyUVUC;#D zg|~oS^$6%wpF{^Qr+}X>0PKcr3Fc&>Z>uv@C);pwDs@2bZWhYP!rvGx?_|q{d`t<*XEb#=aOb=N+L@CVBGqImZf&+a zCQEa3$~@#kC);pasdG=f6tuIi0PO-y&tvX%>Mv=oY3U$nD zJ#gMegnQ46pq+3r=;zmgcG+zRc9D~c>z+jo9&D+`E6$LmyFqlmCYw;-Zooma{sR@~ z)_^|YL1&&@|GXo*pivH7k!msl+$Sew3%XJnxajt0K%3M6Bd&YFNy9}tWG^aovK2eX z1aL1%7;KRDrA@eG-Wr6w+;*H_VD~qLiVI`{_;>o)k`{8xa3EJT1O_>#iy_?va0eR? zDV=N%;Zjb%Z2s$@O>w@iqt!I}tLjGk!=p`D23I}N4Be@$(|iSA zf3Ih7b<{zqpDB4WF_5X1(peKe+rASze%u8eKLn#KKXt;UZ+Adf$_TO+vTqshLLJ5c z52HucO=lrNVae5XWOLm!V@n-ObU11!b+DN<$RuU+YsrBq*lYT;?AwJpmNKniF0Q1< zJCo>Q$=v$@&y=sj6{r!Y&y&`0$-I}S!H_~pI&2H8Z1C|BX4VgZ^-! zje3-;x0PBD!M`v*J_)rL^+$<1VJhH*2Fi~aA7s&@_rUHYJ9zD=M%4AFQ`}k8OC$9s XsPq=LnkwKG00000NkvXXu0mjfhAk5^ diff --git a/dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png deleted file mode 100644 index 75b2d164a5a98e212cca15ea7bf2ab5de5108680..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3831 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 diff --git a/dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/dev/integration_tests/ios_add2app/ios_add2app/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png deleted file mode 100644 index c4df70d39da7941ef3f6dcb7f06a192d8dcb308d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1888 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 iW8 - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - LSRequiresIPhoneOS - - UILaunchStoryboardName - Launch Screen - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - - diff --git a/dev/integration_tests/ios_add2app/ios_add2app/Launch Screen.storyboard b/dev/integration_tests/ios_add2app/ios_add2app/Launch Screen.storyboard deleted file mode 100644 index 6a6b1b8249f..00000000000 --- a/dev/integration_tests/ios_add2app/ios_add2app/Launch Screen.storyboard +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dev/integration_tests/ios_add2app/ios_add2app/main.m b/dev/integration_tests/ios_add2app/ios_add2app/main.m deleted file mode 100644 index 88e08ea2ec4..00000000000 --- a/dev/integration_tests/ios_add2app/ios_add2app/main.m +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright 2014 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. - -#import -#import "AppDelegate.h" - -int main(int argc, char * argv[]) { - @autoreleasepool { - return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); - } -} diff --git a/dev/integration_tests/ios_add2app/ios_add2appTests/FlutterViewControllerTests.m b/dev/integration_tests/ios_add2app/ios_add2appTests/FlutterViewControllerTests.m deleted file mode 100644 index 652cfb43ac0..00000000000 --- a/dev/integration_tests/ios_add2app/ios_add2appTests/FlutterViewControllerTests.m +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2014 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. - -// TODO(dnfield): This belongs in the engine repo. -#import -#import - -@interface ViewControllerRelease : XCTestCase -@end - - -@implementation ViewControllerRelease - -- (void)testReleaseFlutterViewController { - __weak FlutterEngine* weakEngine; - @autoreleasepool { - FlutterViewController* viewController = [[FlutterViewController alloc] - init]; - weakEngine = viewController.engine; - [viewController viewWillAppear:NO]; - [viewController viewDidDisappear:NO]; - } - XCTAssertNil(weakEngine, @"Engine failed to release."); -} - -@end diff --git a/dev/integration_tests/ios_add2app/ios_add2appTests/IntegrationTests.m b/dev/integration_tests/ios_add2app/ios_add2appTests/IntegrationTests.m deleted file mode 100644 index a452a2aba57..00000000000 --- a/dev/integration_tests/ios_add2app/ios_add2appTests/IntegrationTests.m +++ /dev/null @@ -1,186 +0,0 @@ -// Copyright 2014 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. - -#import -#import - -#import "../ios_add2app/AppDelegate.h" -#import "../ios_add2app/DualFlutterViewController.h" -#import "../ios_add2app/FullScreenViewController.h" -#import "../ios_add2app/MainViewController.h" -#import "../ios_add2app/HybridViewController.h" - -@interface FlutterTests : XCTestCase -@end - -@implementation FlutterTests { - int _flutterWarmEngineTaps; -} - -- (instancetype)init { - self = [super init]; - - if (self) { - _flutterWarmEngineTaps = 0; - } - - return self; -} - -- (void)expectSemanticsNotification:(FlutterViewController*)viewController { - [self expectationForNotification:FlutterSemanticsUpdateNotification object:viewController handler:nil]; - [viewController.engine ensureSemanticsEnabled]; - [self waitForExpectationsWithTimeout:30.0 handler:nil]; -} - -- (void)testFullScreenCanPop { - [[EarlGrey selectElementWithMatcher:grey_keyWindow()] - assertWithMatcher:grey_sufficientlyVisible()]; - - [[EarlGrey selectElementWithMatcher:grey_buttonTitle(@"Full Screen (Cold)")] - performAction:grey_tap()]; - - __weak FlutterViewController *weakViewController; - @autoreleasepool { - UINavigationController *navController = - (UINavigationController *)((AppDelegate *) - [[UIApplication sharedApplication] - delegate]) - .window.rootViewController; - weakViewController = - (FullScreenViewController *)navController.visibleViewController; - [self expectSemanticsNotification:weakViewController]; - GREYAssertNotNil(weakViewController, - @"Expected non-nil FullScreenViewController."); - } - - [[EarlGrey selectElementWithMatcher:grey_accessibilityLabel(@"POP")] - performAction:grey_tap()]; - // EarlGrey v1 isn't good at detecting this yet - 2.0 will be able to do it - int tries = 10; - double delay = 1.0; - while (weakViewController != nil && tries != 0) { - CFRunLoopRunInMode(kCFRunLoopDefaultMode, delay, false); - tries--; - } - [[EarlGrey selectElementWithMatcher:grey_buttonTitle(@"Native iOS View")] - assertWithMatcher:grey_sufficientlyVisible()]; - GREYAssertNil(weakViewController, - @"Expected FullScreenViewController to be deallocated."); -} - -- (void)testDualFlutterView { - [[EarlGrey selectElementWithMatcher:grey_keyWindow()] - assertWithMatcher:grey_sufficientlyVisible()]; - - [[EarlGrey - selectElementWithMatcher:grey_buttonTitle(@"Dual Flutter View (Cold)")] - performAction:grey_tap()]; - - @autoreleasepool { - UINavigationController *navController = - (UINavigationController *)((AppDelegate *) - [[UIApplication sharedApplication] - delegate]) - .window.rootViewController; - DualFlutterViewController *viewController = - (DualFlutterViewController *)navController.visibleViewController; - GREYAssertNotNil(viewController, - @"Expected non-nil DualFlutterViewController."); - [self expectSemanticsNotification:viewController.topFlutterViewController]; - [self expectSemanticsNotification:viewController.bottomFlutterViewController]; - } - - // Verify that there are two Flutter views with the expected marquee text. - [[[EarlGrey - selectElementWithMatcher:grey_accessibilityLabel(@"This is Marquee")] - atIndex:0] assertWithMatcher:grey_notNil()]; - [[[EarlGrey - selectElementWithMatcher:grey_accessibilityLabel(@"This is Marquee")] - atIndex:1] assertWithMatcher:grey_notNil()]; - - [[EarlGrey selectElementWithMatcher:grey_buttonTitle(@"Back")] - performAction:grey_tap()]; - - [[EarlGrey selectElementWithMatcher:grey_buttonTitle(@"Native iOS View")] - assertWithMatcher:grey_sufficientlyVisible()]; -} - -- (void)testHybridView { - [[EarlGrey selectElementWithMatcher:grey_keyWindow()] - assertWithMatcher:grey_sufficientlyVisible()]; - - [[EarlGrey selectElementWithMatcher:grey_buttonTitle(@"Hybrid View (Warm)")] - performAction:grey_tap()]; - - @autoreleasepool { - UINavigationController *navController = - (UINavigationController *)((AppDelegate *) - [[UIApplication sharedApplication] - delegate]) - .window.rootViewController; - HybridViewController *viewController = - (HybridViewController *)navController.visibleViewController; - GREYAssertNotNil(viewController.flutterViewController, - @"Expected non-nil FlutterViewController."); - [self expectSemanticsNotification:viewController.flutterViewController]; - } - - [self validateCountsFlutter:@"Platform" count:0]; - [self validateCountsPlatform:@"Flutter" count:_flutterWarmEngineTaps]; - - static const int platformTapCount = 4; - static const int flutterTapCount = 6; - - for (int i = _flutterWarmEngineTaps; i < flutterTapCount; - i++, _flutterWarmEngineTaps++) { - [[EarlGrey selectElementWithMatcher:grey_accessibilityLabel( - @"Increment via Flutter")] - performAction:grey_tap()]; - } - - [self validateCountsFlutter:@"Platform" count:0]; - [self validateCountsPlatform:@"Flutter" count:_flutterWarmEngineTaps]; - - for (int i = 0; i < platformTapCount; i++) { - [[EarlGrey - selectElementWithMatcher:grey_accessibilityLabel(@"Increment via iOS")] - performAction:grey_tap()]; - } - - [self validateCountsFlutter:@"Platform" count:platformTapCount]; - [self validateCountsPlatform:@"Flutter" count:_flutterWarmEngineTaps]; - - [[EarlGrey selectElementWithMatcher:grey_buttonTitle(@"Back")] - performAction:grey_tap()]; - [[EarlGrey selectElementWithMatcher:grey_buttonTitle(@"Native iOS View")] - assertWithMatcher:grey_sufficientlyVisible()]; -} - -/** Validates that the text labels showing the number of button taps match the - * expected counts. */ -- (void)validateCountsFlutter:(NSString *)labelPrefix count:(int)flutterCount { - NSString *flutterCountStr = - [NSString stringWithFormat:@"%@ button tapped %d times.", labelPrefix, - flutterCount]; - - // TODO(https://github.com/flutter/flutter/issues/17988): Flutter doesn't - // expose accessibility IDs, so the best we can do is to search for an element - // with the text we expect. - [[EarlGrey selectElementWithMatcher:grey_accessibilityLabel(flutterCountStr)] - assertWithMatcher:grey_sufficientlyVisible()]; -} - -- (void)validateCountsPlatform:(NSString *)labelPrefix - count:(int)platformCount { - NSString *platformCountStr = - [NSString stringWithFormat:@"%@ button tapped %d times.", labelPrefix, - platformCount]; - - [[[EarlGrey selectElementWithMatcher:grey_accessibilityID(@"counter_on_iOS")] - assertWithMatcher:grey_text(platformCountStr)] - assertWithMatcher:grey_sufficientlyVisible()]; -} - -@end diff --git a/dev/integration_tests/ios_host_app/FlutterUITests/FlutterUITests.m b/dev/integration_tests/ios_host_app/FlutterUITests/FlutterUITests.m new file mode 100644 index 00000000000..771171feac0 --- /dev/null +++ b/dev/integration_tests/ios_host_app/FlutterUITests/FlutterUITests.m @@ -0,0 +1,98 @@ +// Copyright 2014 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. + +@import XCTest; + +@interface FlutterUITests : XCTestCase +@end + +@implementation FlutterUITests + +- (void)setUp { + self.continueAfterFailure = NO; +} + +- (void)testFullScreenColdPop { + XCUIApplication *app = [[XCUIApplication alloc] init]; + [app launch]; + + [app.buttons[@"Full Screen (Cold)"] tap]; + + XCTAssertTrue([app.otherElements[@"Button tapped 0 times."] waitForExistenceWithTimeout:1.0]); + [app.otherElements[@"Increment via Flutter"] tap]; + XCTAssertTrue([app.otherElements[@"Button tapped 1 time."] waitForExistenceWithTimeout:1.0]); + + // Back navigation. + [app.buttons[@"POP"] tap]; + XCTAssertTrue([app.navigationBars[@"Flutter iOS Demos Home"] waitForExistenceWithTimeout:1.0]); +} + +- (void)testFullScreenWarm { + XCUIApplication *app = [[XCUIApplication alloc] init]; + [app launch]; + + [app.buttons[@"Full Screen (Warm)"] tap]; + + XCTAssertTrue([app.otherElements[@"Button tapped 0 times."] waitForExistenceWithTimeout:1.0]); + [app.otherElements[@"Increment via Flutter"] tap]; + XCTAssertTrue([app.otherElements[@"Button tapped 1 time."] waitForExistenceWithTimeout:1.0]); + + // Back navigation. + [app.buttons[@"POP"] tap]; + XCTAssertTrue([app.navigationBars[@"Flutter iOS Demos Home"] waitForExistenceWithTimeout:1.0]); +} + +- (void)testFlutterViewWarm { + XCUIApplication *app = [[XCUIApplication alloc] init]; + [app launch]; + + [app.buttons[@"Flutter View (Warm)"] tap]; + + XCTAssertTrue([app.otherElements[@"Button tapped 0 times."] waitForExistenceWithTimeout:1.0]); + [app.otherElements[@"Increment via Flutter"] tap]; + XCTAssertTrue([app.otherElements[@"Button tapped 1 time."] waitForExistenceWithTimeout:1.0]); + + // Back navigation. + [app.buttons[@"POP"] tap]; + XCTAssertTrue([app.navigationBars[@"Flutter iOS Demos Home"] waitForExistenceWithTimeout:1.0]); +} + +- (void)testHybridViewWarm { + XCUIApplication *app = [[XCUIApplication alloc] init]; + [app launch]; + + [app.buttons[@"Hybrid View (Warm)"] tap]; + + XCTAssertTrue([app.staticTexts[@"Flutter button tapped 0 times."] waitForExistenceWithTimeout:1.0]); + XCTAssertTrue(app.otherElements[@"Platform button tapped 0 times."].exists); + + [app.otherElements[@"Increment via Flutter"] tap]; + XCTAssertTrue([app.staticTexts[@"Flutter button tapped 1 time."] waitForExistenceWithTimeout:1.0]); + XCTAssertTrue(app.otherElements[@"Platform button tapped 0 times."].exists); + + [app.buttons[@"Increment via iOS"] tap]; + XCTAssertTrue([app.staticTexts[@"Flutter button tapped 1 time."] waitForExistenceWithTimeout:1.0]); + XCTAssertTrue(app.otherElements[@"Platform button tapped 1 time."].exists); + + // Back navigation. + [app.navigationBars[@"Hybrid Flutter/Native"].buttons[@"Flutter iOS Demos Home"] tap]; + XCTAssertTrue([app.navigationBars[@"Flutter iOS Demos Home"] waitForExistenceWithTimeout:1.0]); +} + +- (void)testDualCold { + XCUIApplication *app = [[XCUIApplication alloc] init]; + [app launch]; + + [app.buttons[@"Dual Flutter View (Cold)"] tap]; + + // There are two marquees. + XCTAssertTrue([app.otherElements[@"This is Marquee"] waitForExistenceWithTimeout:1.0]); + XCTAssertEqual([app.otherElements matchingType:XCUIElementTypeOther identifier:@"This is Marquee"].count, 2); + + // Back navigation. + [app.navigationBars[@"Dual Flutter Views"].buttons[@"Flutter iOS Demos Home"] tap]; + XCTAssertTrue([app.navigationBars[@"Flutter iOS Demos Home"] waitForExistenceWithTimeout:1.0]); +} + +@end diff --git a/dev/integration_tests/ios_add2app/ios_add2appTests/Info.plist b/dev/integration_tests/ios_host_app/FlutterUITests/Info.plist similarity index 93% rename from dev/integration_tests/ios_add2app/ios_add2appTests/Info.plist rename to dev/integration_tests/ios_host_app/FlutterUITests/Info.plist index 6c40a6cd0c4..64d65ca4957 100644 --- a/dev/integration_tests/ios_add2app/ios_add2appTests/Info.plist +++ b/dev/integration_tests/ios_host_app/FlutterUITests/Info.plist @@ -13,7 +13,7 @@ CFBundleName $(PRODUCT_NAME) CFBundlePackageType - BNDL + $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString 1.0 CFBundleVersion diff --git a/dev/integration_tests/ios_host_app/Host.xcodeproj/project.pbxproj b/dev/integration_tests/ios_host_app/Host.xcodeproj/project.pbxproj index 7c952ea342f..d8538ec7712 100644 --- a/dev/integration_tests/ios_host_app/Host.xcodeproj/project.pbxproj +++ b/dev/integration_tests/ios_host_app/Host.xcodeproj/project.pbxproj @@ -3,29 +3,61 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 51; objects = { /* Begin PBXBuildFile section */ + 4AF9D63425F74F0694CAB07D /* libPods-Host.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E20960BD8B505D605FE82853 /* libPods-Host.a */; }; 74F97866215AB9E8005A0F04 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 74F97865215AB9E8005A0F04 /* AppDelegate.m */; }; - 74F97869215AB9E8005A0F04 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 74F97868215AB9E8005A0F04 /* ViewController.m */; }; - 74F9786C215AB9E8005A0F04 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74F9786A215AB9E8005A0F04 /* Main.storyboard */; }; 74F9786E215AB9E9005A0F04 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 74F9786D215AB9E9005A0F04 /* Assets.xcassets */; }; 74F97871215AB9E9005A0F04 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74F9786F215AB9E9005A0F04 /* LaunchScreen.storyboard */; }; 74F97874215AB9E9005A0F04 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 74F97873215AB9E9005A0F04 /* main.m */; }; + 7E06ECD9FAEFCA4A0ED04D6E /* libPods-FlutterUITests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 327E8CC22A494E7D7155FB58 /* libPods-FlutterUITests.a */; }; + F7C2661424AC18D00085742D /* DualFlutterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F7C2660E24AC18D00085742D /* DualFlutterViewController.m */; }; + F7C2661524AC18D00085742D /* FullScreenViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F7C2660F24AC18D00085742D /* FullScreenViewController.m */; }; + F7C2661624AC18D00085742D /* HybridViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F7C2661124AC18D00085742D /* HybridViewController.m */; }; + F7C2661B24AC18DD0085742D /* NativeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F7C2661824AC18DD0085742D /* NativeViewController.m */; }; + F7C2661C24AC18DD0085742D /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F7C2661A24AC18DD0085742D /* MainViewController.m */; }; + F7C2664624AC1E3A0085742D /* FlutterUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = F7C2664524AC1E3A0085742D /* FlutterUITests.m */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + F7C2664824AC1E3A0085742D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 74F97859215AB9E8005A0F04 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 74F97860215AB9E8005A0F04; + remoteInfo = Host; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXFileReference section */ + 167171877EDE2F421DEC809C /* Pods-FlutterUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlutterUITests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-FlutterUITests/Pods-FlutterUITests.debug.xcconfig"; sourceTree = ""; }; + 327E8CC22A494E7D7155FB58 /* libPods-FlutterUITests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-FlutterUITests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 41D0C662C99CDA4C35B51C32 /* Pods-Host.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Host.release.xcconfig"; path = "Pods/Target Support Files/Pods-Host/Pods-Host.release.xcconfig"; sourceTree = ""; }; 74F97861215AB9E8005A0F04 /* Host.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Host.app; sourceTree = BUILT_PRODUCTS_DIR; }; 74F97864215AB9E8005A0F04 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; 74F97865215AB9E8005A0F04 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - 74F97867215AB9E8005A0F04 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; - 74F97868215AB9E8005A0F04 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; - 74F9786B215AB9E8005A0F04 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 74F9786D215AB9E9005A0F04 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 74F97870215AB9E9005A0F04 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 74F97872215AB9E9005A0F04 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 74F97873215AB9E9005A0F04 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 8E6751F293967EE3DFF4178A /* Pods-FlutterUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlutterUITests.release.xcconfig"; path = "Pods/Target Support Files/Pods-FlutterUITests/Pods-FlutterUITests.release.xcconfig"; sourceTree = ""; }; + 91B7D4263BFD246A27391225 /* Pods-Host.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Host.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Host/Pods-Host.debug.xcconfig"; sourceTree = ""; }; + E20960BD8B505D605FE82853 /* libPods-Host.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Host.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + F7C2660E24AC18D00085742D /* DualFlutterViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DualFlutterViewController.m; sourceTree = ""; }; + F7C2660F24AC18D00085742D /* FullScreenViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FullScreenViewController.m; sourceTree = ""; }; + F7C2661024AC18D00085742D /* HybridViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HybridViewController.h; sourceTree = ""; }; + F7C2661124AC18D00085742D /* HybridViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HybridViewController.m; sourceTree = ""; }; + F7C2661224AC18D00085742D /* FullScreenViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FullScreenViewController.h; sourceTree = ""; }; + F7C2661324AC18D00085742D /* DualFlutterViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DualFlutterViewController.h; sourceTree = ""; }; + F7C2661724AC18DD0085742D /* MainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainViewController.h; sourceTree = ""; }; + F7C2661824AC18DD0085742D /* NativeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NativeViewController.m; sourceTree = ""; }; + F7C2661924AC18DD0085742D /* NativeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeViewController.h; sourceTree = ""; }; + F7C2661A24AC18DD0085742D /* MainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainViewController.m; sourceTree = ""; }; + F7C2664324AC1E3A0085742D /* FlutterUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FlutterUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + F7C2664524AC1E3A0085742D /* FlutterUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FlutterUITests.m; sourceTree = ""; }; + F7C2664724AC1E3A0085742D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -33,6 +65,15 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 4AF9D63425F74F0694CAB07D /* libPods-Host.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + F7C2664024AC1E3A0085742D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 7E06ECD9FAEFCA4A0ED04D6E /* libPods-FlutterUITests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -43,6 +84,7 @@ isa = PBXGroup; children = ( 74F97863215AB9E8005A0F04 /* Host */, + F7C2664424AC1E3A0085742D /* FlutterUITests */, 74F97862215AB9E8005A0F04 /* Products */, 74F9788B215AC328005A0F04 /* Frameworks */, A4A9971F50C4EE357B74B6E0 /* Pods */, @@ -53,6 +95,7 @@ isa = PBXGroup; children = ( 74F97861215AB9E8005A0F04 /* Host.app */, + F7C2664324AC1E3A0085742D /* FlutterUITests.xctest */, ); name = Products; sourceTree = ""; @@ -60,11 +103,18 @@ 74F97863215AB9E8005A0F04 /* Host */ = { isa = PBXGroup; children = ( + F7C2661724AC18DD0085742D /* MainViewController.h */, + F7C2661A24AC18DD0085742D /* MainViewController.m */, + F7C2661924AC18DD0085742D /* NativeViewController.h */, + F7C2661824AC18DD0085742D /* NativeViewController.m */, + F7C2661324AC18D00085742D /* DualFlutterViewController.h */, + F7C2660E24AC18D00085742D /* DualFlutterViewController.m */, + F7C2661224AC18D00085742D /* FullScreenViewController.h */, + F7C2660F24AC18D00085742D /* FullScreenViewController.m */, + F7C2661024AC18D00085742D /* HybridViewController.h */, + F7C2661124AC18D00085742D /* HybridViewController.m */, 74F97864215AB9E8005A0F04 /* AppDelegate.h */, 74F97865215AB9E8005A0F04 /* AppDelegate.m */, - 74F97867215AB9E8005A0F04 /* ViewController.h */, - 74F97868215AB9E8005A0F04 /* ViewController.m */, - 74F9786A215AB9E8005A0F04 /* Main.storyboard */, 74F9786D215AB9E9005A0F04 /* Assets.xcassets */, 74F9786F215AB9E9005A0F04 /* LaunchScreen.storyboard */, 74F97872215AB9E9005A0F04 /* Info.plist */, @@ -76,6 +126,8 @@ 74F9788B215AC328005A0F04 /* Frameworks */ = { isa = PBXGroup; children = ( + E20960BD8B505D605FE82853 /* libPods-Host.a */, + 327E8CC22A494E7D7155FB58 /* libPods-FlutterUITests.a */, ); name = Frameworks; sourceTree = ""; @@ -83,10 +135,23 @@ A4A9971F50C4EE357B74B6E0 /* Pods */ = { isa = PBXGroup; children = ( + 91B7D4263BFD246A27391225 /* Pods-Host.debug.xcconfig */, + 41D0C662C99CDA4C35B51C32 /* Pods-Host.release.xcconfig */, + 167171877EDE2F421DEC809C /* Pods-FlutterUITests.debug.xcconfig */, + 8E6751F293967EE3DFF4178A /* Pods-FlutterUITests.release.xcconfig */, ); name = Pods; sourceTree = ""; }; + F7C2664424AC1E3A0085742D /* FlutterUITests */ = { + isa = PBXGroup; + children = ( + F7C2664524AC1E3A0085742D /* FlutterUITests.m */, + F7C2664724AC1E3A0085742D /* Info.plist */, + ); + path = FlutterUITests; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -94,9 +159,12 @@ isa = PBXNativeTarget; buildConfigurationList = 74F97877215AB9E9005A0F04 /* Build configuration list for PBXNativeTarget "Host" */; buildPhases = ( + DF650341152DB73976A358C2 /* [CP] Check Pods Manifest.lock */, + C954A75BD5C4F1EEA5AFF464 /* [CP-User] Run Flutter Build hello Script */, 74F9785D215AB9E8005A0F04 /* Sources */, 74F9785E215AB9E8005A0F04 /* Frameworks */, 74F9785F215AB9E8005A0F04 /* Resources */, + 83F5A04FAA44C2FFFC4CBFBA /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -107,6 +175,27 @@ productReference = 74F97861215AB9E8005A0F04 /* Host.app */; productType = "com.apple.product-type.application"; }; + F7C2664224AC1E3A0085742D /* FlutterUITests */ = { + isa = PBXNativeTarget; + buildConfigurationList = F7C2664A24AC1E3A0085742D /* Build configuration list for PBXNativeTarget "FlutterUITests" */; + buildPhases = ( + 09D119997F3FFD16DBA33278 /* [CP] Check Pods Manifest.lock */, + 5F3CDDFEC2CA4EEE4767777D /* [CP-User] Run Flutter Build hello Script */, + F7C2663F24AC1E3A0085742D /* Sources */, + F7C2664024AC1E3A0085742D /* Frameworks */, + F7C2664124AC1E3A0085742D /* Resources */, + 5EABD4D6B64D840CAF712234 /* [CP] Embed Pods Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + F7C2664924AC1E3A0085742D /* PBXTargetDependency */, + ); + name = FlutterUITests; + productName = FlutterUITests; + productReference = F7C2664324AC1E3A0085742D /* FlutterUITests.xctest */; + productType = "com.apple.product-type.bundle.ui-testing"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -119,6 +208,10 @@ 74F97860215AB9E8005A0F04 = { CreatedOnToolsVersion = 10.0; }; + F7C2664224AC1E3A0085742D = { + CreatedOnToolsVersion = 12.0; + TestTargetID = 74F97860215AB9E8005A0F04; + }; }; }; buildConfigurationList = 74F9785C215AB9E8005A0F04 /* Build configuration list for PBXProject "Host" */; @@ -135,6 +228,7 @@ projectRoot = ""; targets = ( 74F97860215AB9E8005A0F04 /* Host */, + F7C2664224AC1E3A0085742D /* FlutterUITests */, ); }; /* End PBXProject section */ @@ -146,34 +240,165 @@ files = ( 74F97871215AB9E9005A0F04 /* LaunchScreen.storyboard in Resources */, 74F9786E215AB9E9005A0F04 /* Assets.xcassets in Resources */, - 74F9786C215AB9E8005A0F04 /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + F7C2664124AC1E3A0085742D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + 09D119997F3FFD16DBA33278 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-FlutterUITests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + 5EABD4D6B64D840CAF712234 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-FlutterUITests/Pods-FlutterUITests-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-FlutterUITests/Pods-FlutterUITests-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FlutterUITests/Pods-FlutterUITests-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + 5F3CDDFEC2CA4EEE4767777D /* [CP-User] Run Flutter Build hello Script */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${SRCROOT}/../hello/.metadata", + "${SRCROOT}/../hello/.ios/Flutter/App.framework/App", + "${SRCROOT}/../hello/.ios/Flutter/engine/Flutter.framework/Flutter", + "${SRCROOT}/../hello/.ios/Flutter/flutter_export_environment.sh", + ); + name = "[CP-User] Run Flutter Build hello Script"; + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "set -e\nset -u\nsource \"${SRCROOT}/../hello/.ios/Flutter/flutter_export_environment.sh\"\n\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/xcode_backend.sh build"; + }; + 83F5A04FAA44C2FFFC4CBFBA /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Host/Pods-Host-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Host/Pods-Host-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Host/Pods-Host-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + C954A75BD5C4F1EEA5AFF464 /* [CP-User] Run Flutter Build hello Script */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${SRCROOT}/../hello/.metadata", + "${SRCROOT}/../hello/.ios/Flutter/App.framework/App", + "${SRCROOT}/../hello/.ios/Flutter/engine/Flutter.framework/Flutter", + "${SRCROOT}/../hello/.ios/Flutter/flutter_export_environment.sh", + ); + name = "[CP-User] Run Flutter Build hello Script"; + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "set -e\nset -u\nsource \"${SRCROOT}/../hello/.ios/Flutter/flutter_export_environment.sh\"\n\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/xcode_backend.sh build"; + }; + DF650341152DB73976A358C2 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Host-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ 74F9785D215AB9E8005A0F04 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 74F97869215AB9E8005A0F04 /* ViewController.m in Sources */, + F7C2661524AC18D00085742D /* FullScreenViewController.m in Sources */, + F7C2661424AC18D00085742D /* DualFlutterViewController.m in Sources */, + F7C2661C24AC18DD0085742D /* MainViewController.m in Sources */, 74F97874215AB9E9005A0F04 /* main.m in Sources */, + F7C2661624AC18D00085742D /* HybridViewController.m in Sources */, + F7C2661B24AC18DD0085742D /* NativeViewController.m in Sources */, 74F97866215AB9E8005A0F04 /* AppDelegate.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; + F7C2663F24AC1E3A0085742D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + F7C2664624AC1E3A0085742D /* FlutterUITests.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXVariantGroup section */ - 74F9786A215AB9E8005A0F04 /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 74F9786B215AB9E8005A0F04 /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; +/* Begin PBXTargetDependency section */ + F7C2664924AC1E3A0085742D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 74F97860215AB9E8005A0F04 /* Host */; + targetProxy = F7C2664824AC1E3A0085742D /* PBXContainerItemProxy */; }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ 74F9786F215AB9E9005A0F04 /* LaunchScreen.storyboard */ = { isa = PBXVariantGroup; children = ( @@ -299,10 +524,11 @@ }; 74F97878215AB9E9005A0F04 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 91B7D4263BFD246A27391225 /* Pods-Host.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = S8QB4VV633; INFOPLIST_FILE = Host/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -316,10 +542,11 @@ }; 74F97879215AB9E9005A0F04 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 41D0C662C99CDA4C35B51C32 /* Pods-Host.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = S8QB4VV633; INFOPLIST_FILE = Host/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -331,6 +558,48 @@ }; name = Release; }; + F7C2664B24AC1E3A0085742D /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 167171877EDE2F421DEC809C /* Pods-FlutterUITests.debug.xcconfig */; + buildSettings = { + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = S8QB4VV633; + INFOPLIST_FILE = FlutterUITests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.flutterio.FlutterUITests; + PRODUCT_NAME = "$(TARGET_NAME)"; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_TARGET_NAME = Host; + }; + name = Debug; + }; + F7C2664C24AC1E3A0085742D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 8E6751F293967EE3DFF4178A /* Pods-FlutterUITests.release.xcconfig */; + buildSettings = { + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = S8QB4VV633; + INFOPLIST_FILE = FlutterUITests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.flutterio.FlutterUITests; + PRODUCT_NAME = "$(TARGET_NAME)"; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_TARGET_NAME = Host; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -352,6 +621,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + F7C2664A24AC1E3A0085742D /* Build configuration list for PBXNativeTarget "FlutterUITests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + F7C2664B24AC1E3A0085742D /* Debug */, + F7C2664C24AC1E3A0085742D /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; /* End XCConfigurationList section */ }; rootObject = 74F97859215AB9E8005A0F04 /* Project object */; diff --git a/dev/integration_tests/ios_add2app/ios_add2app.xcodeproj/xcshareddata/xcschemes/ios_add2app.xcscheme b/dev/integration_tests/ios_host_app/Host.xcodeproj/xcshareddata/xcschemes/Host.xcscheme similarity index 67% rename from dev/integration_tests/ios_add2app/ios_add2app.xcodeproj/xcshareddata/xcschemes/ios_add2app.xcscheme rename to dev/integration_tests/ios_host_app/Host.xcodeproj/xcshareddata/xcschemes/Host.xcscheme index ea80b48ca32..612155f13d1 100644 --- a/dev/integration_tests/ios_add2app/ios_add2app.xcodeproj/xcshareddata/xcschemes/ios_add2app.xcscheme +++ b/dev/integration_tests/ios_host_app/Host.xcodeproj/xcshareddata/xcschemes/Host.xcscheme @@ -1,6 +1,6 @@ + BlueprintIdentifier = "74F97860215AB9E8005A0F04" + BuildableName = "Host.app" + BlueprintName = "Host" + ReferencedContainer = "container:Host.xcodeproj"> @@ -28,6 +28,16 @@ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> + + + + + BlueprintIdentifier = "74F97860215AB9E8005A0F04" + BuildableName = "Host.app" + BlueprintName = "Host" + ReferencedContainer = "container:Host.xcodeproj"> @@ -61,10 +71,10 @@ runnableDebuggingMode = "0"> + BlueprintIdentifier = "74F97860215AB9E8005A0F04" + BuildableName = "Host.app" + BlueprintName = "Host" + ReferencedContainer = "container:Host.xcodeproj"> diff --git a/dev/integration_tests/ios_host_app/Host/AppDelegate.h b/dev/integration_tests/ios_host_app/Host/AppDelegate.h index 78655f963b9..3a6c5601742 100644 --- a/dev/integration_tests/ios_host_app/Host/AppDelegate.h +++ b/dev/integration_tests/ios_host_app/Host/AppDelegate.h @@ -6,4 +6,8 @@ #import @interface AppDelegate : FlutterAppDelegate + +@property(nonatomic, strong) FlutterEngine* engine; +@property(nonatomic, strong) FlutterBasicMessageChannel* reloadMessageChannel; + @end diff --git a/dev/integration_tests/ios_host_app/Host/AppDelegate.m b/dev/integration_tests/ios_host_app/Host/AppDelegate.m index 0c732ec7e16..ed1389f87a1 100644 --- a/dev/integration_tests/ios_host_app/Host/AppDelegate.m +++ b/dev/integration_tests/ios_host_app/Host/AppDelegate.m @@ -3,6 +3,51 @@ // found in the LICENSE file. #import "AppDelegate.h" +#import "MainViewController.h" + +@interface AppDelegate () + +@end + +static NSString *_kReloadChannelName = @"reload"; + +@implementation AppDelegate { + MainViewController *_mainViewController; + UINavigationController *_navigationController; + FlutterEngine *_engine; + FlutterBasicMessageChannel *_reloadMessageChannel; +} + +- (FlutterEngine *)engine { + return _engine; +} + +- (FlutterBasicMessageChannel *)reloadMessabeChannel { + return _reloadMessageChannel; +} + +- (BOOL)application:(UIApplication *)application + didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { + self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; + + _mainViewController = [[MainViewController alloc] init]; + _navigationController = [[UINavigationController alloc] + initWithRootViewController:_mainViewController]; + + _navigationController.navigationBar.translucent = NO; + + _engine = [[FlutterEngine alloc] initWithName:@"test" project:nil]; + [_engine runWithEntrypoint:nil]; + + _reloadMessageChannel = [[FlutterBasicMessageChannel alloc] + initWithName:_kReloadChannelName + binaryMessenger:_engine.binaryMessenger + codec:[FlutterStringCodec sharedInstance]]; + + self.window.rootViewController = _navigationController; + [self.window makeKeyAndVisible]; + + return YES; +} -@implementation AppDelegate @end diff --git a/dev/integration_tests/ios_host_app/Host/Base.lproj/LaunchScreen.storyboard b/dev/integration_tests/ios_host_app/Host/Base.lproj/LaunchScreen.storyboard index bfa36129419..6a6b1b8249f 100644 --- a/dev/integration_tests/ios_host_app/Host/Base.lproj/LaunchScreen.storyboard +++ b/dev/integration_tests/ios_host_app/Host/Base.lproj/LaunchScreen.storyboard @@ -1,7 +1,10 @@ - - + + + + + - + @@ -13,8 +16,30 @@ + + + + - + + + + + + + + + diff --git a/dev/integration_tests/ios_host_app/Host/Base.lproj/Main.storyboard b/dev/integration_tests/ios_host_app/Host/Base.lproj/Main.storyboard deleted file mode 100644 index 942f0bc452d..00000000000 --- a/dev/integration_tests/ios_host_app/Host/Base.lproj/Main.storyboard +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dev/integration_tests/ios_add2app/ios_add2app/DualFlutterViewController.h b/dev/integration_tests/ios_host_app/Host/DualFlutterViewController.h similarity index 100% rename from dev/integration_tests/ios_add2app/ios_add2app/DualFlutterViewController.h rename to dev/integration_tests/ios_host_app/Host/DualFlutterViewController.h diff --git a/dev/integration_tests/ios_add2app/ios_add2app/DualFlutterViewController.m b/dev/integration_tests/ios_host_app/Host/DualFlutterViewController.m similarity index 100% rename from dev/integration_tests/ios_add2app/ios_add2app/DualFlutterViewController.m rename to dev/integration_tests/ios_host_app/Host/DualFlutterViewController.m diff --git a/dev/integration_tests/ios_add2app/ios_add2app/FullScreenViewController.h b/dev/integration_tests/ios_host_app/Host/FullScreenViewController.h similarity index 100% rename from dev/integration_tests/ios_add2app/ios_add2app/FullScreenViewController.h rename to dev/integration_tests/ios_host_app/Host/FullScreenViewController.h diff --git a/dev/integration_tests/ios_add2app/ios_add2app/FullScreenViewController.m b/dev/integration_tests/ios_host_app/Host/FullScreenViewController.m similarity index 100% rename from dev/integration_tests/ios_add2app/ios_add2app/FullScreenViewController.m rename to dev/integration_tests/ios_host_app/Host/FullScreenViewController.m diff --git a/dev/integration_tests/ios_add2app/ios_add2app/HybridViewController.h b/dev/integration_tests/ios_host_app/Host/HybridViewController.h similarity index 100% rename from dev/integration_tests/ios_add2app/ios_add2app/HybridViewController.h rename to dev/integration_tests/ios_host_app/Host/HybridViewController.h diff --git a/dev/integration_tests/ios_add2app/ios_add2app/HybridViewController.m b/dev/integration_tests/ios_host_app/Host/HybridViewController.m similarity index 100% rename from dev/integration_tests/ios_add2app/ios_add2app/HybridViewController.m rename to dev/integration_tests/ios_host_app/Host/HybridViewController.m diff --git a/dev/integration_tests/ios_host_app/Host/Info.plist b/dev/integration_tests/ios_host_app/Host/Info.plist index 16be3b68112..4222ac2dd31 100644 --- a/dev/integration_tests/ios_host_app/Host/Info.plist +++ b/dev/integration_tests/ios_host_app/Host/Info.plist @@ -22,8 +22,6 @@ UILaunchStoryboardName LaunchScreen - UIMainStoryboardFile - Main UIRequiredDeviceCapabilities armv7 diff --git a/dev/integration_tests/ios_add2app/ios_add2app/MainViewController.h b/dev/integration_tests/ios_host_app/Host/MainViewController.h similarity index 100% rename from dev/integration_tests/ios_add2app/ios_add2app/MainViewController.h rename to dev/integration_tests/ios_host_app/Host/MainViewController.h diff --git a/dev/integration_tests/ios_add2app/ios_add2app/MainViewController.m b/dev/integration_tests/ios_host_app/Host/MainViewController.m similarity index 99% rename from dev/integration_tests/ios_add2app/ios_add2app/MainViewController.m rename to dev/integration_tests/ios_host_app/Host/MainViewController.m index 896a5af48c0..3f0a809dd1d 100644 --- a/dev/integration_tests/ios_add2app/ios_add2app/MainViewController.m +++ b/dev/integration_tests/ios_host_app/Host/MainViewController.m @@ -23,7 +23,7 @@ [super viewDidLoad]; [self.view setFrame:self.view.window.bounds]; - self.title = @"Flutter iOS Demos"; + self.title = @"Flutter iOS Demos Home"; self.view.backgroundColor = UIColor.whiteColor; _stackView = [[UIStackView alloc] initWithFrame:self.view.frame]; diff --git a/dev/integration_tests/ios_add2app/ios_add2app/NativeViewController.h b/dev/integration_tests/ios_host_app/Host/NativeViewController.h similarity index 100% rename from dev/integration_tests/ios_add2app/ios_add2app/NativeViewController.h rename to dev/integration_tests/ios_host_app/Host/NativeViewController.h diff --git a/dev/integration_tests/ios_add2app/ios_add2app/NativeViewController.m b/dev/integration_tests/ios_host_app/Host/NativeViewController.m similarity index 100% rename from dev/integration_tests/ios_add2app/ios_add2app/NativeViewController.m rename to dev/integration_tests/ios_host_app/Host/NativeViewController.m diff --git a/dev/integration_tests/ios_host_app/Host/ViewController.h b/dev/integration_tests/ios_host_app/Host/ViewController.h deleted file mode 100644 index 4b4bbd035ba..00000000000 --- a/dev/integration_tests/ios_host_app/Host/ViewController.h +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2014 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. - -#import - -@interface ViewController : UIViewController -@end diff --git a/dev/integration_tests/ios_host_app/Host/ViewController.m b/dev/integration_tests/ios_host_app/Host/ViewController.m deleted file mode 100644 index fe2d9598604..00000000000 --- a/dev/integration_tests/ios_host_app/Host/ViewController.m +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2014 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. - -#import "ViewController.h" -#import -#import - -@implementation ViewController - -// Boiler-plate add-to-app demo. Not integration tested anywhere. -- (void)viewDidLoad { - [super viewDidLoad]; - UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom]; - [button addTarget:self - action:@selector(handleButtonAction) - forControlEvents:UIControlEventTouchUpInside]; - [button setTitle:@"Press me" forState:UIControlStateNormal]; - [button setBackgroundColor:[UIColor blueColor]]; - button.frame = CGRectMake(80.0, 210.0, 160.0, 40.0); - [self.view addSubview:button]; -} - -- (void)handleButtonAction { - FlutterViewController* flutterViewController = [[FlutterViewController alloc] init]; - [GeneratedPluginRegistrant registerWithRegistry:flutterViewController]; - [self presentViewController:flutterViewController animated:false completion:nil]; -} - -@end diff --git a/dev/integration_tests/ios_host_app/Host/main.m b/dev/integration_tests/ios_host_app/Host/main.m index 57debb028d9..88e08ea2ec4 100644 --- a/dev/integration_tests/ios_host_app/Host/main.m +++ b/dev/integration_tests/ios_host_app/Host/main.m @@ -6,7 +6,7 @@ #import "AppDelegate.h" int main(int argc, char * argv[]) { - @autoreleasepool { - return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); - } + @autoreleasepool { + return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); + } } diff --git a/dev/integration_tests/ios_host_app/Podfile b/dev/integration_tests/ios_host_app/Podfile index a74eec912bc..a6c477fa2c7 100644 --- a/dev/integration_tests/ios_host_app/Podfile +++ b/dev/integration_tests/ios_host_app/Podfile @@ -5,4 +5,9 @@ load File.join(flutter_application_path, '.ios', 'Flutter', 'podhelper.rb') target 'Host' do install_all_flutter_pods flutter_application_path + + target 'FlutterUITests' do + inherit! :search_paths + install_all_flutter_pods flutter_application_path + end end diff --git a/dev/integration_tests/ios_host_app/README.md b/dev/integration_tests/ios_host_app/README.md index 9b71d999034..feec9a5aaee 100644 --- a/dev/integration_tests/ios_host_app/README.md +++ b/dev/integration_tests/ios_host_app/README.md @@ -1,8 +1,34 @@ # iOS host app +Used by the `module_test_ios.dart` device lab test. + iOS host app for a Flutter module created using ``` $ flutter create -t module hello ``` and placed in a sibling folder to (a clone of) the host app. -Used by the `module_test_ios.dart` device lab test. +`flutterapp/lib/marquee.dart` and `flutterapp/lib/main.dart` +must be copied into the new module `lib` for platform unit tests +to pass. + +This application demonstrates some basic functionality for Add2App, +along with a native iOS ViewController as a baseline and to demonstrate +interaction. + +1. A regular iOS view controller (UIViewController), similar to the default + `flutter create` template (NativeViewController.m). +1. A FlutterViewController subclass that takes over full screen. Demos showing + this both from a cold/fresh engine state and a warm engine state + (FullScreenViewController.m). +1. A demo of pushing a FlutterViewController on as a child view. +1. A demo of showing both the native and the Flutter views using a platform + channel to interact with each other (HybridViewController.m). +1. A demo of showing two FlutterViewControllers simultaneously + (DualViewController.m). + +A few key things are tested here (FlutterUITests.m): + +1. The ability to pre-warm the engine and attach/detatch a ViewController from + it. +1. The ability to use platform channels to communicate between views. +1. The ability to simultaneously run two instances of the engine. diff --git a/dev/integration_tests/ios_add2app/flutterapp/lib/main.dart b/dev/integration_tests/ios_host_app/flutterapp/lib/main similarity index 100% rename from dev/integration_tests/ios_add2app/flutterapp/lib/main.dart rename to dev/integration_tests/ios_host_app/flutterapp/lib/main diff --git a/dev/integration_tests/ios_add2app/flutterapp/lib/marquee.dart b/dev/integration_tests/ios_host_app/flutterapp/lib/marquee similarity index 100% rename from dev/integration_tests/ios_add2app/flutterapp/lib/marquee.dart rename to dev/integration_tests/ios_host_app/flutterapp/lib/marquee