Fix Swift 4.1 warnings

jberkel · jberkel · commit f40ca4da2f02 · 2018-04-12T18:05:37.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: objective-c
 rvm: 2.3
-osx_image: xcode9
+osx_image: xcode9.3
 env:
   global:
     - IOS_SIMULATOR="iPhone 6s"
diff --git a/SQLite.xcodeproj/project.pbxproj b/SQLite.xcodeproj/project.pbxproj
@@ -680,7 +680,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0930;
 				TargetAttributes = {
 					03A65E591C6BB0F50062603F = {
 						CreatedOnToolsVersion = 7.2;
@@ -1148,12 +1148,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -1206,12 +1208,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
diff --git a/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite Mac.xcscheme b/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite Mac.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -56,7 +55,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite iOS.xcscheme b/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -56,7 +55,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite tvOS.xcscheme b/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -56,7 +55,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite watchOS.xcscheme b/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite watchOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Sources/SQLite/Typed/Coding.swift b/Sources/SQLite/Typed/Coding.swift
@@ -217,7 +217,7 @@ fileprivate class SQLiteDecoder : Decoder {
         }
 
         var allKeys: [Key] {
-            return self.row.columnNames.keys.flatMap({Key(stringValue: $0)})
+            return self.row.columnNames.keys.compactMap({Key(stringValue: $0)})
         }
 
         func contains(_ key: Key) -> Bool {
diff --git a/Sources/SQLite/Typed/CoreFunctions.swift b/Sources/SQLite/Typed/CoreFunctions.swift
@@ -637,7 +637,7 @@ extension ExpressionType where UnderlyingType == String? {
 
 }
 
-extension Collection where Iterator.Element : Value, IndexDistance == Int {
+extension Collection where Iterator.Element : Value {
 
     /// Builds a copy of the expression prepended with an `IN` check against the
     /// collection.
diff --git a/Sources/SQLite/Typed/Query.swift b/Sources/SQLite/Typed/Query.swift
@@ -647,7 +647,7 @@ extension QueryType {
             whereClause
         ]
 
-        return Insert(" ".join(clauses.flatMap { $0 }).expression)
+        return Insert(" ".join(clauses.compactMap { $0 }).expression)
     }
 
     /// Runs an `INSERT` statement against the query with `DEFAULT VALUES`.
@@ -690,7 +690,7 @@ extension QueryType {
             limitOffsetClause
         ]
 
-        return Update(" ".join(clauses.flatMap { $0 }).expression)
+        return Update(" ".join(clauses.compactMap { $0 }).expression)
     }
 
     // MARK: DELETE
@@ -704,7 +704,7 @@ extension QueryType {
             limitOffsetClause
         ]
 
-        return Delete(" ".join(clauses.flatMap { $0 }).expression)
+        return Delete(" ".join(clauses.compactMap { $0 }).expression)
     }
 
     // MARK: EXISTS
@@ -789,7 +789,7 @@ extension QueryType {
             limitOffsetClause
         ]
 
-        return " ".join(clauses.flatMap { $0 }).expression
+        return " ".join(clauses.compactMap { $0 }).expression
     }
 
 }
diff --git a/Sources/SQLite/Typed/Schema.swift b/Sources/SQLite/Typed/Schema.swift
@@ -47,7 +47,7 @@ extension Table {
             withoutRowid ? Expression<Void>(literal: "WITHOUT ROWID") : nil
         ]
 
-        return " ".join(clauses.flatMap { $0 }).asSQL()
+        return " ".join(clauses.compactMap { $0 }).asSQL()
     }
 
     public func create(_ query: QueryType, temporary: Bool = false, ifNotExists: Bool = false) -> String {
@@ -57,7 +57,7 @@ extension Table {
             query
         ]
 
-        return " ".join(clauses.flatMap { $0 }).asSQL()
+        return " ".join(clauses.compactMap { $0 }).asSQL()
     }
 
     // MARK: - ALTER TABLE … ADD COLUMN
@@ -135,7 +135,7 @@ extension Table {
             "".wrap(columns) as Expression<Void>
         ]
 
-        return " ".join(clauses.flatMap { $0 }).asSQL()
+        return " ".join(clauses.compactMap { $0 }).asSQL()
     }
 
     // MARK: - DROP INDEX
@@ -174,7 +174,7 @@ extension View {
             query
         ]
 
-        return " ".join(clauses.flatMap { $0 }).asSQL()
+        return " ".join(clauses.compactMap { $0 }).asSQL()
     }
 
     // MARK: - DROP VIEW
@@ -196,7 +196,7 @@ extension VirtualTable {
             using
         ]
 
-        return " ".join(clauses.flatMap { $0 }).asSQL()
+        return " ".join(clauses.compactMap { $0 }).asSQL()
     }
 
     // MARK: - ALTER TABLE … RENAME TO
@@ -405,7 +405,7 @@ public final class TableBuilder {
             delete.map { Expression<Void>(literal: "ON DELETE \($0.rawValue)") }
         ]
 
