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 55d2bd85f84..3f48cdec9af 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 a0a01975433..e9764d16865 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 00000000000..e69de29bb2d 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 c6086b7cc23..a807ebcf390 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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 - + 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 d7c78a1255c..942f0bc452d 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 b8db22bc3e9..610117168da 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 bac985d1489..ec1b8b91201 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 c8b61898390..ad012194015 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 d0906a4ad04..e9a16d7a1ec 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'