diff --git a/.travis.yml b/.travis.yml index d20e916..3899a49 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -osx_image: xcode10.1 +osx_image: xcode10.2 cache: - bundler: true install: @@ -14,7 +14,7 @@ jobs: sudo: required dist: trusty env: - - SWIFT_VERSION=4.2 + - SWIFT_VERSION=5.0 - SWIFTENV_INSTALL="https://gist.githubusercontent.com/johnhammerlund/b4c3686e4270d463ef955c5a77f0b814/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh" install: - eval "$(curl -sL $SWIFTENV_INSTALL)" @@ -28,6 +28,7 @@ jobs: - stage: Test name: "iOS" os: osx + sudo: required script: - rake test_ios - stage: Test @@ -38,6 +39,7 @@ jobs: - stage: Test name: "tvOS" os: osx + sudo: required script: - rake test_tvos - stage: Test diff --git a/Package.swift b/Package.swift index 3637549..31a47e6 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:4.2 +// swift-tools-version:5.0 // // Package.swift // Relay @@ -11,6 +11,12 @@ import PackageDescription let package = Package( name: "Relay", + platforms: [ + .macOS(.v10_10), + .iOS(.v8), + .tvOS(.v9), + .watchOS(.v2), + ], products: [ .library( name: "Relay", diff --git a/Rakefile b/Rakefile index e8c87e1..aa5fd35 100644 --- a/Rakefile +++ b/Rakefile @@ -7,7 +7,7 @@ def build_matrix :scheme => "#{$framework}-iOS", :run_tests => true, :destinations => [ - "OS=9.3,name=iPhone 5s", + "OS=10.3.1,name=iPhone 5s", "OS=latest,name=iPad Air 2" ] }, @@ -22,7 +22,7 @@ def build_matrix :scheme => "#{$framework}-tvOS", :run_tests => true, :destinations => [ - "OS=9.2,name=Apple TV 1080p", + "OS=10.2,name=Apple TV 1080p", "OS=latest,name=Apple TV 4K" ] }, diff --git a/Relay.xcodeproj/project.pbxproj b/Relay.xcodeproj/project.pbxproj index 4f78d0f..a6ea63c 100644 --- a/Relay.xcodeproj/project.pbxproj +++ b/Relay.xcodeproj/project.pbxproj @@ -1136,7 +1136,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -1213,7 +1213,7 @@ SKIP_INSTALL = YES; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -1297,7 +1297,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -1374,7 +1374,7 @@ SKIP_INSTALL = YES; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -1459,7 +1459,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; VERSIONING_SYSTEM = "apple-generic"; @@ -1536,7 +1536,7 @@ SKIP_INSTALL = YES; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; VALIDATE_PRODUCT = YES; @@ -1624,7 +1624,7 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1702,7 +1702,7 @@ SKIP_INSTALL = YES; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1777,7 +1777,7 @@ SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -1844,7 +1844,7 @@ SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; @@ -1918,7 +1918,7 @@ SDKROOT = appletvos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; }; @@ -1985,7 +1985,7 @@ SDKROOT = appletvos; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; VALIDATE_PRODUCT = YES; @@ -2062,7 +2062,7 @@ SDKROOT = macosx; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -2129,7 +2129,7 @@ SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Release; }; diff --git a/RelayExampleIOS/RelayExampleIOS.xcodeproj/project.pbxproj b/RelayExampleIOS/RelayExampleIOS.xcodeproj/project.pbxproj index 17ba7ac..9ed05f2 100644 --- a/RelayExampleIOS/RelayExampleIOS.xcodeproj/project.pbxproj +++ b/RelayExampleIOS/RelayExampleIOS.xcodeproj/project.pbxproj @@ -530,6 +530,7 @@ SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -584,6 +585,7 @@ SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_VERSION = 5.0; VALIDATE_PRODUCT = YES; }; name = Release; @@ -600,7 +602,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.mindbodyonline.RelayExampleIOS; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -617,7 +619,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.mindbodyonline.RelayExampleIOS; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; @@ -636,7 +638,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.mindbodyonline.RelayExampleIOSTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RelayExampleIOS.app/RelayExampleIOS"; }; @@ -656,7 +658,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.mindbodyonline.RelayExampleIOSTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RelayExampleIOS.app/RelayExampleIOS"; }; @@ -675,7 +677,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.mindbodyonline.RelayExampleIOSUITests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = RelayExampleIOS; }; @@ -694,7 +696,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.mindbodyonline.RelayExampleIOSUITests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = RelayExampleIOS; };