From 90489498265c8fc966c4c708b1e6b50c3fef2c54 Mon Sep 17 00:00:00 2001 From: Todd Volkert Date: Fri, 12 Feb 2016 08:11:44 -0800 Subject: [PATCH 1/3] Ignore generated/ instead of ios/ --- examples/.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/.gitignore b/examples/.gitignore index 63e647d0cc..fbd86856ff 100644 --- a/examples/.gitignore +++ b/examples/.gitignore @@ -5,6 +5,6 @@ .packages .pub/ build/ -ios/ +generated/ packages pubspec.lock From 69e1647a87cf8a6d6b59762f0878bd03ccf1c89d Mon Sep 17 00:00:00 2001 From: Todd Volkert Date: Fri, 12 Feb 2016 08:18:58 -0800 Subject: [PATCH 2/3] review comments --- examples/.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/.gitignore b/examples/.gitignore index fbd86856ff..720fe70687 100644 --- a/examples/.gitignore +++ b/examples/.gitignore @@ -5,6 +5,6 @@ .packages .pub/ build/ -generated/ +ios/Generated/ packages pubspec.lock From 5d496143ba459e052b88d6a0603d455e44878c76 Mon Sep 17 00:00:00 2001 From: Todd Volkert Date: Fri, 12 Feb 2016 08:27:47 -0800 Subject: [PATCH 3/3] Review --- examples/.gitignore | 1 - packages/flutter_tools/lib/src/application_package.dart | 2 +- packages/flutter_tools/lib/src/commands/ios.dart | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/examples/.gitignore b/examples/.gitignore index 720fe70687..52808ddc1e 100644 --- a/examples/.gitignore +++ b/examples/.gitignore @@ -5,6 +5,5 @@ .packages .pub/ build/ -ios/Generated/ packages pubspec.lock diff --git a/packages/flutter_tools/lib/src/application_package.dart b/packages/flutter_tools/lib/src/application_package.dart index 99940ce795..b50878c1c6 100644 --- a/packages/flutter_tools/lib/src/application_package.dart +++ b/packages/flutter_tools/lib/src/application_package.dart @@ -82,7 +82,7 @@ class AndroidApk extends ApplicationPackage { class IOSApp extends ApplicationPackage { static const String _defaultId = 'io.flutter.runner.Runner'; - static const String _defaultPath = 'ios/Generated'; + static const String _defaultPath = 'ios/.generated'; IOSApp({ String localPath: _defaultPath, diff --git a/packages/flutter_tools/lib/src/commands/ios.dart b/packages/flutter_tools/lib/src/commands/ios.dart index 1075584a0c..64e64cd654 100644 --- a/packages/flutter_tools/lib/src/commands/ios.dart +++ b/packages/flutter_tools/lib/src/commands/ios.dart @@ -152,7 +152,7 @@ class IOSCommand extends FlutterCommand { Future _runInitCommand() async { // Step 1: Fetch the archive from the cloud String iosFilesPath = path.join(Directory.current.path, "ios"); - String xcodeprojPath = path.join(iosFilesPath, "Generated"); + String xcodeprojPath = path.join(iosFilesPath, ".generated"); List archiveBytes = await _fetchXcodeArchive(); if (archiveBytes.isEmpty) { @@ -172,7 +172,7 @@ class IOSCommand extends FlutterCommand { // one does not exist. File generatedGitignore = new File(path.join(iosFilesPath, ".gitignore")); if (!generatedGitignore.existsSync()) { - generatedGitignore.writeAsStringSync("Generated/\n"); + generatedGitignore.writeAsStringSync(".generated/\n"); } // Step 4: Setup default user editable files if this is the first run of