From 721a32b4b0bfc3856ce66f8a1047043f96dc425b Mon Sep 17 00:00:00 2001 From: Jakob Vinther-Larsen Date: Mon, 1 Apr 2019 11:55:19 +0200 Subject: [PATCH 1/5] Updated Quick and Nimble --- Cartfile.private | 4 ++-- Cartfile.resolved | 4 ++-- Carthage/Checkouts/Nimble | 2 +- Carthage/Checkouts/Quick | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cartfile.private b/Cartfile.private index d3790f5a7..1e1218acc 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,3 +1,3 @@ github "jspahrsummers/xcconfigs" "3d9d996" -github "Quick/Quick" ~> 1.2 -github "Quick/Nimble" ~> 7.0.2 +github "Quick/Quick" ~> 2.0 +github "Quick/Nimble" ~> 8.0.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index 1dec54b7a..5d9c1cae2 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,3 +1,3 @@ -github "Quick/Nimble" "v7.3.1" -github "Quick/Quick" "v1.2.0" +github "Quick/Nimble" "v8.0.1" +github "Quick/Quick" "v2.0.0" github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0" diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble index cd6dfb86f..43304bf2b 160000 --- a/Carthage/Checkouts/Nimble +++ b/Carthage/Checkouts/Nimble @@ -1 +1 @@ -Subproject commit cd6dfb86f496fcd96ce0bc6da962cd936bf41903 +Subproject commit 43304bf2b1579fd555f2fdd51742771c1e4f2b98 diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick index 0ff81f2c6..0b4ed6c70 160000 --- a/Carthage/Checkouts/Quick +++ b/Carthage/Checkouts/Quick @@ -1 +1 @@ -Subproject commit 0ff81f2c665b4381f526bd656f8708dd52a9ea2f +Subproject commit 0b4ed6c706dd0cce923b5019a605a9bcc6b1b600 From 13a490ce922ca04951bb676867f9c5fc0239e916 Mon Sep 17 00:00:00 2001 From: Jakob Vinther-Larsen Date: Mon, 1 Apr 2019 12:49:04 +0200 Subject: [PATCH 2/5] Use XCode 10.2 on CI --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3760af61c..fc992dd89 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode10 +osx_image: xcode10.2 before_install: true install: true branches: From 97805c6614ea16a633db6221d6c2a423fb4cb813 Mon Sep 17 00:00:00 2001 From: Jakob Vinther-Larsen Date: Mon, 1 Apr 2019 13:08:26 +0200 Subject: [PATCH 3/5] MacOS deployment target set to 10.10 --- ReactiveObjC.xcodeproj/project.pbxproj | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ReactiveObjC.xcodeproj/project.pbxproj b/ReactiveObjC.xcodeproj/project.pbxproj index af597fe65..691a32e23 100644 --- a/ReactiveObjC.xcodeproj/project.pbxproj +++ b/ReactiveObjC.xcodeproj/project.pbxproj @@ -1988,6 +1988,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, ); mainGroup = D04725E019E49ED7006002AA; @@ -2823,7 +2824,7 @@ CURRENT_PROJECT_VERSION = 1; ENABLE_TESTABILITY = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_BUNDLE_IDENTIFIER = "org.reactivecocoa.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(PROJECT_NAME)"; TVOS_DEPLOYMENT_TARGET = 9.0; @@ -2846,7 +2847,7 @@ CURRENT_PROJECT_VERSION = 1; GCC_OPTIMIZATION_LEVEL = 0; IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_BUNDLE_IDENTIFIER = "org.reactivecocoa.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(PROJECT_NAME)"; TVOS_DEPLOYMENT_TARGET = 9.0; @@ -2996,7 +2997,7 @@ CODE_SIGNING_REQUIRED = NO; CURRENT_PROJECT_VERSION = 1; IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_BUNDLE_IDENTIFIER = "org.reactivecocoa.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(PROJECT_NAME)"; TVOS_DEPLOYMENT_TARGET = 9.0; @@ -3078,7 +3079,7 @@ CODE_SIGNING_REQUIRED = NO; CURRENT_PROJECT_VERSION = 1; IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_BUNDLE_IDENTIFIER = "org.reactivecocoa.$(PRODUCT_NAME:rfc1034identifier)-Tests"; PRODUCT_NAME = "$(PROJECT_NAME)"; TVOS_DEPLOYMENT_TARGET = 9.0; From 0f9f3db807c7b9b438b85edaa783ee05c606d6a3 Mon Sep 17 00:00:00 2001 From: Jakob Vinther-Larsen Date: Mon, 1 Apr 2019 13:17:15 +0200 Subject: [PATCH 4/5] MacOS target set to 10.10 for Test only --- ReactiveObjC.xcodeproj/project.pbxproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ReactiveObjC.xcodeproj/project.pbxproj b/ReactiveObjC.xcodeproj/project.pbxproj index 691a32e23..ed95a2506 100644 --- a/ReactiveObjC.xcodeproj/project.pbxproj +++ b/ReactiveObjC.xcodeproj/project.pbxproj @@ -2824,7 +2824,7 @@ CURRENT_PROJECT_VERSION = 1; ENABLE_TESTABILITY = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.9; PRODUCT_BUNDLE_IDENTIFIER = "org.reactivecocoa.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(PROJECT_NAME)"; TVOS_DEPLOYMENT_TARGET = 9.0; @@ -2847,7 +2847,7 @@ CURRENT_PROJECT_VERSION = 1; GCC_OPTIMIZATION_LEVEL = 0; IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.9; PRODUCT_BUNDLE_IDENTIFIER = "org.reactivecocoa.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(PROJECT_NAME)"; TVOS_DEPLOYMENT_TARGET = 9.0; @@ -2997,7 +2997,7 @@ CODE_SIGNING_REQUIRED = NO; CURRENT_PROJECT_VERSION = 1; IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.9; PRODUCT_BUNDLE_IDENTIFIER = "org.reactivecocoa.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(PROJECT_NAME)"; TVOS_DEPLOYMENT_TARGET = 9.0; From 327bdb7a52bd9381c31cad5bf4c2cf55f15cc3b2 Mon Sep 17 00:00:00 2001 From: Jakob Vinther-Larsen Date: Mon, 1 Apr 2019 14:56:32 +0200 Subject: [PATCH 5/5] MacOS Test set to 10.10 for all its targets --- ReactiveObjC.xcodeproj/project.pbxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ReactiveObjC.xcodeproj/project.pbxproj b/ReactiveObjC.xcodeproj/project.pbxproj index ed95a2506..31b7adf66 100644 --- a/ReactiveObjC.xcodeproj/project.pbxproj +++ b/ReactiveObjC.xcodeproj/project.pbxproj @@ -2906,6 +2906,7 @@ "$(inherited)", ); INFOPLIST_FILE = ReactiveObjCTests/Info.plist; + MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_NAME = "$(PROJECT_NAME)Tests"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 4.2; @@ -2923,6 +2924,7 @@ "$(inherited)", ); INFOPLIST_FILE = ReactiveObjCTests/Info.plist; + MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_NAME = "$(PROJECT_NAME)Tests"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 4.2; @@ -3038,6 +3040,7 @@ "$(inherited)", ); INFOPLIST_FILE = ReactiveObjCTests/Info.plist; + MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_NAME = "$(PROJECT_NAME)Tests"; SWIFT_VERSION = 4.2; }; @@ -3121,6 +3124,7 @@ "$(inherited)", ); INFOPLIST_FILE = ReactiveObjCTests/Info.plist; + MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_NAME = "$(PROJECT_NAME)Tests"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 4.2;