Skip to content

Commit

Permalink
Merge pull request #55 from jakovi89/swift-4.2
Browse files Browse the repository at this point in the history 
Updated Quick, Nimble and ReactiveObjc for swift 4.2 support
  • Loading branch information
@mdiep
mdiep authored Apr 4, 2019
2 parents 07511fd + c303ad3 commit f376db7
Show file tree
Hide file tree
Showing 11 changed files with 109 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode9.4
osx_image: xcode10.2
before_install: true
install: true
branches:
Expand Down
4 changes: 2 additions & 2 deletions Cartfile
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "ReactiveCocoa/ReactiveObjC" ~> 3.1.0
github "ReactiveCocoa/ReactiveSwift" ~> 4.0.0
github "ReactiveCocoa/ReactiveObjC" ~> 3.1.1
github "ReactiveCocoa/ReactiveSwift" ~> 5.0.0
4 changes: 2 additions & 2 deletions Cartfile.private
View file
Original file line number Diff line number Diff line change
@@ -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
10 changes: 5 additions & 5 deletions Cartfile.resolved
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
github "Quick/Nimble" "v7.1.3"
github "Quick/Quick" "v1.3.1"
github "ReactiveCocoa/ReactiveObjC" "3.1.0"
github "ReactiveCocoa/ReactiveSwift" "4.0.0"
github "antitypical/Result" "4.0.0"
github "Quick/Nimble" "v8.0.1"
github "Quick/Quick" "v2.0.0"
github "ReactiveCocoa/ReactiveObjC" "3.1.1"
github "ReactiveCocoa/ReactiveSwift" "5.0.1"
github "antitypical/Result" "4.1.0"
github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Nimble
Submodule Nimble updated 100 files
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Quick
Submodule Quick updated 49 files
+3 −1 .hound.yml
+1 −1 .swift-version
+40 −44 .travis.yml
+2 −2 Dangerfile
+1 −1 Documentation/en-us/SharedExamples.md
+1 −1 Documentation/ko-kr/BehavioralTesting.md
+1 −1 Documentation/ko-kr/InstallingQuick.md
+1 −1 Externals/Nimble
+1 −1 Gemfile
+26 −26 Gemfile.lock
+2 −2 Package.resolved
+30 −37 Package.swift
+0 −40 [email protected]
+1 −1 Quick Templates/Quick Configuration Class.xctemplate/Objective-C/___FILEBASENAME___.h
+1 −1 Quick Templates/Quick Configuration Class.xctemplate/Objective-C/___FILEBASENAME___.m
+1 −1 Quick Templates/Quick Configuration Class.xctemplate/Swift/___FILEBASENAME___.swift
+1 −1 Quick Templates/Quick Spec Class.xctemplate/Objective-C/___FILEBASENAME___.m
+1 −1 Quick Templates/Quick Spec Class.xctemplate/Swift/___FILEBASENAME___.swift
+5 −2 Quick.podspec
+9 −9 Quick.xcodeproj/project.pbxproj
+8 −0 Quick.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+3 −1 README.md
+9 −6 Rakefile
+1 −1 Sources/Quick/Behavior.swift
+3 −9 Sources/Quick/Callsite.swift
+2 −2 Sources/Quick/Configuration/Configuration.swift
+1 −1 Sources/Quick/Configuration/QuickConfiguration.swift
+3 −3 Sources/Quick/DSL/World+DSL.swift
+1 −1 Sources/Quick/ErrorUtility.swift
+3 −9 Sources/Quick/Example.swift
+3 −9 Sources/Quick/ExampleMetadata.swift
+3 −9 Sources/Quick/Filter.swift
+1 −1 Sources/Quick/NSBundle+CurrentTestBundle.swift
+2 −2 Sources/Quick/NSString+C99ExtendedIdentifier.swift
+2 −2 Sources/Quick/QuickMain.swift
+1 −1 Sources/Quick/QuickSelectedTestSuiteBuilder.swift
+2 −10 Sources/Quick/QuickSpec.swift
+1 −1 Sources/Quick/QuickTestSuite.swift
+5 −11 Sources/Quick/World.swift
+1 −1 Tests/QuickTests/QuickTestHelpers/XCTestCaseProvider.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/AfterEachTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/BeforeEachTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/BehaviorTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/ContextTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/DescribeTests.swift
+2 −2 Tests/QuickTests/QuickTests/FunctionalTests/ItTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/SharedExamplesTests.swift
+1 −1 script/release
+0 −4 script/travis-install-macos
2 changes: 1 addition & 1 deletion Carthage/Checkouts/ReactiveObjC
Submodule ReactiveObjC updated 21 files
+3 −2 .travis.yml
+2 −2 Cartfile.private
+2 −2 Cartfile.resolved
+1 −1 Carthage/Checkouts/Nimble
+1 −1 Carthage/Checkouts/Quick
+140 −28 ReactiveObjC.xcodeproj/project.pbxproj
+19 −0 ReactiveObjC/Deprecations+Removals.swift
+1 −1 ReactiveObjC/NSObject+RACAppKitBindings.m
+1 −1 ReactiveObjC/NSObject+RACKVOWrapper.m
+9 −7 ReactiveObjC/NSObject+RACSelectorSignal.h
+1 −2 ReactiveObjC/NSObject+RACSelectorSignal.m
+1 −1 ReactiveObjC/RACBlockTrampoline.m
+5 −3 ReactiveObjC/RACCommand.h
+1 −3 ReactiveObjC/RACCommand.m
+1 −1 ReactiveObjC/RACDisposable.m
+2 −1 ReactiveObjC/RACReplaySubject.m
+9 −8 ReactiveObjC/RACSignal+Operations.h
+2 −5 ReactiveObjC/RACSignal+Operations.m
+2 −2 ReactiveObjC/extobjc/EXTRuntimeExtensions.m
+15 −0 ReactiveObjCTests/RACSubjectSpec.m
+33 −0 ReactiveObjCTests/RACSwiftBridgingSpec.swift
2 changes: 1 addition & 1 deletion Carthage/Checkouts/ReactiveSwift
Submodule ReactiveSwift updated 37 files
+1 −1 .swift-version
+69 −59 .travis.yml
+13 −1 CHANGELOG.md
+1 −1 Cartfile
+2 −2 Cartfile.private
+3 −3 Cartfile.resolved
+1 −1 Carthage/Checkouts/Nimble
+1 −1 Carthage/Checkouts/Quick
+1 −1 Carthage/Checkouts/Result
+8 −8 Documentation/Example.OnlineSearch.md
+9 −9 Documentation/ReactivePrimitives.md
+1 −1 Documentation/RxComparison.md
+6 −6 Package.resolved
+3 −3 Package.swift
+19 −0 [email protected]
+4 −4 README.md
+1 −1 ReactiveSwift.playground/Pages/Signal.xcplaygroundpage/Contents.swift
+19 −0 ReactiveSwift.playground/Pages/SignalProducer.xcplaygroundpage/Contents.swift
+3 −3 ReactiveSwift.podspec
+8 −3 ReactiveSwift.xcodeproj/project.pbxproj
+4 −5 ReactiveSwift.xcodeproj/xcshareddata/xcschemes/ReactiveSwift-iOS.xcscheme
+4 −5 ReactiveSwift.xcodeproj/xcshareddata/xcschemes/ReactiveSwift-macOS.xcscheme
+4 −5 ReactiveSwift.xcodeproj/xcshareddata/xcschemes/ReactiveSwift-tvOS.xcscheme
+37 −0 Sources/Action.swift
+1 −1 Sources/Atomic.swift
+51 −10 Sources/Event.swift
+1 −1 Sources/Info.plist
+1 −1 Sources/ResultExtensions.swift
+10 −4 Sources/Scheduler.swift
+23 −0 Sources/Signal.swift
+25 −2 Sources/SignalProducer.swift
+45 −0 Tests/ReactiveSwiftTests/ActionSpec.swift
+1 −1 Tests/ReactiveSwiftTests/Info.plist
+1 −1 Tests/ReactiveSwiftTests/SchedulerSpec.swift
+71 −0 Tests/ReactiveSwiftTests/SignalProducerLiftingSpec.swift
+71 −0 Tests/ReactiveSwiftTests/SignalSpec.swift
+2 −1 script/build
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Result
Submodule Result updated 10 files
+1 −1 .swift-version
+32 −0 .travis.yml
+14 −0 [email protected]
+5 −6 README.md
+2 −2 Result.podspec
+8 −8 Result.xcodeproj/project.pbxproj
+1 −1 Result/Info.plist
+37 −4 Result/Result.swift
+6 −6 Result/ResultProtocol.swift
+1 −1 Tests/ResultTests/Info.plist
53 changes: 41 additions & 12 deletions ReactiveObjCBridge.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
};
};
Expand All @@ -656,6 +656,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
);
mainGroup = D04725E019E49ED7006002AA;
Expand Down Expand Up @@ -828,6 +829,7 @@
);
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -848,6 +850,7 @@
);
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
SWIFT_VERSION = 4.2;
};
name = Test;
};
Expand All @@ -868,6 +871,7 @@
);
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand All @@ -888,6 +892,7 @@
);
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
SWIFT_VERSION = 4.2;
};
name = Profile;
};
Expand All @@ -903,6 +908,7 @@
);
INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist;
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -918,6 +924,7 @@
);
INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist;
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
SWIFT_VERSION = 4.2;
};
name = Test;
};
Expand All @@ -933,6 +940,7 @@
);
INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist;
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand All @@ -948,6 +956,7 @@
);
INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist;
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
SWIFT_VERSION = 4.2;
};
name = Profile;
};
Expand All @@ -968,6 +977,7 @@
);
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -988,6 +998,7 @@
);
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
SWIFT_VERSION = 4.2;
};
name = Test;
};
Expand All @@ -1008,6 +1019,7 @@
);
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand All @@ -1028,6 +1040,7 @@
);
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
SWIFT_VERSION = 4.2;
};
name = Profile;
};
Expand All @@ -1047,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 = "";
Expand All @@ -1072,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 = "";
Expand All @@ -1093,6 +1106,7 @@
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -1109,6 +1123,7 @@
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand All @@ -1124,6 +1139,7 @@
INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist;
MACOSX_DEPLOYMENT_TARGET = 10.10;
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -1139,6 +1155,7 @@
INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist;
MACOSX_DEPLOYMENT_TARGET = 10.10;
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand All @@ -1155,6 +1172,7 @@
);
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -1171,6 +1189,7 @@
);
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand All @@ -1185,6 +1204,7 @@
);
INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist;
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
SWIFT_VERSION = 4.2;
};
name = Debug;
};
Expand All @@ -1199,6 +1219,7 @@
);
INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist;
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
SWIFT_VERSION = 4.2;
};
name = Release;
};
Expand All @@ -1217,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 = "";
Expand All @@ -1238,6 +1259,7 @@
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
SWIFT_VERSION = 4.2;
};
name = Profile;
};
Expand All @@ -1253,6 +1275,7 @@
INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist;
MACOSX_DEPLOYMENT_TARGET = 10.10;
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
SWIFT_VERSION = 4.2;
};
name = Profile;
};
Expand All @@ -1269,6 +1292,7 @@
);
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
SWIFT_VERSION = 4.2;
};
name = Profile;
};
Expand All @@ -1283,6 +1307,7 @@
);
INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist;
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
SWIFT_VERSION = 4.2;
};
name = Profile;
};
Expand All @@ -1298,10 +1323,10 @@
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;
SWIFT_VERSION = 4.2;
TVOS_DEPLOYMENT_TARGET = 9.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand All @@ -1322,6 +1347,7 @@
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
SWIFT_VERSION = 4.2;
};
name = Test;
};
Expand All @@ -1337,6 +1363,7 @@
INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist;
MACOSX_DEPLOYMENT_TARGET = 10.10;
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
SWIFT_VERSION = 4.2;
};
name = Test;
};
Expand All @@ -1353,6 +1380,7 @@
);
INFOPLIST_FILE = ReactiveObjCBridge/Info.plist;
MODULEMAP_FILE = "$(SRCROOT)/ReactiveObjCBridge/module.modulemap";
SWIFT_VERSION = 4.2;
};
name = Test;
};
Expand All @@ -1367,6 +1395,7 @@
);
INFOPLIST_FILE = ReactiveObjCBridgeTests/Info.plist;
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
SWIFT_VERSION = 4.2;
};
name = Test;
};
Expand Down
Loading

0 comments on commit f376db7

Please sign in to comment.