-        definitions.append(" ".join(clauses.flatMap { $0 }))
+        definitions.append(" ".join(clauses.compactMap { $0 }))
     }
 
 }
@@ -456,7 +456,7 @@ private extension QueryType {
             name
         ]
 
-        return " ".join(clauses.flatMap { $0 })
+        return " ".join(clauses.compactMap { $0 })
     }
 
     func rename(to: Self) -> String {
@@ -475,7 +475,7 @@ private extension QueryType {
             name
         ]
 
-        return " ".join(clauses.flatMap { $0 }).asSQL()
+        return " ".join(clauses.compactMap { $0 }).asSQL()
     }
 
 }
@@ -493,7 +493,7 @@ private func definition(_ column: Expressible, _ datatype: String, _ primaryKey:
         collate.map { " ".join([Expression<Void>(literal: "COLLATE"), $0]) }
     ]
 
-    return " ".join(clauses.flatMap { $0 })
+    return " ".join(clauses.compactMap { $0 })
 }
 
 private func reference(_ primary: (QueryType, Expressible)) -> Expressible {
diff --git a/Tests/SQLiteTests/BlobTests.swift b/Tests/SQLiteTests/BlobTests.swift
@@ -16,7 +16,7 @@ class BlobTests : XCTestCase {
 
     func test_init_unsafeRawPointer() {
         let pointer = UnsafeMutablePointer<UInt8>.allocate(capacity: 3)
-        pointer.initialize(to: 42, count: 3)
+        pointer.initialize(repeating: 42, count: 3)
         let blob = Blob(bytes: pointer, length: 3)
         XCTAssertEqual(blob.bytes, [42, 42, 42])
     }
diff --git a/Tests/SQLiteTests/ConnectionTests.swift b/Tests/SQLiteTests/ConnectionTests.swift
@@ -157,7 +157,7 @@ class ConnectionTests : SQLiteTestCase {
 
     func test_transaction_rollsBackTransactionsIfCommitsFail() {
         let sqliteVersion = String(describing: try! db.scalar("SELECT sqlite_version()")!)
-                .split(separator: ".").flatMap { Int($0) }
+            .split(separator: ".").compactMap { Int($0) }
         // PRAGMA defer_foreign_keys only supported in SQLite >= 3.8.0
         guard sqliteVersion[0] == 3 && sqliteVersion[1] >= 8 else {
             NSLog("skipping test for SQLite version \(sqliteVersion)")
diff --git a/Tests/SQLiteTests/FTS4Tests.swift b/Tests/SQLiteTests/FTS4Tests.swift
@@ -184,7 +184,7 @@ class FTS4IntegrationTests : SQLiteTestCase {
 
         let locale = CFLocaleCopyCurrent()
         let tokenizerName = "tokenizer"
-        let tokenizer = CFStringTokenizerCreate(nil, "" as CFString!, CFRangeMake(0, 0), UInt(kCFStringTokenizerUnitWord), locale)
+        let tokenizer = CFStringTokenizerCreate(nil, "" as CFString, CFRangeMake(0, 0), UInt(kCFStringTokenizerUnitWord), locale)
         try! db.registerTokenizer(tokenizerName) { string in
             CFStringTokenizerSetString(tokenizer, string as CFString, CFRangeMake(0, CFStringGetLength(string as CFString)))
             if CFStringTokenizerAdvanceToNextToken(tokenizer).isEmpty {

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ fileprivate class SQLiteDecoder : Decoder {`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`var allKeys: [Key] {`
`220`		`- return self.row.columnNames.keys.flatMap({Key(stringValue: $0)})`
	`220`	`+ return self.row.columnNames.keys.compactMap({Key(stringValue: $0)})`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`func contains(_ key: Key) -> Bool {`
Original file line number	Diff line number	Diff line change
`@@ -637,7 +637,7 @@ extension ExpressionType where UnderlyingType == String? {`
`637`	`637`
`638`	`638`	`}`
`639`	`639`
`640`		`-extension Collection where Iterator.Element : Value, IndexDistance == Int {`
	`640`	`+extension Collection where Iterator.Element : Value {`
`641`	`641`
`642`	`642`	/// Builds a copy of the expression prepended with an `IN` check against the
`643`	`643`	`/// collection.`
Original file line number	Diff line number	Diff line change
`@@ -647,7 +647,7 @@ extension QueryType {`
`647`	`647`	`whereClause`
`648`	`648`	`]`
`649`	`649`
`650`		`- return Insert(" ".join(clauses.flatMap { $0 }).expression)`
	`650`	`+ return Insert(" ".join(clauses.compactMap { $0 }).expression)`
`651`	`651`	`}`
`652`	`652`
`653`	`653`	/// Runs an `INSERT` statement against the query with `DEFAULT VALUES`.
`@@ -690,7 +690,7 @@ extension QueryType {`
`690`	`690`	`limitOffsetClause`
`691`	`691`	`]`
`692`	`692`
`693`		`- return Update(" ".join(clauses.flatMap { $0 }).expression)`
	`693`	`+ return Update(" ".join(clauses.compactMap { $0 }).expression)`
`694`	`694`	`}`
`695`	`695`
`696`	`696`	`// MARK: DELETE`
`@@ -704,7 +704,7 @@ extension QueryType {`
`704`	`704`	`limitOffsetClause`
`705`	`705`	`]`
`706`	`706`
`707`		`- return Delete(" ".join(clauses.flatMap { $0 }).expression)`
	`707`	`+ return Delete(" ".join(clauses.compactMap { $0 }).expression)`
`708`	`708`	`}`
`709`	`709`
`710`	`710`	`// MARK: EXISTS`
`@@ -789,7 +789,7 @@ extension QueryType {`
`789`	`789`	`limitOffsetClause`
`790`	`790`	`]`
`791`	`791`
`792`		`- return " ".join(clauses.flatMap { $0 }).expression`
	`792`	`+ return " ".join(clauses.compactMap { $0 }).expression`
`793`	`793`	`}`
`794`	`794`
`795`	`795`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ extension Table {`
`47`	`47`	`withoutRowid ? Expression<Void>(literal: "WITHOUT ROWID") : nil`
`48`	`48`	`]`
`49`	`49`
`50`		`- return " ".join(clauses.flatMap { $0 }).asSQL()`
	`50`	`+ return " ".join(clauses.compactMap { $0 }).asSQL()`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`public func create(_ query: QueryType, temporary: Bool = false, ifNotExists: Bool = false) -> String {`
`@@ -57,7 +57,7 @@ extension Table {`
`57`	`57`	`query`
`58`	`58`	`]`
`59`	`59`
`60`		`- return " ".join(clauses.flatMap { $0 }).asSQL()`
	`60`	`+ return " ".join(clauses.compactMap { $0 }).asSQL()`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`// MARK: - ALTER TABLE … ADD COLUMN`
`@@ -135,7 +135,7 @@ extension Table {`
`135`	`135`	`"".wrap(columns) as Expression<Void>`
`136`	`136`	`]`
`137`	`137`
`138`		`- return " ".join(clauses.flatMap { $0 }).asSQL()`
	`138`	`+ return " ".join(clauses.compactMap { $0 }).asSQL()`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`// MARK: - DROP INDEX`
`@@ -174,7 +174,7 @@ extension View {`
`174`	`174`	`query`
`175`	`175`	`]`
`176`	`176`
`177`		`- return " ".join(clauses.flatMap { $0 }).asSQL()`
	`177`	`+ return " ".join(clauses.compactMap { $0 }).asSQL()`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`// MARK: - DROP VIEW`
`@@ -196,7 +196,7 @@ extension VirtualTable {`
`196`	`196`	`using`
`197`	`197`	`]`
`198`	`198`
`199`		`- return " ".join(clauses.flatMap { $0 }).asSQL()`
	`199`	`+ return " ".join(clauses.compactMap { $0 }).asSQL()`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`// MARK: - ALTER TABLE … RENAME TO`
`@@ -405,7 +405,7 @@ public final class TableBuilder {`
`405`	`405`	`delete.map { Expression<Void>(literal: "ON DELETE \($0.rawValue)") }`
`406`	`406`	`]`
`407`	`407`
`408`		`- definitions.append(" ".join(clauses.flatMap { $0 }))`
	`408`	`+ definitions.append(" ".join(clauses.compactMap { $0 }))`
`409`	`409`	`}`
`410`	`410`
`411`	`411`	`}`
`@@ -456,7 +456,7 @@ private extension QueryType {`
`456`	`456`	`name`
`457`	`457`	`]`
`458`	`458`
`459`		`- return " ".join(clauses.flatMap { $0 })`
	`459`	`+ return " ".join(clauses.compactMap { $0 })`
`460`	`460`	`}`
`461`	`461`
`462`	`462`	`func rename(to: Self) -> String {`
`@@ -475,7 +475,7 @@ private extension QueryType {`
`475`	`475`	`name`
`476`	`476`	`]`
`477`	`477`
`478`		`- return " ".join(clauses.flatMap { $0 }).asSQL()`
	`478`	`+ return " ".join(clauses.compactMap { $0 }).asSQL()`
`479`	`479`	`}`
`480`	`480`
`481`	`481`	`}`
`@@ -493,7 +493,7 @@ private func definition(_ column: Expressible, _ datatype: String, _ primaryKey:`
`493`	`493`	`collate.map { " ".join([Expression<Void>(literal: "COLLATE"), $0]) }`
`494`	`494`	`]`
`495`	`495`
`496`		`- return " ".join(clauses.flatMap { $0 })`
	`496`	`+ return " ".join(clauses.compactMap { $0 })`
`497`	`497`	`}`
`498`	`498`
`499`	`499`	`private func reference(_ primary: (QueryType, Expressible)) -> Expressible {`