Travis: please test Swift 4.0, 4.2, and Xcode 9.3, 9.4, and 10.

groue · Aug 30, 2018 · d9d0f62 · d9d0f62
1 parent 8b4eb55
commit d9d0f62
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,9 +20,17 @@ jobs:
       gemfile: .ci/gemfiles/Gemfile.travis
       osx_image: xcode10
       env:
-        - TID=GRDBOSX (Xcode 10, macOS)
+        - TID=GRDBOSX (Xcode 10, Swift 4.2, macOS)
       script: make test_framework_GRDBOSX_maxSwift
 
+    # Test GRDBOSX (Xcode 10)
+    - stage: Test GRDB
+      gemfile: .ci/gemfiles/Gemfile.travis
+      osx_image: xcode10
+      env:
+        - TID=GRDBOSX (Xcode 10, Swift 4.0, macOS)
+      script: make test_framework_GRDBOSX_minSwift
+
     # Test GRDBWatchOS (Xcode 10)
     - stage: Test GRDB
       gemfile: .ci/gemfiles/Gemfile.travis
@@ -36,7 +44,15 @@ jobs:
       gemfile: .ci/gemfiles/Gemfile.travis
       osx_image: xcode10
       env:
-        - TID=GRDBiOS (Xcode 10, iOS <MAX>)
+        - TID=GRDBiOS (Xcode 10, Swift 4.2, iOS <MAX>)
+      script: make test_framework_GRDBiOS_maxTarget_maxSwift
+
+    # Test GRDBiOS (Xcode 9.4, iOS <MAXIMUM VERSION>)
+    - stage: Test GRDB
+      gemfile: .ci/gemfiles/Gemfile.travis
+      osx_image: xcode9.4
+      env:
+        - TID=GRDBiOS (Xcode 9.4, iOS <MAX>)
       script: make test_framework_GRDBiOS_maxTarget_maxSwift
 
     # Test GRDBiOS (Xcode 9.3, iOS <MINIMUM VERSION>))
@@ -71,7 +87,23 @@ jobs:
       gemfile: .ci/gemfiles/Gemfile.travis
       osx_image: xcode10
       env:
-        - TID=GRDBCustomSQLiteiOS (Xcode 10, iOS <MAX>)
+        - TID=GRDBCustomSQLiteiOS (Xcode 10, Swift 4.2, iOS <MAX>)
+      script: make test_framework_GRDBCustomSQLiteiOS_maxTarget_maxSwift
+
+    # Test GRDBCustomSQLiteiOS (Xcode 10, iOS <MAXIMUM VERSION>)
+    - stage: Test GRDB + Custom SQLite
+      gemfile: .ci/gemfiles/Gemfile.travis
+      osx_image: xcode10
+      env:
+        - TID=GRDBCustomSQLiteiOS (Xcode 10, Swift 4.0, iOS <MAX>)
+      script: make test_framework_GRDBCustomSQLiteiOS_maxTarget_minSwift
+
+    # Test GRDBCustomSQLiteiOS (Xcode 9.4, iOS <MAXIMUM VERSION>)
+    - stage: Test GRDB + Custom SQLite
+      gemfile: .ci/gemfiles/Gemfile.travis
+      osx_image: xcode9.4
+      env:
+        - TID=GRDBCustomSQLiteiOS (Xcode 9.4, iOS <MAX>)
       script: make test_framework_GRDBCustomSQLiteiOS_maxTarget
 
     # Test GRDBCustomSQLiteiOS (Xcode 9.3, iOS <MINIMUM VERSION>))
@@ -101,6 +133,14 @@ jobs:
         - TID=GRDBCipheriOS (Xcode 10, iOS <MAX>)
       script: make test_framework_GRDBCipheriOS_maxTarget
 
+    # Test GRDBCipheriOS (Xcode 9.4, iOS <MAXIMUM VERSION>)
+    - stage: Test GRDB + SQLCipher
+      gemfile: .ci/gemfiles/Gemfile.travis
+      osx_image: xcode9.4
+      env:
+        - TID=GRDBCipheriOS (Xcode 9.4, iOS <MAX>)
+      script: make test_framework_GRDBCipheriOS_maxTarget
+
     # Test GRDBCipheriOS (Xcode 9.3, iOS <MINIMUM VERSION>))
     - stage: Test GRDB + SQLCipher
       gemfile: .ci/gemfiles/Gemfile.travis

diff --git a/Makefile b/Makefile
@@ -182,8 +182,9 @@ test_framework_GRDBCustomSQLiteOSX: SQLiteCustom
 	  $(XCPRETTY)
 
 test_framework_GRDBCustomSQLiteiOS: test_framework_GRDBCustomSQLiteiOS_maxTarget test_framework_GRDBCustomSQLiteiOS_minTarget
+test_framework_GRDBCustomSQLiteiOS_maxTarget: test_framework_GRDBCustomSQLiteiOS_maxTarget_maxSwift test_framework_GRDBCustomSQLiteiOS_maxTarget_minSwift
 
-test_framework_GRDBCustomSQLiteiOS_maxTarget: SQLiteCustom
+test_framework_GRDBCustomSQLiteiOS_maxTarget_maxSwift: SQLiteCustom
 	$(XCODEBUILD) \
 	  -project GRDBCustom.xcodeproj \
 	  -scheme GRDBCustomSQLiteiOS \
@@ -192,6 +193,17 @@ test_framework_GRDBCustomSQLiteiOS_maxTarget: SQLiteCustom
 	  $(TEST_ACTIONS) \
 	  $(XCPRETTY)
 
+test_framework_GRDBCustomSQLiteiOS_maxTarget_minSwift: SQLiteCustom
+ifdef MIN_SWIFT_VERSION
+	$(XCODEBUILD) \
+	  -project GRDBCustom.xcodeproj \
+	  -scheme GRDBCustomSQLiteiOS \
+	  -destination $(MAX_IOS_DESTINATION) \
+	  SWIFT_VERSION=$(MIN_SWIFT_VERSION) \
+	  $(TEST_ACTIONS) \
+	  $(XCPRETTY)
+endif
+
 test_framework_GRDBCustomSQLiteiOS_minTarget: SQLiteCustom
 	$(XCODEBUILD) \
 	  -project GRDBCustom.xcodeproj \