Merge branch 'develop'

Author: helje5

.travis.d/run-tests.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+SWIFT_VERSION="`swift --version | head -1 | sed 's/^.*[Vv]ersion[\t ]*\([.[:digit:]]*\).*$/\1/g'`"
+declare -a SWIFT_VERSION_LIST="(${SWIFT_VERSION//./ })"
+SWIFT_MAJOR=${SWIFT_VERSION_LIST[0]}
+SWIFT_MINOR=${SWIFT_VERSION_LIST[1]}
+SWIFT_SUBMINOR_OPT=${SWIFT_VERSION_LIST[2]}
+SWIFT_SUBMINOR=${SWIFT_SUBMINOR_OPT}
+if [[ "x${SWIFT_SUBMINOR}" = "x" ]]; then SWIFT_SUBMINOR=0; fi
+
+if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then 
+  # Gives “Swift Language Version” (SWIFT_VERSION) is required to be configured correctly for targets which use Swift. Use the [Edit > Convert > To Current Swift Syntax…] menu to choose a Swift version or use the Build Settings editor to configure the build setting directly.
+  # w/ Xcode 8.3. We set the lang-version in the Base.xcconfig, presumably
+  # Xcode 8.3 can't do this right ...
+
+  if [[ ${SWIFT_MAJOR} -ge 4 ]]; then
+    xcodebuild -scheme ZeeQL -sdk macosx test
+  else
+    echo "Not running tests on ${SWIFT_VERSION} yet ..."
+  fi
+else
+  # Swift 3.1.1 just crashes being building the tests. Yay.
+  # Swift 4 works fine.
+  # Swift 4.1 fails the Codable tests.
+  if [[ ${SWIFT_MAJOR} -ge 4 ]]; then
+    if [[ ${SWIFT_MINOR} -gt 0 ]]; then
+      echo "Not running tests on ${SWIFT_VERSION} yet ..."
+    else
+      swift test
+    fi
+  fi
+fi

.travis.yml

@@ -9,22 +9,20 @@ matrix:
     include:
         - os:   Linux
           dist: trusty
-          env:  SWIFT_SNAPSHOT_NAME="https://swift.org/builds/swift-3.1.1-release/ubuntu1404/swift-3.1.1-RELEASE/swift-3.1.1-RELEASE-ubuntu14.04.tar.gz"
+          env:  SWIFT_SNAPSHOT_NAME="https://swift.org/builds/swift-4.1.2-release/ubuntu1404/swift-4.1.2-RELEASE/swift-4.1.2-RELEASE-ubuntu14.04.tar.gz"
           sudo: required
         - os:   Linux
           dist: trusty
-          env:  SWIFT_SNAPSHOT_NAME="https://swift.org/builds/swift-4.0.3-release/ubuntu1404/swift-4.0.3-RELEASE/swift-4.0.3-RELEASE-ubuntu14.04.tar.gz"
+          env:  SWIFT_SNAPSHOT_NAME="https://swift.org/builds/swift-4.2.4-release/ubuntu1404/swift-4.2.4-RELEASE/swift-4.2.4-RELEASE-ubuntu14.04.tar.gz"
           sudo: required
         - os:   Linux
           dist: trusty
-          env:  SWIFT_SNAPSHOT_NAME="https://swift.org/builds/swift-4.1-release/ubuntu1404/swift-4.1-RELEASE/swift-4.1-RELEASE-ubuntu14.04.tar.gz"
+          env:  SWIFT_SNAPSHOT_NAME="https://swift.org/builds/swift-5.0-release/ubuntu1404/swift-5.0-RELEASE/swift-5.0-RELEASE-ubuntu14.04.tar.gz"
           sudo: required
         - os:   osx
-          osx_image: xcode8.3
+          osx_image: xcode10.1
         - os:   osx
-          osx_image: xcode9
-        - os:   osx
-          osx_image: xcode9.3
+          osx_image: xcode10.2
 
 before_install:
     - ./.travis.d/before-install.sh
@@ -36,3 +34,4 @@ script:
     - export PATH="$HOME/usr/bin:$PATH"
     - swift build -c release
     - swift build -c debug
+    - ./.travis.d/run-tests.sh

CSQLite3/ios/CSQLite3Shim.h

@@ -2,7 +2,7 @@
 #define __CSQLITE3_SHIM_H__
 
 #if defined(__APPLE__) && defined(__MACH__)
