From fae33618f948bf101af9afdfe4a514cdaa5995d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguye=CC=82=CC=83n?= Date: Wed, 4 Nov 2020 18:15:48 -0800 Subject: [PATCH 1/2] Fail the build if any command fails --- .travis/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis/build.sh b/.travis/build.sh index b49a453..44ff007 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -euo pipefail + if [[ $TRAVIS_OS_NAME == 'osx' ]]; then xcodebuild $ACTION -project Polyline.xcodeproj -scheme "$SCHEME" -destination "$DESTINATION" ONLY_ACTIVE_ARCH=NO swift build From b29d440a0aab677566f0c3b70f984e20a9180228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguye=CC=82=CC=83n?= Date: Wed, 4 Nov 2020 18:19:22 -0800 Subject: [PATCH 2/2] Exclude MapKit compatibility on watchOS --- Sources/Polyline/Polyline.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/Polyline/Polyline.swift b/Sources/Polyline/Polyline.swift index f283e03..594d581 100644 --- a/Sources/Polyline/Polyline.swift +++ b/Sources/Polyline/Polyline.swift @@ -24,7 +24,7 @@ import Foundation #if canImport(CoreLocation) import CoreLocation #endif -#if canImport(MapKit) +#if canImport(MapKit) && !os(watchOS) import MapKit #endif @@ -61,7 +61,7 @@ public struct Polyline { } #endif - #if canImport(MapKit) + #if canImport(MapKit) && !os(watchOS) /// Convert polyline to MKPolyline to use with MapKit (nil if polyline cannot be decoded) @available(tvOS 9.2, *) public var mkPolyline: MKPolyline? {