Merge pull request #668 from thebluepotato/swift-4

Swift 4 support

Author: jberkel

.swift-version

@@ -1 +1 @@
-3.0
+4.0

.travis.yml

@@ -1,9 +1,10 @@
 language: objective-c
 rvm: 2.2
-osx_image: xcode8.3
+osx_image: xcode9
 env:
   global:
     - IOS_SIMULATOR="iPhone 6s"
+    - IOS_VERSION="11.0"
 matrix:
   include:
     - env: BUILD_SCHEME="SQLite iOS"

CocoaPods/appletvos/module.modulemap

@@ -1578,7 +1578,7 @@ We can log SQL using the database’s `trace` function.
 
 ``` swift
 #if DEBUG
-    db.trace(print)
+    db.trace { print($0) }
 #endif
 ```
 

CocoaPods/appletvsimulator/module.modulemap

@@ -1,7 +1,7 @@
 BUILD_TOOL = xcodebuild
 BUILD_SCHEME = SQLite Mac
 IOS_SIMULATOR = iPhone 6s
-IOS_VERSION = 10.3
+IOS_VERSION = 11.0
 ifeq ($(BUILD_SCHEME),SQLite iOS)
 	BUILD_ARGUMENTS = -scheme "$(BUILD_SCHEME)" -destination "platform=iOS Simulator,name=$(IOS_SIMULATOR),OS=$(IOS_VERSION)"
 else

CocoaPods/iphoneos-10.0/module.modulemap

@@ -30,20 +30,6 @@ Pod::Spec.new do |s|
     ss.private_header_files = 'Sources/SQLiteObjc/*.h'
 
     ss.library = 'sqlite3'
-    ss.preserve_paths = 'CocoaPods/**/*'
-    ss.pod_target_xcconfig = {
-      'SWIFT_INCLUDE_PATHS[sdk=macosx*]'             => '$(SRCROOT)/SQLite.swift/CocoaPods/macosx',
-      'SWIFT_INCLUDE_PATHS[sdk=macosx10.11]'         => '$(SRCROOT)/SQLite.swift/CocoaPods/macosx-10.11',
-      'SWIFT_INCLUDE_PATHS[sdk=macosx10.12]'         => '$(SRCROOT)/SQLite.swift/CocoaPods/macosx-10.12',
-      'SWIFT_INCLUDE_PATHS[sdk=iphoneos*]'           => '$(SRCROOT)/SQLite.swift/CocoaPods/iphoneos',
-      'SWIFT_INCLUDE_PATHS[sdk=iphoneos10.0]'        => '$(SRCROOT)/SQLite.swift/CocoaPods/iphoneos-10.0',
-      'SWIFT_INCLUDE_PATHS[sdk=iphonesimulator*]'    => '$(SRCROOT)/SQLite.swift/CocoaPods/iphonesimulator',
-      'SWIFT_INCLUDE_PATHS[sdk=iphonesimulator10.0]' => '$(SRCROOT)/SQLite.swift/CocoaPods/iphonesimulator-10.0',
-      'SWIFT_INCLUDE_PATHS[sdk=appletvos*]'          => '$(SRCROOT)/SQLite.swift/CocoaPods/appletvos',
-      'SWIFT_INCLUDE_PATHS[sdk=appletvsimulator*]'   => '$(SRCROOT)/SQLite.swift/CocoaPods/appletvsimulator',
-      'SWIFT_INCLUDE_PATHS[sdk=watchos*]'            => '$(SRCROOT)/SQLite.swift/CocoaPods/watchos',
-      'SWIFT_INCLUDE_PATHS[sdk=watchsimulator*]'     => '$(SRCROOT)/SQLite.swift/CocoaPods/watchsimulator'
-    }
   end
 
   s.subspec 'standalone' do |ss|