Commit 52697ef9 authored by Mikkel Nygaard Ravn's avatar Mikkel Nygaard Ravn Committed by Dan Field

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
parent eda22840
#include "Flutter.xcconfig" #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"
#include "Flutter.xcconfig" #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 FLUTTER_BUILD_MODE=release
...@@ -3,3 +3,4 @@ ...@@ -3,3 +3,4 @@
@interface AppDelegate : FlutterAppDelegate @interface AppDelegate : FlutterAppDelegate
@end @end
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" systemVersion="17A277" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<dependencies> <dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/>
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" systemVersion="17A277" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
<dependencies> <dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/>
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
#import "FlutterPluginRegistrant/GeneratedPluginRegistrant.h" #import "FlutterPluginRegistrant/GeneratedPluginRegistrant.h"
@implementation ViewController @implementation ViewController
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom]; UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
...@@ -20,4 +21,5 @@ ...@@ -20,4 +21,5 @@
[GeneratedPluginRegistrant registerWithRegistry:flutterViewController]; [GeneratedPluginRegistrant registerWithRegistry:flutterViewController];
[self presentViewController:flutterViewController animated:false completion:nil]; [self presentViewController:flutterViewController animated:false completion:nil];
} }
@end @end
...@@ -2,5 +2,5 @@ platform :ios, '9.0' ...@@ -2,5 +2,5 @@ platform :ios, '9.0'
target 'Host' do target 'Host' do
flutter_application_path = '../hello' 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 end
...@@ -81,7 +81,7 @@ BuildApp() { ...@@ -81,7 +81,7 @@ BuildApp() {
local derived_dir="${SOURCE_ROOT}/Flutter" local derived_dir="${SOURCE_ROOT}/Flutter"
if [[ -e "${project_path}/.ios" ]]; then if [[ -e "${project_path}/.ios" ]]; then
derived_dir="${SOURCE_ROOT}/../.ios/Flutter" derived_dir="${project_path}/.ios/Flutter"
fi fi
RunCommand mkdir -p -- "$derived_dir" RunCommand mkdir -p -- "$derived_dir"
AssertExists "$derived_dir" AssertExists "$derived_dir"
......
...@@ -224,7 +224,7 @@ Depends on all your plugins, and provides a function to register them. ...@@ -224,7 +224,7 @@ Depends on all your plugins, and provides a function to register them.
s.homepage = 'https://flutter.io' s.homepage = 'https://flutter.io'
s.license = { :type => 'BSD' } s.license = { :type => 'BSD' }
s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' } 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_files = "Classes", "Classes/**/*.{h,m}"
s.source = { :path => '.' } s.source = { :path => '.' }
s.public_header_files = './Classes/**/*.h' s.public_header_files = './Classes/**/*.h'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment