Xcode 9 merge to master (#3043)

* A pretty breezy xcode9 upgrade. You can also enable the experimental compiler under project-settings->Build System

* Xcode9: updates to readme

Author: garvankeeley

Client.xcodeproj/project.pbxproj

@@ -6776,6 +6776,7 @@
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = "$(BUILD_DIR)/Release$(EFFECTIVE_PLATFORM_NAME)";
 				MOZ_INTERNAL_URL_SCHEME = "firefox-internal";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = (
@@ -7793,6 +7794,7 @@
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = "$(BUILD_DIR)/Release$(EFFECTIVE_PLATFORM_NAME)";
 				MOZ_INTERNAL_URL_SCHEME = fennec;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -8415,6 +8417,7 @@
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = "$(BUILD_DIR)/Release$(EFFECTIVE_PLATFORM_NAME)";
 				MOZ_INTERNAL_URL_SCHEME = "firefox-beta";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = (
@@ -8849,6 +8852,7 @@
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = "$(BUILD_DIR)/Release$(EFFECTIVE_PLATFORM_NAME)";
 				MOZ_INTERNAL_URL_SCHEME = fennec;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;

README.md

@@ -3,12 +3,12 @@ Firefox for iOS [![codebeat badge](https://codebeat.co/badges/67e58b6d-bc89-4f22
 
 Download on the [App Store](https://itunes.apple.com/app/firefox-web-browser/id989804926).
 
-This branch
+This branch (master)
 -----------
 
 This branch is for mainline development that will ship in *v9.0*.
 
-This branch only works with Xcode 8.3.2, and supports iOS 9.x and 10.
+This branch only works with Xcode 9 (currently in beta), and supports iOS 9.x, 10, and 11.
 
 This branch is written in Swift 3.1.
 
@@ -55,8 +55,6 @@ Building the code
 1. Open `Client.xcodeproj` in Xcode.
 1. Build the `Fennec` scheme in Xcode.
 
-It is possible to use [App Code](https://www.jetbrains.com/objc/download/) instead of Xcode, but you will still require the Xcode developer tools.
-
 ## Contributor guidelines
 
 ### Creating a pull request

ThirdParty/SQLite.swift/Sources/SQLite/Core/Connection.swift

@@ -29,7 +29,7 @@ import sqlite3
 #elseif SQLITE_SWIFT_SQLCIPHER
 import SQLCipher
 #else
-import CSQLite
+import SQLite3
 #endif
 
 /// A connection to SQLite.

ThirdParty/SQLite.swift/Sources/SQLite/Core/Statement.swift

@@ -27,7 +27,7 @@ import sqlite3
 #elseif SQLITE_SWIFT_SQLCIPHER
 import SQLCipher
 #else
-import CSQLite
+import SQLite3
 #endif
 
 /// A single SQL statement.

ThirdParty/SQLite.swift/Sources/SQLite/Helpers.swift

@@ -27,7 +27,7 @@ import sqlite3
 #elseif SQLITE_SWIFT_SQLCIPHER
 import SQLCipher
 #else
-import CSQLite
+import SQLite3
 #endif
 
 public typealias Star = (Expression<Binding>?, Expression<Binding>?) -> Expression<Void>

ThirdParty/SQLite.swift/Tests/SQLiteTests/ConnectionTests.swift

@@ -6,7 +6,7 @@ import sqlite3
 #elseif SQLITE_SWIFT_SQLCIPHER
 import SQLCipher
 #else
-import CSQLite
+import SQLite3
 #endif
 
 class ConnectionTests : SQLiteTestCase {