From 52697ef962ad015eeef665ec7c77c32e99141db8 Mon Sep 17 00:00:00 2001 From: Mikkel Nygaard Ravn Date: Wed, 26 Sep 2018 07:57:05 +0200 Subject: [PATCH] Fixes to support add2app on iOS (#22277) * Fix xcode_backend.sh script to support add2app * Fix ios deployment target. Too old for new Xcode. * Fix ios host app * Register plugins with Flutter view --- .../ios_host_app/Config/Debug.xcconfig | 2 +- .../ios_host_app/Config/Release.xcconfig | 2 +- .../ios_host_app/Flutter/.gitkeep | 0 .../Host.xcodeproj/project.pbxproj | 255 +++++++++--------- .../UserInterfaceState.xcuserstate | Bin 26773 -> 0 bytes .../ios_host_app/Host/AppDelegate.h | 1 + .../Host/Base.lproj/LaunchScreen.storyboard | 2 +- .../Host/Base.lproj/Main.storyboard | 2 +- .../ios_host_app/Host/ViewController.m | 2 + dev/integration_tests/ios_host_app/Podfile | 2 +- packages/flutter_tools/bin/xcode_backend.sh | 2 +- packages/flutter_tools/lib/src/plugins.dart | 2 +- 12 files changed, 145 insertions(+), 127 deletions(-) create mode 100644 dev/integration_tests/ios_host_app/Flutter/.gitkeep delete mode 100644 dev/integration_tests/ios_host_app/Host.xcworkspace/xcuserdata/mravn.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/dev/integration_tests/ios_host_app/Config/Debug.xcconfig b/dev/integration_tests/ios_host_app/Config/Debug.xcconfig index 55d2bd85f8..3f48cdec9a 100644 --- a/dev/integration_tests/ios_host_app/Config/Debug.xcconfig +++ b/dev/integration_tests/ios_host_app/Config/Debug.xcconfig @@ -1,2 +1,2 @@ #include "Flutter.xcconfig" -#include "Pods/Target Support Files/Pods-Host/Pods-Host.debug.xcconfig" +#include "../Pods/Target Support Files/Pods-Host/Pods-Host.debug.xcconfig" diff --git a/dev/integration_tests/ios_host_app/Config/Release.xcconfig b/dev/integration_tests/ios_host_app/Config/Release.xcconfig index a0a0197543..e9764d1686 100644 --- a/dev/integration_tests/ios_host_app/Config/Release.xcconfig +++ b/dev/integration_tests/ios_host_app/Config/Release.xcconfig @@ -1,3 +1,3 @@ #include "Flutter.xcconfig" -#include "Pods/Target Support Files/Pods-Host/Pods-Host.release.xcconfig" +#include "../Pods/Target Support Files/Pods-Host/Pods-Host.release.xcconfig" FLUTTER_BUILD_MODE=release diff --git a/dev/integration_tests/ios_host_app/Flutter/.gitkeep b/dev/integration_tests/ios_host_app/Flutter/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 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 c6086b7cc2..a807ebcf39 100644 --- a/dev/integration_tests/ios_host_app/Host.xcodeproj/project.pbxproj +++ b/dev/integration_tests/ios_host_app/Host.xcodeproj/project.pbxproj @@ -7,27 +7,25 @@ objects = { /* Begin PBXBuildFile section */ - 74DB4A4E2152F3F900E9B550 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 74DB4A4D2152F3F900E9B550 /* AppDelegate.m */; }; - 74DB4A512152F3F900E9B550 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 74DB4A502152F3F900E9B550 /* ViewController.m */; }; - 74DB4A542152F3F900E9B550 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74DB4A522152F3F900E9B550 /* Main.storyboard */; }; - 74DB4A562152F3FB00E9B550 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 74DB4A552152F3FB00E9B550 /* Assets.xcassets */; }; - 74DB4A592152F3FB00E9B550 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74DB4A572152F3FB00E9B550 /* LaunchScreen.storyboard */; }; - 74DB4A5C2152F3FB00E9B550 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 74DB4A5B2152F3FB00E9B550 /* main.m */; }; - 74DB4A872154203700E9B550 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 74DB4A862154203700E9B550 /* flutter_assets */; }; - 74DB4A8B2154205B00E9B550 /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 74DB4A842154201200E9B550 /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 74DB4A8E2154205F00E9B550 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 74DB4A882154204700E9B550 /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - F34F00DB71F8C65CEA61A90A /* libPods-Host.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A7845ED770D25CF67B243D1A /* 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 */; }; + 74F978AB215AD6DC005A0F04 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 74F978AA215AD6DC005A0F04 /* flutter_assets */; }; + 74F978AF215AD6F9005A0F04 /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 74F978AC215AD6E8005A0F04 /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + DAEA7B95412864C7F3A4AE98 /* libPods-Host.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2499C53F0BD30E24745E2F6B /* libPods-Host.a */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ - 74DB4A8C2154205B00E9B550 /* Embed Frameworks */ = { + 74F978A2215ACF9B005A0F04 /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = ""; dstSubfolderSpec = 10; files = ( - 74DB4A8B2154205B00E9B550 /* App.framework in Embed Frameworks */, - 74DB4A8E2154205F00E9B550 /* Flutter.framework in Embed Frameworks */, + 74F978AF215AD6F9005A0F04 /* App.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -35,102 +33,100 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 74DB4A492152F3F900E9B550 /* Host.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Host.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 74DB4A4C2152F3F900E9B550 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - 74DB4A4D2152F3F900E9B550 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - 74DB4A4F2152F3F900E9B550 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; - 74DB4A502152F3F900E9B550 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; - 74DB4A532152F3F900E9B550 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 74DB4A552152F3FB00E9B550 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 74DB4A582152F3FB00E9B550 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - 74DB4A5A2152F3FB00E9B550 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 74DB4A5B2152F3FB00E9B550 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 74DB4A7F2152F49200E9B550 /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; - 74DB4A802152F4A400E9B550 /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; - 74DB4A8221541FEE00E9B550 /* Flutter.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Flutter.xcconfig; sourceTree = ""; }; - 74DB4A842154201200E9B550 /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = ../../hello/.ios/Flutter/App.framework; sourceTree = ""; }; - 74DB4A862154203700E9B550 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = ../../hello/.ios/Flutter/flutter_assets; sourceTree = ""; }; - 74DB4A882154204700E9B550 /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = ../../hello/.ios/Flutter/engine/Flutter.framework; sourceTree = ""; }; - A7845ED770D25CF67B243D1A /* libPods-Host.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Host.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 2499C53F0BD30E24745E2F6B /* libPods-Host.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Host.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 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 = ""; }; + 74F9787B215ABA08005A0F04 /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; + 74F9787C215ABA73005A0F04 /* Flutter.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Flutter.xcconfig; sourceTree = ""; }; + 74F9787D215ABA9D005A0F04 /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + 74F978AA215AD6DC005A0F04 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = ../../hello/.ios/Flutter/flutter_assets; sourceTree = ""; }; + 74F978AC215AD6E8005A0F04 /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = ../../hello/.ios/Flutter/App.framework; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 74DB4A462152F3F900E9B550 /* Frameworks */ = { + 74F9785E215AB9E8005A0F04 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - F34F00DB71F8C65CEA61A90A /* libPods-Host.a in Frameworks */, + DAEA7B95412864C7F3A4AE98 /* libPods-Host.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 74DB4A402152F3F900E9B550 = { + 74F97858215AB9E8005A0F04 = { isa = PBXGroup; children = ( - 74DB4A8121541FDF00E9B550 /* Flutter */, - 74DB4A7E2152F47500E9B550 /* Config */, - 74DB4A4B2152F3F900E9B550 /* Host */, - 74DB4A4A2152F3F900E9B550 /* Products */, - D22B5E2B5577AC172019DDE2 /* Pods */, - 76443A8345AFB0A4BBAA0AC0 /* Frameworks */, + 74F978A3215AD111005A0F04 /* Flutter */, + 74F9787A215AB9F3005A0F04 /* Config */, + 74F97863215AB9E8005A0F04 /* Host */, + 74F97862215AB9E8005A0F04 /* Products */, + 74F9788B215AC328005A0F04 /* Frameworks */, + A4A9971F50C4EE357B74B6E0 /* Pods */, ); sourceTree = ""; }; - 74DB4A4A2152F3F900E9B550 /* Products */ = { + 74F97862215AB9E8005A0F04 /* Products */ = { isa = PBXGroup; children = ( - 74DB4A492152F3F900E9B550 /* Host.app */, + 74F97861215AB9E8005A0F04 /* Host.app */, ); name = Products; sourceTree = ""; }; - 74DB4A4B2152F3F900E9B550 /* Host */ = { + 74F97863215AB9E8005A0F04 /* Host */ = { isa = PBXGroup; children = ( - 74DB4A4C2152F3F900E9B550 /* AppDelegate.h */, - 74DB4A4D2152F3F900E9B550 /* AppDelegate.m */, - 74DB4A4F2152F3F900E9B550 /* ViewController.h */, - 74DB4A502152F3F900E9B550 /* ViewController.m */, - 74DB4A522152F3F900E9B550 /* Main.storyboard */, - 74DB4A552152F3FB00E9B550 /* Assets.xcassets */, - 74DB4A572152F3FB00E9B550 /* LaunchScreen.storyboard */, - 74DB4A5A2152F3FB00E9B550 /* Info.plist */, - 74DB4A5B2152F3FB00E9B550 /* main.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 */, + 74F97873215AB9E9005A0F04 /* main.m */, ); path = Host; sourceTree = ""; }; - 74DB4A7E2152F47500E9B550 /* Config */ = { + 74F9787A215AB9F3005A0F04 /* Config */ = { isa = PBXGroup; children = ( - 74DB4A8221541FEE00E9B550 /* Flutter.xcconfig */, - 74DB4A7F2152F49200E9B550 /* Debug.xcconfig */, - 74DB4A802152F4A400E9B550 /* Release.xcconfig */, + 74F9787C215ABA73005A0F04 /* Flutter.xcconfig */, + 74F9787B215ABA08005A0F04 /* Debug.xcconfig */, + 74F9787D215ABA9D005A0F04 /* Release.xcconfig */, ); path = Config; sourceTree = ""; }; - 74DB4A8121541FDF00E9B550 /* Flutter */ = { + 74F9788B215AC328005A0F04 /* Frameworks */ = { isa = PBXGroup; children = ( - 74DB4A882154204700E9B550 /* Flutter.framework */, - 74DB4A862154203700E9B550 /* flutter_assets */, - 74DB4A842154201200E9B550 /* App.framework */, - ); - path = Flutter; - sourceTree = ""; - }; - 76443A8345AFB0A4BBAA0AC0 /* Frameworks */ = { - isa = PBXGroup; - children = ( - A7845ED770D25CF67B243D1A /* libPods-Host.a */, + 2499C53F0BD30E24745E2F6B /* libPods-Host.a */, ); name = Frameworks; sourceTree = ""; }; - D22B5E2B5577AC172019DDE2 /* Pods */ = { + 74F978A3215AD111005A0F04 /* Flutter */ = { + isa = PBXGroup; + children = ( + 74F978AC215AD6E8005A0F04 /* App.framework */, + 74F978AA215AD6DC005A0F04 /* flutter_assets */, + ); + path = Flutter; + sourceTree = ""; + }; + A4A9971F50C4EE357B74B6E0 /* Pods */ = { isa = PBXGroup; children = ( ); @@ -140,16 +136,17 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 74DB4A482152F3F900E9B550 /* Host */ = { + 74F97860215AB9E8005A0F04 /* Host */ = { isa = PBXNativeTarget; - buildConfigurationList = 74DB4A752152F3FB00E9B550 /* Build configuration list for PBXNativeTarget "Host" */; + buildConfigurationList = 74F97877215AB9E9005A0F04 /* Build configuration list for PBXNativeTarget "Host" */; buildPhases = ( - 30AC91A315B5AD0C33571E2F /* [CP] Check Pods Manifest.lock */, - 74DB4A452152F3F900E9B550 /* Sources */, - 74DB4A462152F3F900E9B550 /* Frameworks */, - 74DB4A472152F3F900E9B550 /* Resources */, - 00F45C5930D73692644264A6 /* [CP] Embed Pods Frameworks */, - 74DB4A8C2154205B00E9B550 /* Embed Frameworks */, + EDACAC7378E52BD5BBDB34D5 /* [CP] Check Pods Manifest.lock */, + 74F9787E215ABB1B005A0F04 /* Run Script */, + 74F9785D215AB9E8005A0F04 /* Sources */, + 74F9785E215AB9E8005A0F04 /* Frameworks */, + 74F9785F215AB9E8005A0F04 /* Resources */, + 53642CAE5328D86A50FDAD59 /* [CP] Embed Pods Frameworks */, + 74F978A2215ACF9B005A0F04 /* Embed Frameworks */, ); buildRules = ( ); @@ -157,24 +154,24 @@ ); name = Host; productName = Host; - productReference = 74DB4A492152F3F900E9B550 /* Host.app */; + productReference = 74F97861215AB9E8005A0F04 /* Host.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ - 74DB4A412152F3F900E9B550 /* Project object */ = { + 74F97859215AB9E8005A0F04 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0940; - ORGANIZATIONNAME = Flutter; + LastUpgradeCheck = 1000; + ORGANIZATIONNAME = flutter.io; TargetAttributes = { - 74DB4A482152F3F900E9B550 = { - CreatedOnToolsVersion = 9.4.1; + 74F97860215AB9E8005A0F04 = { + CreatedOnToolsVersion = 10.0; }; }; }; - buildConfigurationList = 74DB4A442152F3F900E9B550 /* Build configuration list for PBXProject "Host" */; + buildConfigurationList = 74F9785C215AB9E8005A0F04 /* Build configuration list for PBXProject "Host" */; compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; @@ -182,39 +179,39 @@ en, Base, ); - mainGroup = 74DB4A402152F3F900E9B550; - productRefGroup = 74DB4A4A2152F3F900E9B550 /* Products */; + mainGroup = 74F97858215AB9E8005A0F04; + productRefGroup = 74F97862215AB9E8005A0F04 /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 74DB4A482152F3F900E9B550 /* Host */, + 74F97860215AB9E8005A0F04 /* Host */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 74DB4A472152F3F900E9B550 /* Resources */ = { + 74F9785F215AB9E8005A0F04 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 74DB4A592152F3FB00E9B550 /* LaunchScreen.storyboard in Resources */, - 74DB4A872154203700E9B550 /* flutter_assets in Resources */, - 74DB4A562152F3FB00E9B550 /* Assets.xcassets in Resources */, - 74DB4A542152F3F900E9B550 /* Main.storyboard in Resources */, + 74F97871215AB9E9005A0F04 /* LaunchScreen.storyboard in Resources */, + 74F9786E215AB9E9005A0F04 /* Assets.xcassets in Resources */, + 74F978AB215AD6DC005A0F04 /* flutter_assets in Resources */, + 74F9786C215AB9E8005A0F04 /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 00F45C5930D73692644264A6 /* [CP] Embed Pods Frameworks */ = { + 53642CAE5328D86A50FDAD59 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( "${SRCROOT}/Pods/Target Support Files/Pods-Host/Pods-Host-frameworks.sh", - "${PODS_ROOT}/../../tst04/.ios/Flutter/engine/Flutter.framework", + "${PODS_ROOT}/../../hello/.ios/Flutter/engine/Flutter.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( @@ -225,7 +222,21 @@ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Host/Pods-Host-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 30AC91A315B5AD0C33571E2F /* [CP] Check Pods Manifest.lock */ = { + 74F9787E215ABB1B005A0F04 /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n"; + }; + EDACAC7378E52BD5BBDB34D5 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -246,31 +257,31 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 74DB4A452152F3F900E9B550 /* Sources */ = { + 74F9785D215AB9E8005A0F04 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 74DB4A512152F3F900E9B550 /* ViewController.m in Sources */, - 74DB4A5C2152F3FB00E9B550 /* main.m in Sources */, - 74DB4A4E2152F3F900E9B550 /* AppDelegate.m in Sources */, + 74F97869215AB9E8005A0F04 /* ViewController.m in Sources */, + 74F97874215AB9E9005A0F04 /* main.m in Sources */, + 74F97866215AB9E8005A0F04 /* AppDelegate.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXVariantGroup section */ - 74DB4A522152F3F900E9B550 /* Main.storyboard */ = { + 74F9786A215AB9E8005A0F04 /* Main.storyboard */ = { isa = PBXVariantGroup; children = ( - 74DB4A532152F3F900E9B550 /* Base */, + 74F9786B215AB9E8005A0F04 /* Base */, ); name = Main.storyboard; sourceTree = ""; }; - 74DB4A572152F3FB00E9B550 /* LaunchScreen.storyboard */ = { + 74F9786F215AB9E9005A0F04 /* LaunchScreen.storyboard */ = { isa = PBXVariantGroup; children = ( - 74DB4A582152F3FB00E9B550 /* Base */, + 74F97870215AB9E9005A0F04 /* Base */, ); name = LaunchScreen.storyboard; sourceTree = ""; @@ -278,7 +289,7 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 74DB4A732152F3FB00E9B550 /* Debug */ = { + 74F97875215AB9E9005A0F04 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -329,14 +340,15 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.4; - MTL_ENABLE_DEBUG_INFO = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; }; name = Debug; }; - 74DB4A742152F3FB00E9B550 /* Release */ = { + 74F97876215AB9E9005A0F04 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -381,41 +393,44 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.4; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; }; name = Release; }; - 74DB4A762152F3FB00E9B550 /* Debug */ = { + 74F97878215AB9E9005A0F04 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 74DB4A7F2152F49200E9B550 /* Debug.xcconfig */; + baseConfigurationReference = 74F9787B215ABA08005A0F04 /* Debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = Host/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - DEVELOPMENT_TEAM = RW9CXS8BK2; PRODUCT_BUNDLE_IDENTIFIER = io.flutter.add2app.Host; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; - 74DB4A772152F3FB00E9B550 /* Release */ = { + 74F97879215AB9E9005A0F04 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 74DB4A802152F4A400E9B550 /* Release.xcconfig */; + baseConfigurationReference = 74F9787D215ABA9D005A0F04 /* Release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = Host/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - DEVELOPMENT_TEAM = RW9CXS8BK2; PRODUCT_BUNDLE_IDENTIFIER = io.flutter.add2app.Host; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -425,25 +440,25 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 74DB4A442152F3F900E9B550 /* Build configuration list for PBXProject "Host" */ = { + 74F9785C215AB9E8005A0F04 /* Build configuration list for PBXProject "Host" */ = { isa = XCConfigurationList; buildConfigurations = ( - 74DB4A732152F3FB00E9B550 /* Debug */, - 74DB4A742152F3FB00E9B550 /* Release */, + 74F97875215AB9E9005A0F04 /* Debug */, + 74F97876215AB9E9005A0F04 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 74DB4A752152F3FB00E9B550 /* Build configuration list for PBXNativeTarget "Host" */ = { + 74F97877215AB9E9005A0F04 /* Build configuration list for PBXNativeTarget "Host" */ = { isa = XCConfigurationList; buildConfigurations = ( - 74DB4A762152F3FB00E9B550 /* Debug */, - 74DB4A772152F3FB00E9B550 /* Release */, + 74F97878215AB9E9005A0F04 /* Debug */, + 74F97879215AB9E9005A0F04 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; - rootObject = 74DB4A412152F3F900E9B550 /* Project object */; + rootObject = 74F97859215AB9E8005A0F04 /* Project object */; } diff --git a/dev/integration_tests/ios_host_app/Host.xcworkspace/xcuserdata/mravn.xcuserdatad/UserInterfaceState.xcuserstate b/dev/integration_tests/ios_host_app/Host.xcworkspace/xcuserdata/mravn.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 40eb4bcb278d93199c9eb48c97cf44fab874d88d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26773 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 YS{2;yWMBgAjAme9U|SC1!^miL07~CKM*si- diff --git a/dev/integration_tests/ios_host_app/Host/AppDelegate.h b/dev/integration_tests/ios_host_app/Host/AppDelegate.h index d944abe46e..440466ae7f 100644 --- a/dev/integration_tests/ios_host_app/Host/AppDelegate.h +++ b/dev/integration_tests/ios_host_app/Host/AppDelegate.h @@ -3,3 +3,4 @@ @interface AppDelegate : FlutterAppDelegate @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 f83f6fd581..bfa3612941 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,5 +1,5 @@ - + 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 index d7c78a1255..942f0bc452 100644 --- a/dev/integration_tests/ios_host_app/Host/Base.lproj/Main.storyboard +++ b/dev/integration_tests/ios_host_app/Host/Base.lproj/Main.storyboard @@ -1,5 +1,5 @@ - + diff --git a/dev/integration_tests/ios_host_app/Host/ViewController.m b/dev/integration_tests/ios_host_app/Host/ViewController.m index b8db22bc3e..610117168d 100644 --- a/dev/integration_tests/ios_host_app/Host/ViewController.m +++ b/dev/integration_tests/ios_host_app/Host/ViewController.m @@ -3,6 +3,7 @@ #import "FlutterPluginRegistrant/GeneratedPluginRegistrant.h" @implementation ViewController + - (void)viewDidLoad { [super viewDidLoad]; UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom]; @@ -20,4 +21,5 @@ [GeneratedPluginRegistrant registerWithRegistry:flutterViewController]; [self presentViewController:flutterViewController animated:false completion:nil]; } + @end diff --git a/dev/integration_tests/ios_host_app/Podfile b/dev/integration_tests/ios_host_app/Podfile index bac985d148..ec1b8b9120 100644 --- a/dev/integration_tests/ios_host_app/Podfile +++ b/dev/integration_tests/ios_host_app/Podfile @@ -2,5 +2,5 @@ platform :ios, '9.0' target 'Host' do flutter_application_path = '../hello' - eval(File.read(File.join(flutter_application_path, '.ios', 'Flutter', 'podhelper.rb')), binding) + eval(File.read("#{flutter_application_path}/.ios/Flutter/podhelper.rb")) end diff --git a/packages/flutter_tools/bin/xcode_backend.sh b/packages/flutter_tools/bin/xcode_backend.sh index c8b6189839..ad01219401 100755 --- a/packages/flutter_tools/bin/xcode_backend.sh +++ b/packages/flutter_tools/bin/xcode_backend.sh @@ -81,7 +81,7 @@ BuildApp() { local derived_dir="${SOURCE_ROOT}/Flutter" if [[ -e "${project_path}/.ios" ]]; then - derived_dir="${SOURCE_ROOT}/../.ios/Flutter" + derived_dir="${project_path}/.ios/Flutter" fi RunCommand mkdir -p -- "$derived_dir" AssertExists "$derived_dir" diff --git a/packages/flutter_tools/lib/src/plugins.dart b/packages/flutter_tools/lib/src/plugins.dart index d0906a4ad0..e9a16d7a1e 100644 --- a/packages/flutter_tools/lib/src/plugins.dart +++ b/packages/flutter_tools/lib/src/plugins.dart @@ -224,7 +224,7 @@ Depends on all your plugins, and provides a function to register them. s.homepage = 'https://flutter.io' s.license = { :type => 'BSD' } s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' } - s.ios.deployment_target = '7.0' + s.ios.deployment_target = '8.0' s.source_files = "Classes", "Classes/**/*.{h,m}" s.source = { :path => '.' } s.public_header_files = './Classes/**/*.h'