From c577291bddc4d56adc7b55361bc9453478b9d5ae Mon Sep 17 00:00:00 2001 From: Jakob Vinther-Larsen Date: Mon, 1 Apr 2019 12:42:51 +0200 Subject: [PATCH 1/9] Updated Quick and Nimble --- .gitmodules | 2 +- Cartfile | 2 +- Cartfile.private | 4 ++-- Cartfile.resolved | 8 ++++---- Carthage/Checkouts/Nimble | 2 +- Carthage/Checkouts/Quick | 2 +- Carthage/Checkouts/ReactiveObjC | 2 +- Carthage/Checkouts/Result | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitmodules b/.gitmodules index 692e3e53b..6799e6e06 100644 --- a/.gitmodules +++ b/.gitmodules @@ -15,4 +15,4 @@ url = https://github.com/ReactiveCocoa/ReactiveSwift.git [submodule "Carthage/Checkouts/ReactiveObjC"] path = Carthage/Checkouts/ReactiveObjC - url = https://github.com/ReactiveCocoa/ReactiveObjC.git + url = https://github.com/jakovi89/ReactiveObjC.git diff --git a/Cartfile b/Cartfile index 4121fdefe..80d29312d 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ -github "ReactiveCocoa/ReactiveObjC" ~> 3.1.0 +github "jakovi89/ReactiveObjC" "swift-4.2" github "ReactiveCocoa/ReactiveSwift" ~> 4.0.0 diff --git a/Cartfile.private b/Cartfile.private index 19c18060a..1e1218acc 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,3 +1,3 @@ github "jspahrsummers/xcconfigs" "3d9d996" -github "Quick/Quick" ~> 1.3 -github "Quick/Nimble" ~> 7.1.3 +github "Quick/Quick" ~> 2.0 +github "Quick/Nimble" ~> 8.0.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index 1e1d4c030..a43c70afd 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,6 +1,6 @@ -github "Quick/Nimble" "v7.1.3" -github "Quick/Quick" "v1.3.1" -github "ReactiveCocoa/ReactiveObjC" "3.1.0" +github "Quick/Nimble" "v8.0.1" +github "Quick/Quick" "v2.0.0" github "ReactiveCocoa/ReactiveSwift" "4.0.0" -github "antitypical/Result" "4.0.0" +github "antitypical/Result" "4.1.0" +github "jakovi89/ReactiveObjC" "721a32b4b0bfc3856ce66f8a1047043f96dc425b" github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0" diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble index 9c1379fdc..43304bf2b 160000 --- a/Carthage/Checkouts/Nimble +++ b/Carthage/Checkouts/Nimble @@ -1 +1 @@ -Subproject commit 9c1379fdcd58c4f2278aea5e029394ba9a2b8f07 +Subproject commit 43304bf2b1579fd555f2fdd51742771c1e4f2b98 diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick index b060679e7..0b4ed6c70 160000 --- a/Carthage/Checkouts/Quick +++ b/Carthage/Checkouts/Quick @@ -1 +1 @@ -Subproject commit b060679e70d13c3c7dcd124201b5b1b34ce6f340 +Subproject commit 0b4ed6c706dd0cce923b5019a605a9bcc6b1b600 diff --git a/Carthage/Checkouts/ReactiveObjC b/Carthage/Checkouts/ReactiveObjC index e46eef2ab..721a32b4b 160000 --- a/Carthage/Checkouts/ReactiveObjC +++ b/Carthage/Checkouts/ReactiveObjC @@ -1 +1 @@ -Subproject commit e46eef2abdea29e344f9d2daec4f212d8bbe6abe +Subproject commit 721a32b4b0bfc3856ce66f8a1047043f96dc425b diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result index 8fc088dcf..2ca499ba4 160000 --- a/Carthage/Checkouts/Result +++ b/Carthage/Checkouts/Result @@ -1 +1 @@ -Subproject commit 8fc088dcf72802801efeecba76ea8fb041fb773d +Subproject commit 2ca499ba456795616fbc471561ff1d963e6ae160 From 10aac8a34d90e69b95b5475a16bb72ece3918a0d Mon Sep 17 00:00:00 2001 From: Jakob Vinther-Larsen Date: Mon, 1 Apr 2019 15:23:09 +0200 Subject: [PATCH 2/9] 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 bd405dd10..b54fd343a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode9.4 +osx_image: xcode10.2 before_install: true install: true branches: From 7e560d3a48b8357cb892c6a6b3af7c7a35207f53 Mon Sep 17 00:00:00 2001 From: Jakob Vinther-Larsen Date: Mon, 1 Apr 2019 15:23:44 +0200 Subject: [PATCH 3/9] MacOS deploy target for tests set to 10.10 --- ReactiveObjCBridge.xcodeproj/project.pbxproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ReactiveObjCBridge.xcodeproj/project.pbxproj b/ReactiveObjCBridge.xcodeproj/project.pbxproj index 8fd034204..b567f5886 100644 --- a/ReactiveObjCBridge.xcodeproj/project.pbxproj +++ b/ReactiveObjCBridge.xcodeproj/project.pbxproj @@ -656,6 +656,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, ); mainGroup = D04725E019E49ED7006002AA; @@ -1298,7 +1299,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)"; SWIFT_VERSION = 4.0; From 73e6f08ae3703252ab3de2702c56995875b11c07 Mon Sep 17 00:00:00 2001 From: Jakob Vinther-Larsen Date: Mon, 1 Apr 2019 15:24:43 +0200 Subject: [PATCH 4/9] Point at intermediate ReactiveOBJC 4.2 --- Cartfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cartfile b/Cartfile index 80d29312d..fe0080015 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ -github "jakovi89/ReactiveObjC" "swift-4.2" +github "jakovi89/ReactiveObjC" "swift-4.2" #Should point to "ReactiveCocoa/ReactiveObjC" github "ReactiveCocoa/ReactiveSwift" ~> 4.0.0 From 1025ebb77782d70cd57892d40b2f92787d655c32 Mon Sep 17 00:00:00 2001 From: Jakob Vinther-Larsen Date: Mon, 1 Apr 2019 15:37:24 +0200 Subject: [PATCH 5/9] Point to ReactiveSwift 5.0.0 --- Cartfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cartfile b/Cartfile index fe0080015..a1622372b 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ github "jakovi89/ReactiveObjC" "swift-4.2" #Should point to "ReactiveCocoa/ReactiveObjC" -github "ReactiveCocoa/ReactiveSwift" ~> 4.0.0 +github "ReactiveCocoa/ReactiveSwift" ~> 5.0.0 From 081607830afc938d55ce1c2b5c5b12dbb0bb41db Mon Sep 17 00:00:00 2001 From: Jakob Vinther-Larsen Date: Tue, 2 Apr 2019 08:25:00 +0200 Subject: [PATCH 6/9] Point back at ReactiveObjc (commit supporting Swift 4.2) --- .gitmodules | 2 +- Cartfile | 2 +- Cartfile.resolved | 4 ++-- Carthage/Checkouts/ReactiveObjC | 2 +- Carthage/Checkouts/ReactiveSwift | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6799e6e06..692e3e53b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -15,4 +15,4 @@ url = https://github.com/ReactiveCocoa/ReactiveSwift.git [submodule "Carthage/Checkouts/ReactiveObjC"] path = Carthage/Checkouts/ReactiveObjC - url = https://github.com/jakovi89/ReactiveObjC.git + url = https://github.com/ReactiveCocoa/ReactiveObjC.git diff --git a/Cartfile b/Cartfile index a1622372b..46ad50acd 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ -github "jakovi89/ReactiveObjC" "swift-4.2" #Should point to "ReactiveCocoa/ReactiveObjC" +github "ReactiveCocoa/ReactiveObjC" "27a7254837bb01122b51aac7c4c3961973351ca0" github "ReactiveCocoa/ReactiveSwift" ~> 5.0.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index a43c70afd..5f57f1931 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,6 +1,6 @@ github "Quick/Nimble" "v8.0.1" github "Quick/Quick" "v2.0.0" -github "ReactiveCocoa/ReactiveSwift" "4.0.0" +github "ReactiveCocoa/ReactiveObjC" "27a7254837bb01122b51aac7c4c3961973351ca0" +github "ReactiveCocoa/ReactiveSwift" "5.0.1" github "antitypical/Result" "4.1.0" -github "jakovi89/ReactiveObjC" "721a32b4b0bfc3856ce66f8a1047043f96dc425b" github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0" diff --git a/Carthage/Checkouts/ReactiveObjC b/Carthage/Checkouts/ReactiveObjC index 721a32b4b..27a725483 160000 --- a/Carthage/Checkouts/ReactiveObjC +++ b/Carthage/Checkouts/ReactiveObjC @@ -1 +1 @@ -Subproject commit 721a32b4b0bfc3856ce66f8a1047043f96dc425b +Subproject commit 27a7254837bb01122b51aac7c4c3961973351ca0 diff --git a/Carthage/Checkouts/ReactiveSwift b/Carthage/Checkouts/ReactiveSwift index 4f6a12ae6..c37950dc5 160000 --- a/Carthage/Checkouts/ReactiveSwift +++ b/Carthage/Checkouts/ReactiveSwift @@ -1 +1 @@ -Subproject commit 4f6a12ae6762e825b0e19a4f7076eafa43847e6e +Subproject commit c37950dc5020544c58d4bf47c0d028893686b9e6 From b2f962ab2d684c6a59ab794586fa5cf8e01d5e04 Mon Sep 17 00:00:00 2001 From: Jakob Vinther-Larsen Date: Tue, 2 Apr 2019 08:25:30 +0200 Subject: [PATCH 7/9] Migrated project to Swift 4.2 --- ReactiveObjCBridge.xcodeproj/project.pbxproj | 50 +++++++++++++++----- 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/ReactiveObjCBridge.xcodeproj/project.pbxproj b/ReactiveObjCBridge.xcodeproj/project.pbxproj index b567f5886..6cb5a64b1 100644 --- a/ReactiveObjCBridge.xcodeproj/project.pbxproj +++ b/ReactiveObjCBridge.xcodeproj/project.pbxproj @@ -623,31 +623,31 @@ ORGANIZATIONNAME = GitHub; TargetAttributes = { 57A4D1AF1BA13D7A00F7D4B1 = { - LastSwiftMigration = 0830; + LastSwiftMigration = 1010; }; 7DFBED021CDB8C9500EE435B = { CreatedOnToolsVersion = 7.3.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 1010; }; A9B315531B3940610001CB9C = { CreatedOnToolsVersion = 7.0; - LastSwiftMigration = 0830; + LastSwiftMigration = 1010; }; D04725E919E49ED7006002AA = { CreatedOnToolsVersion = 6.1; - LastSwiftMigration = 0830; + LastSwiftMigration = 1010; }; D04725F419E49ED7006002AA = { CreatedOnToolsVersion = 6.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 1010; }; D047260B19E49F82006002AA = { CreatedOnToolsVersion = 6.1; - LastSwiftMigration = 0830; + LastSwiftMigration = 1010; }; D047261519E49F82006002AA = { CreatedOnToolsVersion = 6.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 1010; }; }; }; @@ -829,6 +829,7 @@ ); INFOPLIST_FILE = ReactiveObjCBridge/Info.plist; MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap"; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -849,6 +850,7 @@ ); INFOPLIST_FILE = ReactiveObjCBridge/Info.plist; MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap"; + SWIFT_VERSION = 4.2; }; name = Test; }; @@ -869,6 +871,7 @@ ); INFOPLIST_FILE = ReactiveObjCBridge/Info.plist; MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap"; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -889,6 +892,7 @@ ); INFOPLIST_FILE = ReactiveObjCBridge/Info.plist; MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap"; + SWIFT_VERSION = 4.2; }; name = Profile; }; @@ -904,6 +908,7 @@ ); INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist; PRODUCT_NAME = "$(PROJECT_NAME)Tests"; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -919,6 +924,7 @@ ); INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist; PRODUCT_NAME = "$(PROJECT_NAME)Tests"; + SWIFT_VERSION = 4.2; }; name = Test; }; @@ -934,6 +940,7 @@ ); INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist; PRODUCT_NAME = "$(PROJECT_NAME)Tests"; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -949,6 +956,7 @@ ); INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist; PRODUCT_NAME = "$(PROJECT_NAME)Tests"; + SWIFT_VERSION = 4.2; }; name = Profile; }; @@ -969,6 +977,7 @@ ); INFOPLIST_FILE = ReactiveObjCBridge/Info.plist; MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap"; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -989,6 +998,7 @@ ); INFOPLIST_FILE = ReactiveObjCBridge/Info.plist; MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap"; + SWIFT_VERSION = 4.2; }; name = Test; }; @@ -1009,6 +1019,7 @@ ); INFOPLIST_FILE = ReactiveObjCBridge/Info.plist; MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap"; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -1029,6 +1040,7 @@ ); INFOPLIST_FILE = ReactiveObjCBridge/Info.plist; MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap"; + SWIFT_VERSION = 4.2; }; name = Profile; }; @@ -1048,7 +1060,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.9; PRODUCT_BUNDLE_IDENTIFIER = "org.reactivecocoa.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(PROJECT_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TVOS_DEPLOYMENT_TARGET = 9.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -1073,7 +1085,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "org.reactivecocoa.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(PROJECT_NAME)"; SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TVOS_DEPLOYMENT_TARGET = 9.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -1094,6 +1106,7 @@ FRAMEWORK_VERSION = A; INFOPLIST_FILE = ReactiveObjCBridge/Info.plist; MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap"; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -1110,6 +1123,7 @@ FRAMEWORK_VERSION = A; INFOPLIST_FILE = ReactiveObjCBridge/Info.plist; MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap"; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -1125,6 +1139,7 @@ INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist; MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_NAME = "$(PROJECT_NAME)Tests"; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -1140,6 +1155,7 @@ INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist; MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_NAME = "$(PROJECT_NAME)Tests"; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -1156,6 +1172,7 @@ ); INFOPLIST_FILE = ReactiveObjCBridge/Info.plist; MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap"; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -1172,6 +1189,7 @@ ); INFOPLIST_FILE = ReactiveObjCBridge/Info.plist; MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap"; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -1186,6 +1204,7 @@ ); INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist; PRODUCT_NAME = "$(PROJECT_NAME)Tests"; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -1200,6 +1219,7 @@ ); INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist; PRODUCT_NAME = "$(PROJECT_NAME)Tests"; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -1218,7 +1238,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.9; PRODUCT_BUNDLE_IDENTIFIER = "org.reactivecocoa.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(PROJECT_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TVOS_DEPLOYMENT_TARGET = 9.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -1239,6 +1259,7 @@ FRAMEWORK_VERSION = A; INFOPLIST_FILE = ReactiveObjCBridge/Info.plist; MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap"; + SWIFT_VERSION = 4.2; }; name = Profile; }; @@ -1254,6 +1275,7 @@ INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist; MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_NAME = "$(PROJECT_NAME)Tests"; + SWIFT_VERSION = 4.2; }; name = Profile; }; @@ -1270,6 +1292,7 @@ ); INFOPLIST_FILE = ReactiveObjCBridge/Info.plist; MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap"; + SWIFT_VERSION = 4.2; }; name = Profile; }; @@ -1284,6 +1307,7 @@ ); INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist; PRODUCT_NAME = "$(PROJECT_NAME)Tests"; + SWIFT_VERSION = 4.2; }; name = Profile; }; @@ -1302,7 +1326,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_BUNDLE_IDENTIFIER = "org.reactivecocoa.$(PRODUCT_NAME:rfc1034identifier)-Tests"; PRODUCT_NAME = "$(PROJECT_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TVOS_DEPLOYMENT_TARGET = 9.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -1323,6 +1347,7 @@ FRAMEWORK_VERSION = A; INFOPLIST_FILE = ReactiveObjCBridge/Info.plist; MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap"; + SWIFT_VERSION = 4.2; }; name = Test; }; @@ -1338,6 +1363,7 @@ INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist; MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_NAME = "$(PROJECT_NAME)Tests"; + SWIFT_VERSION = 4.2; }; name = Test; }; @@ -1354,6 +1380,7 @@ ); INFOPLIST_FILE = ReactiveObjCBridge/Info.plist; MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap"; + SWIFT_VERSION = 4.2; }; name = Test; }; @@ -1368,6 +1395,7 @@ ); INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist; PRODUCT_NAME = "$(PROJECT_NAME)Tests"; + SWIFT_VERSION = 4.2; }; name = Test; }; From b59683dc6223eab8044f59783d6303a543289324 Mon Sep 17 00:00:00 2001 From: Jakob Vinther-Larsen Date: Wed, 3 Apr 2019 09:41:15 +0200 Subject: [PATCH 8/9] Explicitly build WatchOS dependencies --- .../ReactiveObjCBridge-watchOS.xcscheme | 55 ++++++++++++++++++- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/ReactiveObjCBridge.xcodeproj/xcshareddata/xcschemes/ReactiveObjCBridge-watchOS.xcscheme b/ReactiveObjCBridge.xcodeproj/xcshareddata/xcschemes/ReactiveObjCBridge-watchOS.xcscheme index 1a42c43b3..e7e319498 100644 --- a/ReactiveObjCBridge.xcodeproj/xcshareddata/xcschemes/ReactiveObjCBridge-watchOS.xcscheme +++ b/ReactiveObjCBridge.xcodeproj/xcshareddata/xcschemes/ReactiveObjCBridge-watchOS.xcscheme @@ -3,9 +3,51 @@ LastUpgradeVersion = "0940" version = "1.3"> + parallelizeBuildables = "NO" + buildImplicitDependencies = "NO"> + + + + + + + + + + + + + + + + From c303ad3bc5a9a0e975619a8d0199f5c3f00abb10 Mon Sep 17 00:00:00 2001 From: Jakob Vinther-Larsen Date: Thu, 4 Apr 2019 09:48:19 +0200 Subject: [PATCH 9/9] Point at ReactiveObjc 3.1.1 --- Cartfile | 2 +- Cartfile.resolved | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cartfile b/Cartfile index 46ad50acd..a49846062 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ -github "ReactiveCocoa/ReactiveObjC" "27a7254837bb01122b51aac7c4c3961973351ca0" +github "ReactiveCocoa/ReactiveObjC" ~> 3.1.1 github "ReactiveCocoa/ReactiveSwift" ~> 5.0.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index 5f57f1931..71e36ca14 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,6 +1,6 @@ github "Quick/Nimble" "v8.0.1" github "Quick/Quick" "v2.0.0" -github "ReactiveCocoa/ReactiveObjC" "27a7254837bb01122b51aac7c4c3961973351ca0" +github "ReactiveCocoa/ReactiveObjC" "3.1.1" github "ReactiveCocoa/ReactiveSwift" "5.0.1" github "antitypical/Result" "4.1.0" github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"