Skip to content
This repository has been archived by the owner on Dec 12, 2021. It is now read-only.

Commit

Permalink
Merge pull request #23 from CrazyFanFan/swift/5.0
Browse files Browse the repository at this point in the history
update to swift5 && fix cocoapod can not use RxSwift ~> 5.0
  • Loading branch information
inamiy authored Jun 9, 2019
2 parents 080055c + b9b06f0 commit bc7cf7c
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.2.1
5.0
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ env:
- LC_CTYPE=en_US.UTF-8
- XCPROJ="-workspace RxAutomaton.xcworkspace -scheme RxAutomaton"

osx_image: xcode10.1
osx_image: xcode10.2

matrix:
include:
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactiveX/RxSwift" ~> 4.0
github "ReactiveX/RxSwift" ~> 5.0
6 changes: 3 additions & 3 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github "Quick/Nimble" "v7.3.4"
github "Quick/Quick" "v1.3.4"
github "ReactiveX/RxSwift" "4.4.1"
github "Quick/Nimble" "v8.0.1"
github "Quick/Quick" "v2.1.0"
github "ReactiveX/RxSwift" "5.0.1"
github "mrackwitz/xcconfigs" "3.0"
github "shu223/Pulsator" "0.4.2"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Nimble
Submodule Nimble updated 96 files
+1 −1 .swift-version
+16 −4 .swiftlint.yml
+24 −44 .travis.yml
+1 −1 Gemfile
+24 −24 Gemfile.lock
+4 −1 Nimble.podspec
+24 −4 Nimble.xcodeproj/project.pbxproj
+8 −0 Nimble.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+16 −6 Package.swift
+0 −22 Package@swift-4.swift
+6 −21 README.md
+1 −0 Sources/Nimble/Adapters/AdapterProtocols.swift
+30 −3 Sources/Nimble/Adapters/AssertionRecorder.swift
+5 −1 Sources/Nimble/Adapters/NMBExpectation.swift
+3 −1 Sources/Nimble/Adapters/NMBObjCMatcher.swift
+2 −7 Sources/Nimble/Adapters/NimbleEnvironment.swift
+6 −7 Sources/Nimble/Adapters/NimbleXCTestHandler.swift
+1 −1 Sources/Nimble/Adapters/NonObjectiveC/ExceptionCapture.swift
+2 −2 Sources/Nimble/DSL+Wait.swift
+11 −7 Sources/Nimble/DSL.swift
+16 −13 Sources/Nimble/ExpectationMessage.swift
+2 −0 Sources/Nimble/Expression.swift
+1 −0 Sources/Nimble/FailureMessage.swift
+2 −1 Sources/Nimble/Matchers/AllPass.swift
+4 −2 Sources/Nimble/Matchers/Async.swift
+1 −1 Sources/Nimble/Matchers/BeAKindOf.swift
+2 −2 Sources/Nimble/Matchers/BeAnInstanceOf.swift
+8 −1 Sources/Nimble/Matchers/BeCloseTo.swift
+25 −4 Sources/Nimble/Matchers/BeEmpty.swift
+4 −4 Sources/Nimble/Matchers/BeGreaterThan.swift
+4 −4 Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift
+8 −32 Sources/Nimble/Matchers/BeIdenticalTo.swift
+4 −4 Sources/Nimble/Matchers/BeLessThan.swift
+4 −4 Sources/Nimble/Matchers/BeLessThanOrEqual.swift
+17 −30 Sources/Nimble/Matchers/BeLogical.swift
+4 −4 Sources/Nimble/Matchers/BeNil.swift
+7 −5 Sources/Nimble/Matchers/BeVoid.swift
+7 −6 Sources/Nimble/Matchers/BeginWith.swift
+66 −17 Sources/Nimble/Matchers/Contain.swift
+13 −13 Sources/Nimble/Matchers/ContainElementSatisfying.swift
+16 −0 Sources/Nimble/Matchers/ElementsEqual.swift
+7 −6 Sources/Nimble/Matchers/EndWith.swift
+3 −63 Sources/Nimble/Matchers/Equal.swift
+18 −9 Sources/Nimble/Matchers/HaveCount.swift
+1 −1 Sources/Nimble/Matchers/Match.swift
+8 −5 Sources/Nimble/Matchers/MatcherProtocols.swift
+5 −32 Sources/Nimble/Matchers/PostNotification.swift
+2 −1 Sources/Nimble/Matchers/Predicate.swift
+9 −3 Sources/Nimble/Matchers/RaisesException.swift
+7 −3 Sources/Nimble/Matchers/SatisfyAllOf.swift
+7 −3 Sources/Nimble/Matchers/SatisfyAnyOf.swift
+3 −4 Sources/Nimble/Matchers/ThrowAssertion.swift
+13 −19 Sources/Nimble/Utils/Await.swift
+4 −2 Sources/Nimble/Utils/Functional.swift
+4 −15 Sources/Nimble/Utils/Stringers.swift
+4 −33 Tests/LinuxMain.swift
+15 −53 Tests/NimbleTests/AsynchronousTest.swift
+15 −5 Tests/NimbleTests/Helpers/XCTestCaseProvider.swift
+7 −2 Tests/NimbleTests/Helpers/utils.swift
+0 −11 Tests/NimbleTests/Matchers/AllPassTest.swift
+4 −18 Tests/NimbleTests/Matchers/BeAKindOfTest.swift
+0 −9 Tests/NimbleTests/Matchers/BeAnInstanceOfTest.swift
+18 −36 Tests/NimbleTests/Matchers/BeCloseToTest.swift
+66 −14 Tests/NimbleTests/Matchers/BeEmptyTest.swift
+0 −7 Tests/NimbleTests/Matchers/BeGreaterThanOrEqualToTest.swift
+0 −7 Tests/NimbleTests/Matchers/BeGreaterThanTest.swift
+0 −11 Tests/NimbleTests/Matchers/BeIdenticalToObjectTest.swift
+0 −11 Tests/NimbleTests/Matchers/BeIdenticalToTest.swift
+0 −7 Tests/NimbleTests/Matchers/BeLessThanOrEqualToTest.swift
+0 −7 Tests/NimbleTests/Matchers/BeLessThanTest.swift
+0 −38 Tests/NimbleTests/Matchers/BeLogicalTest.swift
+0 −6 Tests/NimbleTests/Matchers/BeNilTest.swift
+0 −6 Tests/NimbleTests/Matchers/BeVoidTest.swift
+0 −7 Tests/NimbleTests/Matchers/BeginWithTest.swift
+0 −14 Tests/NimbleTests/Matchers/ContainElementSatisfyingTest.swift
+62 −12 Tests/NimbleTests/Matchers/ContainTest.swift
+27 −0 Tests/NimbleTests/Matchers/ElementsEqualTest.swift
+0 −7 Tests/NimbleTests/Matchers/EndWithTest.swift
+1 −18 Tests/NimbleTests/Matchers/EqualTest.swift
+39 −20 Tests/NimbleTests/Matchers/HaveCountTest.swift
+4 −12 Tests/NimbleTests/Matchers/MatchErrorTest.swift
+0 −10 Tests/NimbleTests/Matchers/MatchTest.swift
+0 −12 Tests/NimbleTests/Matchers/PostNotificationTest.swift
+1 −11 Tests/NimbleTests/Matchers/RaisesExceptionTest.swift
+0 −7 Tests/NimbleTests/Matchers/SatisfyAllOfTest.swift
+0 −7 Tests/NimbleTests/Matchers/SatisfyAnyOfTest.swift
+1 −12 Tests/NimbleTests/Matchers/ThrowAssertionTest.swift
+2 −12 Tests/NimbleTests/Matchers/ThrowErrorTest.swift
+0 −6 Tests/NimbleTests/Matchers/ToSucceedTest.swift
+0 −19 Tests/NimbleTests/SynchronousTest.swift
+36 −29 Tests/NimbleTests/UserDescriptionTest.swift
+387 −0 Tests/NimbleTests/XCTestManifests.swift
+9 −0 Tests/NimbleTests/objc/ObjCContainTest.m
+0 −1 Tests/NimbleTests/objc/ObjCEndWithTest.m
+9 −0 Tests/NimbleTests/objc/ObjCHaveCountTest.m
+7 −3 test
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Quick
Submodule Quick updated 67 files
+4 −2 .hound.yml
+1 −1 .swift-version
+48 −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
+48 −44 Gemfile.lock
+2 −2 Package.resolved
+35 −37 Package.swift
+6 −4 Package@swift-4.2.swift
+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
+75 −42 Quick.xcodeproj/project.pbxproj
+1 −1 Quick.xcodeproj/xcshareddata/xcschemes/Quick-iOS.xcscheme
+1 −1 Quick.xcodeproj/xcshareddata/xcschemes/Quick-macOS.xcscheme
+1 −1 Quick.xcodeproj/xcshareddata/xcschemes/Quick-tvOS.xcscheme
+8 −0 Quick.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+3 −1 README.md
+9 −6 Rakefile
+17 −12 Sources/Quick/Callsite.swift
+2 −2 Sources/Quick/Configuration/Configuration.swift
+1 −1 Sources/Quick/Configuration/QuickConfiguration.swift
+10 −10 Sources/Quick/DSL/DSL.swift
+15 −15 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
+2 −2 Sources/Quick/NSBundle+CurrentTestBundle.swift
+2 −2 Sources/Quick/QuickMain.swift
+1 −1 Sources/Quick/QuickSelectedTestSuiteBuilder.swift
+24 −16 Sources/Quick/QuickSpec.swift
+1 −1 Sources/Quick/QuickTestSuite.swift
+4 −7 Sources/Quick/String+C99ExtendedIdentifier.swift
+5 −11 Sources/Quick/World.swift
+1 −1 Sources/QuickObjectiveC/QuickSpec.h
+16 −15 Tests/LinuxMain.swift
+3 −2 Tests/QuickTests/QuickTestHelpers/SpecRunner.swift
+3 −8 Tests/QuickTests/QuickTestHelpers/TestRun.swift
+5 −5 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
+18 −6 Tests/QuickTests/QuickTests/FunctionalTests/CurrentSpecTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/DescribeTests.swift
+2 −2 Tests/QuickTests/QuickTests/FunctionalTests/ItTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/ObjC/ItTests+ObjC.m
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/SharedExamplesTests.swift
+8 −23 Tests/QuickTests/QuickTests/Helpers/QCKSpecRunner.m
+24 −0 Tests/QuickTests/QuickTests/Helpers/QuickSpec+MethodList.swift
+0 −17 Tests/QuickTests/QuickTests/Helpers/QuickSpec+QuickSpec_MethodList.h
+0 −23 Tests/QuickTests/QuickTests/Helpers/QuickSpec+QuickSpec_MethodList.m
+57 −0 Tests/QuickTests/QuickTests/Helpers/QuickSpecRunner.swift
+1 −2 Tests/QuickTests/QuickTests/Helpers/QuickTestsBridgingHeader.h
+0 −20 Tests/QuickTests/QuickTests/Helpers/XCTestObservationCenter+QCKSuspendObservation.h
+0 −54 Tests/QuickTests/QuickTests/Helpers/XCTestObservationCenter+QCKSuspendObservation.m
+47 −0 Tests/QuickTests/QuickTests/Helpers/XCTestObservationCenter+QCKSuspendObservation.swift
+1 −1 script/release
+0 −4 script/travis-install-macos
2 changes: 1 addition & 1 deletion Carthage/Checkouts/RxSwift
Submodule RxSwift updated 69 files
+15 −4 .travis.yml
+15 −0 CHANGELOG.md
+0 −1 Documentation/MathBehindRx.md
+31 −18 Platform/AtomicInt.swift
+6 −0 Platform/DataStructures/Bag.swift
+97 −0 Preprocessor/Preprocessor.xcodeproj/xcshareddata/xcschemes/Preprocessor.xcscheme
+1 −1 README.md
+5 −30 Rx.xcodeproj/project.pbxproj
+1 −1 RxAtomic.podspec
+1 −1 RxAtomic/Info.plist
+2 −3 RxBlocking.podspec
+1 −1 RxBlocking/Info.plist
+6 −4 RxBlocking/RunLoopLock.swift
+2 −2 RxCocoa.podspec
+2 −2 RxCocoa/Common/ControlTarget.swift
+5 −5 RxCocoa/Common/DelegateProxy.swift
+5 −5 RxCocoa/Common/DelegateProxyType.swift
+2 −2 RxCocoa/Common/RxTarget.swift
+2 −2 RxCocoa/Deprecated.swift
+1 −1 RxCocoa/Info.plist
+7 −7 RxCocoa/Traits/Driver/Driver+Subscription.swift
+1 −1 RxCocoa/iOS/UIBarButtonItem+Rx.swift
+1 −1 RxCocoa/iOS/UIControl+Rx.swift
+1 −1 RxCocoa/iOS/UIGestureRecognizer+Rx.swift
+12 −1 RxCocoa/iOS/UISearchBar+Rx.swift
+7 −0 RxCocoa/iOS/UIView+Rx.swift
+3 −3 RxCocoa/macOS/NSControl+Rx.swift
+1 −3 RxSwift.podspec
+3 −3 RxSwift/Disposables/AnonymousDisposable.swift
+3 −3 RxSwift/Disposables/BinaryDisposable.swift
+2 −2 RxSwift/Disposables/RefCountDisposable.swift
+3 −3 RxSwift/Disposables/ScheduledDisposable.swift
+4 −4 RxSwift/Disposables/SingleAssignmentDisposable.swift
+1 −1 RxSwift/Info.plist
+3 −3 RxSwift/Observables/Create.swift
+4 −4 RxSwift/Observables/Map.swift
+3 −3 RxSwift/Observables/Multicast.swift
+4 −4 RxSwift/Observables/ObserveOn.swift
+4 −4 RxSwift/Observables/Producer.swift
+4 −4 RxSwift/Observables/Sink.swift
+42 −0 RxSwift/Observables/Zip+arity.swift
+6 −0 RxSwift/Observables/Zip+arity.tt
+4 −4 RxSwift/Observers/ObserverBase.swift
+5 −6 RxSwift/Rx.swift
+16 −4 RxSwift/Schedulers/MainScheduler.swift
+3 −3 RxSwift/Schedulers/SchedulerServices+Emulation.swift
+14 −2 RxSwift/Traits/ObservableType+PrimitiveSequence.swift
+2 −3 RxTest.podspec
+1 −1 RxTest/Info.plist
+7 −0 RxTest/Subscription.swift
+5 −0 Sources/AllTestz/main.swift
+1 −1 Tests/RxCocoaTests/Binder+Tests.swift
+1 −1 Tests/RxCocoaTests/KeyPathBinder+RxTests.swift
+6 −6 Tests/RxCocoaTests/SharedSequence+Test.swift
+23 −1 Tests/RxCocoaTests/UISearchBar+RxTests.swift
+41 −12 Tests/RxCocoaTests/UIView+RxTests.swift
+36 −37 Tests/RxSwiftTests/AtomicTests.swift
+8 −0 Tests/RxSwiftTests/CompletableTest.swift
+3 −3 Tests/RxSwiftTests/DisposableTest.swift
+5 −5 Tests/RxSwiftTests/Observable+ConcatTests.swift
+6 −6 Tests/RxSwiftTests/Observable+ObserveOnTests.swift
+135 −0 Tests/RxSwiftTests/Observable+PrimitiveSequenceTest.swift
+2 −2 Tests/RxSwiftTests/RxAtomic+Overrides.swift
+13 −7 Tests/RxSwiftTests/TestImplementations/Mocks/PrimitiveHotObservable.swift
+1 −5 scripts/all-tests.sh
+28 −11 scripts/common.sh
+1 −1 scripts/test-linux.sh
+1 −2 scripts/validate-markdown.sh
+15 −20 scripts/validate-podspec.sh
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:4.2
// swift-tools-version:5.0

