Refactor CI configs and add SPM to CI

Author: macdrevx

.travis.yml

@@ -1,52 +1,36 @@
 ---
-language: objective-c
-
-osx_image: xcode11.1
+os: osx
+osx_image: xcode11.3
+language: minimal
 
 cache:
   directories:
     - Carthage
 
-env:
-  global:
-    - WORKSPACE=GEOSwiftMapKit.xcworkspace
-  matrix:
-    - PLATFORM=iOS
-      SCHEME=GEOSwiftMapKit-iOS
-      SDK=iphonesimulator13.1
-      DESTINATION="platform=iOS Simulator,OS=13.1,name=iPhone 11"
-      RUN_CODECOV=true
-    - PLATFORM=tvOS
-      SCHEME=GEOSwiftMapKit-tvOS
-      SDK=appletvsimulator13.0
-      DESTINATION="platform=tvOS Simulator,OS=13.0,name=Apple TV"
-      RUN_CODECOV=false
-    - PLATFORM=macOS
-      SCHEME=GEOSwiftMapKit-macOS
-      SDK=macosx10.15
-      DESTINATION="platform=OS X"
-      RUN_CODECOV=false
-
-before_install:
-  - brew install carthage swiftlint
-  - gem install xcpretty
-  - travis_wait 30 carthage update
-      --cache-builds
-      --platform "$PLATFORM"
-      --no-use-binaries
-
-script:
-  - set -o pipefail
-  - xcodebuild
-      -workspace "$WORKSPACE"
-      -scheme "$SCHEME"
-      -sdk "$SDK"
-      -destination "$DESTINATION"
-      -configuration Debug
-      ONLY_ACTIVE_ARCH=YES
-      clean test | xcpretty -c;
+jobs:
+  include:
+    - name: iOS - xcodebuild
+      env: PLATFORM=iOS
+           SCHEME=GEOSwiftMapKit-iOS
+           SDK=iphonesimulator13.2
+           DESTINATION="platform=iOS Simulator,OS=13.3,name=iPhone 11"
+           WORKSPACE=GEOSwiftMapKit.xcworkspace
+           RUN_CODECOV=true
+    - name: tvOS - xcodebuild
+      env: PLATFORM=tvOS
+           SCHEME=GEOSwiftMapKit-tvOS
+           SDK=appletvsimulator13.2
+           DESTINATION="platform=tvOS Simulator,OS=13.3,name=Apple TV"
+           WORKSPACE=GEOSwiftMapKit.xcworkspace
+    - name: macOS - xcodebuild
+      env: PLATFORM=macOS
+           SCHEME=GEOSwiftMapKit-macOS
+           SDK=macosx10.15
+           DESTINATION="platform=OS X"
+           WORKSPACE=GEOSwiftMapKit.xcworkspace
+    - name: macOS - SPM
+      env: USE_SPM=true
 
-after_success:
-  - if [ "${RUN_CODECOV}" = "true" ]; then
-      bash <(curl -s https://codecov.io/bash) -J '^GEOSwiftMapKit$';
-    fi
+before_install: travis_wait 30 ./scripts/travis_before_install.sh
+script: ./scripts/travis_script.sh
+after_success: ./scripts/travis_after_success.sh

scripts/travis_after_success.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+set -evo pipefail
+
+if [[ $RUN_CODECOV = 'true' ]]; then
+  bash <(curl -s https://codecov.io/bash) -J '^GEOSwiftMapKit$';
+fi

scripts/travis_before_install.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+set -evo pipefail
+
+if [[ $USE_SPM != 'true' ]]; then
+  brew upgrade carthage swiftlint
+  gem install xcpretty
+  carthage update \
+    --cache-builds \
+    --platform "$PLATFORM" \
+    --no-use-binaries
+fi

scripts/travis_script.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+set -evo pipefail
+
+if [[ $USE_SPM = 'true' ]]; then
+  swift test --enable-test-discovery
+else
+  xcodebuild \
+    -workspace "$WORKSPACE" \
+    -scheme "$SCHEME" \
+    -sdk "$SDK" \
+    -destination "$DESTINATION" \
+    -configuration Debug \
+    ONLY_ACTIVE_ARCH=YES \
+    clean test | xcpretty -c;
+fi