Skip to content

F
Front-End
Commit 8d56fae5 authored by Adam Barth's avatar Adam Barth Committed by GitHub
Browse files
Options

Finish integrating HelloServices model on iOS (#4820) 

This patch changes the default `flutter create` command to generate a
HelloServices-style app on iOS. As a consequence, the Atom integration now
fully works with HelloServices.
parent 5dae820c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 490 additions and 270 deletions
examples/hello_services/ios/.gitignore
View file @ 8d56fae5
...@@ -35,3 +35,4 @@ Icon? ...@@ -35,3 +35,4 @@ Icon?
/Flutter/app.zip /Flutter/app.zip
/Flutter/Flutter.framework /Flutter/Flutter.framework
/Flutter/Generated.xcconfig /Flutter/Generated.xcconfig
/ServiceDefinitions.json
examples/hello_services/ios/HelloServices.xcodeproj/project.pbxproj → examples/hello_services/ios/Runner.xcodeproj/project.pbxproj
View file @ 8d56fae5
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
977505181CFDF23500BC28DA /* LocationProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LocationProvider.m; sourceTree = "<group>"; }; 977505181CFDF23500BC28DA /* LocationProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LocationProvider.m; sourceTree = "<group>"; };
97A38A331CFDEC680099F1B4 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; }; 97A38A331CFDEC680099F1B4 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
97A38A341CFDEC880099F1B4 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; }; 97A38A341CFDEC880099F1B4 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
97C146EE1CF9000F007C117D /* HelloServices.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HelloServices.app; sourceTree = BUILT_PRODUCTS_DIR; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; }; 97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; }; 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; }; 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
9740EEB11CF90186004384FC /* Flutter */, 9740EEB11CF90186004384FC /* Flutter */,
97C146F01CF9000F007C117D /* HelloServices */, 97C146F01CF9000F007C117D /* Runner */,
97C146EF1CF9000F007C117D /* Products */, 97C146EF1CF9000F007C117D /* Products */,
); );
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -90,12 +90,12 @@ ...@@ -90,12 +90,12 @@
97C146EF1CF9000F007C117D /* Products */ = { 97C146EF1CF9000F007C117D /* Products */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
97C146EE1CF9000F007C117D /* HelloServices.app */, 97C146EE1CF9000F007C117D /* Runner.app */,
); );
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
97C146F01CF9000F007C117D /* HelloServices */ = { 97C146F01CF9000F007C117D /* Runner */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
97C146FA1CF9000F007C117D /* Main.storyboard */, 97C146FA1CF9000F007C117D /* Main.storyboard */,
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
977505171CFDF21E00BC28DA /* LocationProvider.h */, 977505171CFDF21E00BC28DA /* LocationProvider.h */,
977505181CFDF23500BC28DA /* LocationProvider.m */, 977505181CFDF23500BC28DA /* LocationProvider.m */,
); );
path = HelloServices; path = Runner;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
97C146F11CF9000F007C117D /* Supporting Files */ = { 97C146F11CF9000F007C117D /* Supporting Files */ = {
...@@ -122,9 +122,9 @@ ...@@ -122,9 +122,9 @@
/* End PBXGroup section */ /* End PBXGroup section */
/* Begin PBXNativeTarget section */ /* Begin PBXNativeTarget section */
97C146ED1CF9000F007C117D /* HelloServices */ = { 97C146ED1CF9000F007C117D /* Runner */ = {
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "HelloServices" */; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
buildPhases = ( buildPhases = (
9740EEB61CF901F6004384FC /* ShellScript */, 9740EEB61CF901F6004384FC /* ShellScript */,
97C146EA1CF9000F007C117D /* Sources */, 97C146EA1CF9000F007C117D /* Sources */,
...@@ -136,9 +136,9 @@ ...@@ -136,9 +136,9 @@
); );
dependencies = ( dependencies = (
); );
name = HelloServices; name = Runner;
productName = HelloServices; productName = Runner;
productReference = 97C146EE1CF9000F007C117D /* HelloServices.app */; productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
productType = "com.apple.product-type.application"; productType = "com.apple.product-type.application";
}; };
/* End PBXNativeTarget section */ /* End PBXNativeTarget section */
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
}; };
}; };
}; };
buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "HelloServices" */; buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
compatibilityVersion = "Xcode 3.2"; compatibilityVersion = "Xcode 3.2";
developmentRegion = English; developmentRegion = English;
hasScannedForEncodings = 0; hasScannedForEncodings = 0;
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
projectDirPath = ""; projectDirPath = "";
projectRoot = ""; projectRoot = "";
targets = ( targets = (
97C146ED1CF9000F007C117D /* HelloServices */, 97C146ED1CF9000F007C117D /* Runner */,
); );
}; };
/* End PBXProject section */ /* End PBXProject section */
...@@ -334,7 +334,7 @@ ...@@ -334,7 +334,7 @@
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/Flutter", "$(PROJECT_DIR)/Flutter",
); );
INFOPLIST_FILE = HelloServices/Info.plist; INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
...@@ -355,7 +355,7 @@ ...@@ -355,7 +355,7 @@
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/Flutter", "$(PROJECT_DIR)/Flutter",
); );
INFOPLIST_FILE = HelloServices/Info.plist; INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
...@@ -369,7 +369,7 @@ ...@@ -369,7 +369,7 @@
/* End XCBuildConfiguration section */ /* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */ /* Begin XCConfigurationList section */
97C146E91CF9000F007C117D /* Build configuration list for PBXProject "HelloServices" */ = { 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
97C147031CF9000F007C117D /* Debug */, 97C147031CF9000F007C117D /* Debug */,
...@@ -378,7 +378,7 @@ ...@@ -378,7 +378,7 @@
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release; defaultConfigurationName = Release;
}; };
97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "HelloServices" */ = { 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
97C147061CF9000F007C117D /* Debug */, 97C147061CF9000F007C117D /* Debug */,
......
examples/hello_services/ios/HelloServices/Info.plist → examples/hello_services/ios/Runner/Info.plist
View file @ 8d56fae5
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string> <string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string> <string>com.example.HelloServices</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string> <string>HelloServices</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
......
packages/flutter_tools/lib/src/application_package.dart
View file @ 8d56fae5
...@@ -96,13 +96,13 @@ class IOSApp extends ApplicationPackage { ...@@ -96,13 +96,13 @@ class IOSApp extends ApplicationPackage {
if (getCurrentHostPlatform() != HostPlatform.darwin_x64) if (getCurrentHostPlatform() != HostPlatform.darwin_x64)
return null; return null;
String plistPath = path.join('ios', 'Info.plist'); String plistPath = path.join('ios', 'Runner', 'Info.plist');
String value = getValueFromFile(plistPath, kCFBundleIdentifierKey); String value = getValueFromFile(plistPath, kCFBundleIdentifierKey);
if (value == null) if (value == null)
return null; return null;
return new IOSApp( return new IOSApp(
projectDir: path.join('ios', '.generated'), projectDir: path.join('ios'),
projectBundleId: value projectBundleId: value
); );
} }
......
packages/flutter_tools/lib/src/ios/mac.dart
View file @ 8d56fae5
...@@ -105,16 +105,7 @@ Future<XcodeBuildResult> buildXcodeProject({ ...@@ -105,16 +105,7 @@ Future<XcodeBuildResult> buildXcodeProject({
bool codesign: true bool codesign: true
}) async { }) async {
String flutterProjectPath = Directory.current.path; String flutterProjectPath = Directory.current.path;
updateXcodeGeneratedProperties(flutterProjectPath, mode, target);
if (xcodeProjectRequiresUpdate(mode, target)) {
printTrace('Initializing the Xcode project.');
if ((await setupXcodeProjectHarness(flutterProjectPath, mode, target)) != 0) {
printError('Could not initialize the Xcode project.');
return new XcodeBuildResult(false);
}
} else {
updateXcodeGeneratedProperties(flutterProjectPath, mode, target);
}
if (!_checkXcodeVersion()) if (!_checkXcodeVersion())
return new XcodeBuildResult(false); return new XcodeBuildResult(false);
...@@ -130,7 +121,6 @@ Future<XcodeBuildResult> buildXcodeProject({ ...@@ -130,7 +121,6 @@ Future<XcodeBuildResult> buildXcodeProject({
'xcodebuild', 'xcodebuild',
'clean', 'clean',
'build', 'build',
'-target', 'Runner',
'-configuration', 'Release', '-configuration', 'Release',
'ONLY_ACTIVE_ARCH=YES', 'ONLY_ACTIVE_ARCH=YES',
]; ];
......
packages/flutter_tools/lib/src/ios/setup_xcodeproj.dart
View file @ 8d56fae5
...@@ -2,16 +2,13 @@ ...@@ -2,16 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
import 'dart:async';
import 'dart:io'; import 'dart:io';
import 'package:path/path.dart' as path; import 'package:path/path.dart' as path;
import '../base/file_system.dart' show copyFolderSync;
import '../build_info.dart'; import '../build_info.dart';
import '../cache.dart'; import '../cache.dart';
import '../globals.dart'; import '../globals.dart';
import '../version.dart';
void updateXcodeGeneratedProperties(String projectPath, BuildMode mode, String target) { void updateXcodeGeneratedProperties(String projectPath, BuildMode mode, String target) {
StringBuffer localsBuffer = new StringBuffer(); StringBuffer localsBuffer = new StringBuffer();
...@@ -37,54 +34,7 @@ void updateXcodeGeneratedProperties(String projectPath, BuildMode mode, String t ...@@ -37,54 +34,7 @@ void updateXcodeGeneratedProperties(String projectPath, BuildMode mode, String t
if (tools.isLocalEngine) if (tools.isLocalEngine)
localsBuffer.writeln('LOCAL_ENGINE=${tools.engineBuildPath}'); localsBuffer.writeln('LOCAL_ENGINE=${tools.engineBuildPath}');
File localsFile = new File(path.join(projectPath, 'ios', '.generated', 'Flutter', 'Generated.xcconfig')); File localsFile = new File(path.join(projectPath, 'ios', 'Flutter', 'Generated.xcconfig'));
localsFile.createSync(recursive: true); localsFile.createSync(recursive: true);
localsFile.writeAsStringSync(localsBuffer.toString()); localsFile.writeAsStringSync(localsBuffer.toString());
} }
bool xcodeProjectRequiresUpdate(BuildMode mode, String target) {
File revisionFile = new File(path.join(Directory.current.path, 'ios', '.generated', 'REVISION'));
// If the revision stamp does not exist, the Xcode project definitely requires
// an update
if (!revisionFile.existsSync()) {
printTrace("A revision stamp does not exist. The Xcode project has never been initialized.");
return true;
}
if (revisionFile.readAsStringSync() != _getCurrentXcodeRevisionString(mode, target)) {
printTrace("The revision stamp and the Flutter engine revision differ or the build mode has changed.");
printTrace("Project needs to be updated.");
return true;
}
printTrace("Xcode project is up to date.");
return false;
}
Future<int> setupXcodeProjectHarness(String flutterProjectPath, BuildMode mode, String target) async {
// Step 1: Copy templates into user project directory
String iosFilesPath = path.join(flutterProjectPath, 'ios');
String xcodeProjectPath = path.join(iosFilesPath, '.generated');
String templatesPath = path.join(Cache.flutterRoot, 'packages', 'flutter_tools', 'templates', 'build-ios');
copyFolderSync(templatesPath, xcodeProjectPath);
// Step 2: Populate the Generated.xcconfig with project specific paths
updateXcodeGeneratedProperties(flutterProjectPath, mode, target);
// Step 3: Write the REVISION file
File revisionFile = new File(path.join(xcodeProjectPath, 'REVISION'));
revisionFile.createSync();
revisionFile.writeAsStringSync(_getCurrentXcodeRevisionString(mode, target));
// Step 4: Tell the user the location of the generated project.
printStatus('Xcode project created in $iosFilesPath/.');
return 0;
}
String _getCurrentXcodeRevisionString(BuildMode mode, String target) => (new StringBuffer()
..write('${FlutterVersion.getVersion().frameworkRevision}')
..write('-${tools.isLocalEngine ? tools.engineBuildPath : getModeName(mode)}')
..write('::$target')
).toString();
packages/flutter_tools/lib/src/run.dart
View file @ 8d56fae5
...@@ -413,7 +413,7 @@ String getMissingPackageHintForPlatform(TargetPlatform platform) { ...@@ -413,7 +413,7 @@ String getMissingPackageHintForPlatform(TargetPlatform platform) {
case TargetPlatform.android_x64: case TargetPlatform.android_x64:
return 'Is your project missing an android/AndroidManifest.xml?\nConsider running "flutter create ." to create one.'; return 'Is your project missing an android/AndroidManifest.xml?\nConsider running "flutter create ." to create one.';
case TargetPlatform.ios: case TargetPlatform.ios:
return 'Is your project missing an ios/Info.plist?\nConsider running "flutter create ." to create one.'; return 'Is your project missing an ios/Runner/Info.plist?\nConsider running "flutter create ." to create one.';
default: default:
return null; return null;
} }
......
packages/flutter_tools/templates/build-ios/FlutterApplication.xcodeproj/xcshareddata/xcschemes/Application.xcscheme deleted 100644 → 0
View file @ 5dae820c
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9E07CF991BE8280A00BCD8DE"
BuildableName = "Runner.app"
BlueprintName = "Runner"
ReferencedContainer = "container:FlutterApplication.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9E07CF991BE8280A00BCD8DE"
BuildableName = "Runner.app"
BlueprintName = "Runner"
ReferencedContainer = "container:FlutterApplication.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9E07CF991BE8280A00BCD8DE"
BuildableName = "Runner.app"
BlueprintName = "Runner"
ReferencedContainer = "container:FlutterApplication.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<CommandLineArguments>
<CommandLineArgument
argument = "--no-redirect-to-syslog"
isEnabled = "YES">
</CommandLineArgument>
<CommandLineArgument
argument = "--observatory-port=8181"
isEnabled = "YES">
</CommandLineArgument>
</CommandLineArguments>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9E07CF991BE8280A00BCD8DE"
BuildableName = "Runner.app"
BlueprintName = "Runner"
ReferencedContainer = "container:FlutterApplication.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
packages/flutter_tools/templates/build-ios/FlutterApplication.xcodeproj/xcshareddata/xcschemes/Framework.xcscheme deleted 100644 → 0
View file @ 5dae820c
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0720"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9E07CF851BE7F4D200BCD8DE"
BuildableName = "FlutterApplication.framework"
BlueprintName = "FlutterApplication"
ReferencedContainer = "container:FlutterApplication.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9E07CF851BE7F4D200BCD8DE"
BuildableName = "FlutterApplication.framework"
BlueprintName = "FlutterApplication"
ReferencedContainer = "container:FlutterApplication.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9E07CF851BE7F4D200BCD8DE"
BuildableName = "FlutterApplication.framework"
BlueprintName = "FlutterApplication"
ReferencedContainer = "container:FlutterApplication.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
packages/flutter_tools/templates/create/ios.tmpl/.gitignore 0 → 100644
View file @ 8d56fae5
.idea/
.vagrant/
.sconsign.dblite
.svn/
.DS_Store
*.swp
*.lock
profile
DerivedData/
build/
*.pbxuser
*.mode1v3
*.mode2v3
*.perspectivev3
!default.pbxuser
!default.mode1v3
!default.mode2v3
!default.perspectivev3
xcuserdata
*.moved-aside
*.pyc
*sync/
Icon?
.tags*
/Flutter/app.flx
/Flutter/app.dylib
/Flutter/app.zip
/Flutter/Flutter.framework
/Flutter/Generated.xcconfig
/ServiceDefinitions.json
packages/flutter_tools/templates/build-ios/FlutterApplication.xcodeproj/project.xcworkspace/contents.xcworkspacedata → packages/flutter_tools/templates/create/ios.tmpl/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file @ 8d56fae5
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
<Workspace <Workspace
version = "1.0"> version = "1.0">
<FileRef <FileRef
location = "self:FlutterApplication.xcodeproj"> location = "self:Runner.xcodeproj">
</FileRef> </FileRef>
</Workspace> </Workspace>
packages/flutter_tools/templates/create/ios/LaunchScreen.storyboard.tmpl → packages/flutter_tools/templates/create/ios.tmpl/Runner/Base.lproj/LaunchScreen.storyboard
View file @ 8d56fae5
<?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="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
</dependencies> </dependencies>
<scenes> <scenes>
<!--View Controller--> <!--View Controller-->
......
packages/flutter_tools/templates/create/ios.tmpl/Runner/Base.lproj/Main.storyboard 0 → 100644
View file @ 8d56fae5
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6211" systemVersion="14A298i" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6204"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="tne-QT-ifu">
<objects>
<viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
</objects>
</scene>
</scenes>
</document>
packages/flutter_tools/templates/create/ios/Info.plist.tmpl → packages/flutter_tools/templates/create/ios.tmpl/Runner/Info.plist.tmpl
View file @ 8d56fae5
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>en</string> <string>en</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>Runner</string> <string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>{{iosIdentifier}}</string> <string>{{iosIdentifier}}</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
<true/> <true/>
<key>UILaunchStoryboardName</key> <key>UILaunchStoryboardName</key>
<string>LaunchScreen</string> <string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<key>UIRequiredDeviceCapabilities</key> <key>UIRequiredDeviceCapabilities</key>
<array> <array>
<string>arm64</string> <string>arm64</string>
...@@ -41,7 +43,7 @@ ...@@ -41,7 +43,7 @@
<string>UIInterfaceOrientationLandscapeLeft</string> <string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string> <string>UIInterfaceOrientationLandscapeRight</string>
</array> </array>
<key>UIViewControllerBasedStatusBarAppearance</key> <key>UIViewControllerBasedStatusBarAppearance</key>
<false/> <false/>
</dict> </dict>
</plist> </plist>
packages/flutter_tools/templates/build-ios/Runner/main.m → packages/flutter_tools/templates/create/ios.tmpl/Runner/main.m
View file @ 8d56fae5
...@@ -5,8 +5,10 @@ ...@@ -5,8 +5,10 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#import <Flutter/Flutter.h> #import <Flutter/Flutter.h>
int main(int argc, const char* argv[]) { int main(int argc, char * argv[]) {
FlutterInit(argc, argv); FlutterInit(argc, (const char**)argv);
return UIApplicationMain(argc, (char**)argv, nil, @autoreleasepool {
NSStringFromClass([FlutterAppDelegate class])); return UIApplicationMain(argc, argv, nil,
NSStringFromClass([FlutterAppDelegate class]));
}
} }
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

HIAST - GitLab