import Foundation
import PackageDescription
Expand Down
2 changes: 1 addition & 1 deletion RxAutomaton.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ Pod::Spec.new do |s|
s.source = { :git => "https://github.com/inamiy/RxAutomaton.git", :tag => "#{s.version}" }
s.source_files = "Sources/**/*.swift"

s.dependency "RxSwift", "~> 4.0"
s.dependency "RxSwift", "~> 5.0"
end
9 changes: 7 additions & 2 deletions RxAutomaton.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@
TargetAttributes = {
488738DB1D61689000BF70F4 = {
CreatedOnToolsVersion = 7.3.1;
LastSwiftMigration = 0800;
LastSwiftMigration = 1020;
ProvisioningStyle = Manual;
};
488738E51D61689100BF70F4 = {
Expand All @@ -381,13 +381,14 @@
};
48AC07691D61C962000293FD = {
CreatedOnToolsVersion = 7.3.1;
LastSwiftMigration = 1020;
ProvisioningStyle = Manual;
};
};
};
buildConfigurationList = 488738D61D61689000BF70F4 /* Build configuration list for PBXProject "RxAutomaton" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Expand Down Expand Up @@ -631,6 +632,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.inamiy.RxAutomaton;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -651,6 +653,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.inamiy.RxAutomaton;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down Expand Up @@ -689,6 +692,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.inamiy.RxAutomatonDemo;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -704,6 +708,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.inamiy.RxAutomatonDemo;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down

0 comments on commit bc7cf7c

Please sign in to comment.