-#  if __clang_major__ >= 10 // Assume Xcode-beta.app (XcodeXbeta)
+#  if __clang_major__ >= 11 // Assume Xcode-beta.app (XcodeXbeta)
 #    include "/Applications/Xcode-beta.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/include/sqlite3.h"
 #  else
 #    include "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/include/sqlite3.h"

CSQLite3/macos/CSQLite3Shim.h

@@ -2,7 +2,7 @@
 #define __CSQLITE3_SHIM_H__
 
 #if defined(__APPLE__) && defined(__MACH__)
-#  if __clang_major__ >= 10 // Assume Xcode-beta.app (XcodeXbeta)
+#  if __clang_major__ >= 11 // Assume Xcode-beta.app (XcodeXbeta)
 #    include "/Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/sqlite3.h"
 #  elif __clang_major__ >= 9
 #    include "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/sqlite3.h"

CSQLite3/simulator/CSQLite3Shim.h

@@ -2,7 +2,7 @@
 #define __CSQLITE3_SHIM_H__
 
 #if defined(__APPLE__) && defined(__MACH__)
-#  if __clang_major__ >= 10 // Assume Xcode-beta.app (XcodeXbeta)
+#  if __clang_major__ >= 11 // Assume Xcode-beta.app (XcodeXbeta)
 #    include "/Applications/Xcode-beta.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/include/sqlite3.h"
 #  else
 #    include "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/include/sqlite3.h"

CSQLite3/tvos-simulator/CSQLite3Shim.h

@@ -2,7 +2,7 @@
 #define __CSQLITE3_SHIM_H__
 
 #if defined(__APPLE__) && defined(__MACH__)
-#  if __clang_major__ >= 10 // Assume Xcode-beta.app (XcodeXbeta)
+#  if __clang_major__ >= 11 // Assume Xcode-beta.app (XcodeXbeta)
 #    include "/Applications/Xcode-beta.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk/usr/include/sqlite3.h"
 #  else
 #    include "/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk/usr/include/sqlite3.h"

CSQLite3/tvos/CSQLite3Shim.h

@@ -2,7 +2,7 @@
 #define __CSQLITE3_SHIM_H__
 
 #if defined(__APPLE__) && defined(__MACH__)
-#  if __clang_major__ >= 10 // Assume Xcode-beta.app (XcodeXbeta)
+#  if __clang_major__ >= 11 // Assume Xcode-beta.app (XcodeXbeta)
 #    include "/Applications/Xcode-beta.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/usr/include/sqlite3.h"
 #  else
 #    include "/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/usr/include/sqlite3.h"

CSQLite3/watchos-simulator/CSQLite3Shim.h

@@ -2,7 +2,7 @@
 #define __CSQLITE3_SHIM_H__
 
 #if defined(__APPLE__) && defined(__MACH__)
-#  if __clang_major__ >= 10 // Assume Xcode-beta.app (XcodeXbeta)
+#  if __clang_major__ >= 11 // Assume Xcode-beta.app (XcodeXbeta)
 #    include "/Applications/Xcode-beta.app/Contents/Developer/Platforms/WatchSimulator.platform/Developer/SDKs/WatchSimulator.sdk/usr/include/sqlite3.h"
 #  else
 #    include "/Applications/Xcode.app/Contents/Developer/Platforms/WatchSimulator.platform/Developer/SDKs/WatchSimulator.sdk/usr/include/sqlite3.h"

CSQLite3/watchos/CSQLite3Shim.h

@@ -2,7 +2,7 @@
 #define __CSQLITE3_SHIM_H__
 
 #if defined(__APPLE__) && defined(__MACH__)
-#  if __clang_major__ >= 10 // Assume Xcode-beta.app (XcodeXbeta)
+#  if __clang_major__ >= 11 // Assume Xcode-beta.app (XcodeXbeta)
 #    include "/Applications/Xcode-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/usr/include/sqlite3.h"
 #  else
 #    include "/Applications/Xcode.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/usr/include/sqlite3.h"

CSQLite3/xcode-macos/CSQLite3Shim.h

@@ -3,7 +3,7 @@
 
 #if defined(__APPLE__) && defined(__MACH__)
 // TODO: this may have issues with LLDB as outlined below
-#  if __clang_major__ >= 10 // Assume Xcode-beta.app (XcodeXbeta)
+#  if __clang_major__ >= 11 // Assume Xcode-beta.app (XcodeXbeta)
 #    include "/Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/sqlite3.h"
 #  else __clang_major__ >= 9
 #    include "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/sqlite3.h"