From 18f6c66a7af4297baa7d149739c992fa3d3cfd99 Mon Sep 17 00:00:00 2001 From: Duc Do Date: Wed, 28 Sep 2022 11:29:56 +0300 Subject: [PATCH] Upgrade lib to work on xcode 14, also upgrade Quick and Nimble --- Example/Podfile | 6 +- Example/Podfile.lock | 45 +++++------ Example/SwiftyMock.xcodeproj/project.pbxproj | 76 ++++++++++++------- .../xcschemes/SwiftyMock-Example.xcscheme | 24 +++--- .../xcschemes/SwiftyMock-Tests.xcscheme | 6 +- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++ Example/Tests/Calls/ReactiveMatchers.swift | 33 ++++---- .../Calls/SwiftyMockReactiveCallsSpec.swift | 1 - SwiftyMock.podspec | 4 +- .../ReactiveCocoa/ReactiveExtensions.swift | 1 - 10 files changed, 106 insertions(+), 98 deletions(-) create mode 100644 Example/SwiftyMock.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Example/Podfile b/Example/Podfile index 78f23ed..932ae18 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -1,4 +1,4 @@ -platform :ios, '9.3' +platform :ios, '11.0' use_frameworks! #inhibit_all_warnings! @@ -8,10 +8,10 @@ end def reuseTestPods reusePods - pod 'Quick', '~> 1.2' + pod 'Quick', '~> 5.0' # using 7.x-branch for now because of this issue fix https://github.com/Quick/Nimble/issues/478 # switch to corresponding version once it's released - pod 'Nimble', :git => 'https://github.com/Quick/Nimble', :branch => '7.x-branch' + pod 'Nimble', '~> 10.0'# :git => 'https://github.com/Quick/Nimble', :branch => '7.x-branch' end target 'SwiftyMock_Example' do diff --git a/Example/Podfile.lock b/Example/Podfile.lock index db50129..af4524a 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,48 +1,37 @@ PODS: - - Nimble (7.1.2) - - Quick (1.3.0) - - ReactiveCocoa (7.1.0): - - ReactiveSwift (~> 3.1) - - ReactiveSwift (3.1.0): - - Result (~> 3.2) - - Result (3.2.4) + - Nimble (10.0.0) + - Quick (5.0.1) + - ReactiveCocoa (12.0.0): + - ReactiveSwift (~> 7.0) + - ReactiveSwift (7.0.0) - SwiftyMock/Core (0.2.3) - SwiftyMock/ReactiveCocoa (0.2.3): - - ReactiveCocoa (~> 7.1) + - ReactiveCocoa - SwiftyMock/Core DEPENDENCIES: - - Nimble (from `https://github.com/Quick/Nimble`, branch `7.x-branch`) - - Quick (~> 1.2) + - Nimble (~> 10.0) + - Quick (~> 5.0) - SwiftyMock/ReactiveCocoa (from `../`) SPEC REPOS: - https://github.com/cocoapods/specs.git: + trunk: + - Nimble - Quick - ReactiveCocoa - ReactiveSwift - - Result EXTERNAL SOURCES: - Nimble: - :branch: 7.x-branch - :git: https://github.com/Quick/Nimble SwiftyMock: :path: "../" -CHECKOUT OPTIONS: - Nimble: - :commit: 773bc7b5b8f3be2ba7ba9d52c6e38936dd393f69 - :git: https://github.com/Quick/Nimble - SPEC CHECKSUMS: - Nimble: c0980a3cf3e9d3b8774ef08167a47bede81cf84f - Quick: 03278013f71aa05fe9ecabc94fbcc6835f1ee76f - ReactiveCocoa: 105ad96f6b8711f1ee7d165fc96587479298053b - ReactiveSwift: 5b26d2e988fe0eed2daf48c4054d1de74db50184 - Result: d2d07204ce72856f1fd9130bbe42c35a7b0fea10 - SwiftyMock: 7ee122cdeb33302fff589ad3400085f464ccd292 + Nimble: 5316ef81a170ce87baf72dd961f22f89a602ff84 + Quick: 749aa754fd1e7d984f2000fe051e18a3a9809179 + ReactiveCocoa: 5d10386f0ce09f922006efbf784881c5fade27c5 + ReactiveSwift: 48c4b9d3b497e8dd20b10300bb1a28ff93550f13 + SwiftyMock: b0de4722bb036b21c5bf20aecc1305642d735e00 -PODFILE CHECKSUM: 96e31c8bbe54905dd223cce795d28a49935d24a1 +PODFILE CHECKSUM: 3789ec95d22b42f00682fcffd45ee166af1904f9 -COCOAPODS: 1.5.3 +COCOAPODS: 1.11.3 diff --git a/Example/SwiftyMock.xcodeproj/project.pbxproj b/Example/SwiftyMock.xcodeproj/project.pbxproj index 23bd88c..1cdf408 100644 --- a/Example/SwiftyMock.xcodeproj/project.pbxproj +++ b/Example/SwiftyMock.xcodeproj/project.pbxproj @@ -57,7 +57,7 @@ 65CB55A6EFAA61CD166E6ABE /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = ""; }; 780C71DD02D492D34BF6DC2F /* Pods-RoboKittenTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RoboKittenTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RoboKittenTests/Pods-RoboKittenTests.debug.xcconfig"; sourceTree = ""; }; 86B1369ECEBF34CBD8BF24A7 /* Pods_SwiftyMock_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SwiftyMock_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 98A466BCCB5D6510F97AD7B2 /* SwiftyMock.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = SwiftyMock.podspec; path = ../SwiftyMock.podspec; sourceTree = ""; }; + 98A466BCCB5D6510F97AD7B2 /* SwiftyMock.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = SwiftyMock.podspec; path = ../SwiftyMock.podspec; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; A380849D11951D85498E493C /* Pods_RoboKittenTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RoboKittenTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; BE3E75F38E5B31874FC7F8C4 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = ""; }; D21AF4611FC62CFF00C0DC5F /* SwiftyMockReactiveCallsSpec.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftyMockReactiveCallsSpec.swift; sourceTree = ""; }; @@ -323,20 +323,21 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0730; - LastUpgradeCheck = 0830; + LastUpgradeCheck = 1400; ORGANIZATIONNAME = CocoaPods; TargetAttributes = { 607FACCF1AFB9204008FA782 = { CreatedOnToolsVersion = 6.3.1; - LastSwiftMigration = 0830; + LastSwiftMigration = ""; + ProvisioningStyle = Manual; }; 607FACE41AFB9204008FA782 = { CreatedOnToolsVersion = 6.3.1; - LastSwiftMigration = 0830; + LastSwiftMigration = ""; }; E481D6821D4DDDBE000E73AE = { CreatedOnToolsVersion = 7.3.1; - LastSwiftMigration = 0830; + LastSwiftMigration = ""; TestTargetID = 607FACCF1AFB9204008FA782; }; }; @@ -346,6 +347,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, Base, ); @@ -413,10 +415,9 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-SwiftyMock_Tests/Pods-SwiftyMock_Tests-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-SwiftyMock_Tests/Pods-SwiftyMock_Tests-frameworks.sh", "${BUILT_PRODUCTS_DIR}/ReactiveCocoa/ReactiveCocoa.framework", "${BUILT_PRODUCTS_DIR}/ReactiveSwift/ReactiveSwift.framework", - "${BUILT_PRODUCTS_DIR}/Result/Result.framework", "${BUILT_PRODUCTS_DIR}/SwiftyMock/SwiftyMock.framework", "${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework", "${BUILT_PRODUCTS_DIR}/Quick/Quick.framework", @@ -425,14 +426,13 @@ outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ReactiveCocoa.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ReactiveSwift.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Result.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyMock.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Nimble.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Quick.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwiftyMock_Tests/Pods-SwiftyMock_Tests-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-SwiftyMock_Tests/Pods-SwiftyMock_Tests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; 58C919E4579AAC652916579F /* [CP] Check Pods Manifest.lock */ = { @@ -459,22 +459,20 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-SwiftyMock_Example/Pods-SwiftyMock_Example-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-SwiftyMock_Example/Pods-SwiftyMock_Example-frameworks.sh", "${BUILT_PRODUCTS_DIR}/ReactiveCocoa/ReactiveCocoa.framework", "${BUILT_PRODUCTS_DIR}/ReactiveSwift/ReactiveSwift.framework", - "${BUILT_PRODUCTS_DIR}/Result/Result.framework", "${BUILT_PRODUCTS_DIR}/SwiftyMock/SwiftyMock.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ReactiveCocoa.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ReactiveSwift.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Result.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyMock.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SwiftyMock_Example/Pods-SwiftyMock_Example-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-SwiftyMock_Example/Pods-SwiftyMock_Example-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; BECACC2C45CF5517A8987EB9 /* [CP] Embed Pods Frameworks */ = { @@ -483,10 +481,9 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-RoboKittenTests/Pods-RoboKittenTests-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-RoboKittenTests/Pods-RoboKittenTests-frameworks.sh", "${BUILT_PRODUCTS_DIR}/ReactiveCocoa/ReactiveCocoa.framework", "${BUILT_PRODUCTS_DIR}/ReactiveSwift/ReactiveSwift.framework", - "${BUILT_PRODUCTS_DIR}/Result/Result.framework", "${BUILT_PRODUCTS_DIR}/SwiftyMock/SwiftyMock.framework", "${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework", "${BUILT_PRODUCTS_DIR}/Quick/Quick.framework", @@ -495,14 +492,13 @@ outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ReactiveCocoa.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ReactiveSwift.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Result.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyMock.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Nimble.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Quick.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RoboKittenTests/Pods-RoboKittenTests-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RoboKittenTests/Pods-RoboKittenTests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; C32EF44E3C05F3402819F3E1 /* [CP] Check Pods Manifest.lock */ = { @@ -596,18 +592,28 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -631,7 +637,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.3; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -643,18 +649,28 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -671,7 +687,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.3; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; @@ -684,12 +700,15 @@ baseConfigurationReference = FC5C9C80564A568114ED28E1 /* Pods-SwiftyMock_Example.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = SwiftyMock/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -698,12 +717,15 @@ baseConfigurationReference = 3E6C27CCCE1CA5F8417EB860 /* Pods-SwiftyMock_Example.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = SwiftyMock/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -723,7 +745,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -739,7 +761,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -751,11 +773,11 @@ CLANG_ANALYZER_NONNULL = YES; DEBUG_INFORMATION_FORMAT = dwarf; INFOPLIST_FILE = RoboKittenTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.3; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.stanfy.RoboKittenTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftyMock_Example.app/SwiftyMock_Example"; }; name = Debug; @@ -767,11 +789,11 @@ BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ANALYZER_NONNULL = YES; INFOPLIST_FILE = RoboKittenTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.3; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.stanfy.RoboKittenTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftyMock_Example.app/SwiftyMock_Example"; }; name = Release; diff --git a/Example/SwiftyMock.xcodeproj/xcshareddata/xcschemes/SwiftyMock-Example.xcscheme b/Example/SwiftyMock.xcodeproj/xcshareddata/xcschemes/SwiftyMock-Example.xcscheme index f3b8ac4..f73e5e7 100644 --- a/Example/SwiftyMock.xcodeproj/xcshareddata/xcschemes/SwiftyMock-Example.xcscheme +++ b/Example/SwiftyMock.xcodeproj/xcshareddata/xcschemes/SwiftyMock-Example.xcscheme @@ -1,6 +1,6 @@ + + + + @@ -63,17 +72,6 @@ - - - - - - - - - - - - + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Example/Tests/Calls/ReactiveMatchers.swift b/Example/Tests/Calls/ReactiveMatchers.swift index 573bc9c..9cf762e 100644 --- a/Example/Tests/Calls/ReactiveMatchers.swift +++ b/Example/Tests/Calls/ReactiveMatchers.swift @@ -9,7 +9,6 @@ import Foundation import Quick import Nimble -import Result import ReactiveSwift // MARK: - Send Value @@ -47,7 +46,7 @@ func sendValue(where predicate: @escaping (V) - return sendValue(where: predicate, expectation: { (actualEvent, actualValue) in .expectedCustomValueTo( "send value to satisfy predicate", - message(forEvent: actualEvent, value: actualValue) + actual: message(forEvent: actualEvent, value: actualValue) ) }) } @@ -56,7 +55,7 @@ func sendValue(_ expectedValue: V) - return sendValue(where: { $0 == expectedValue }, expectation: { (actualEvent, actualValue) in .expectedCustomValueTo( "send value <\(stringify(expectedValue))>", - message(forEvent: actualEvent, value: actualValue) + actual: message(forEvent: actualEvent, value: actualValue) ) }) } @@ -65,7 +64,7 @@ func sendEmptyValue() -> Predicate where T.Valu return sendValue(where: { true }, expectation: { (actualEvent, actualValue) in .expectedCustomValueTo( "send value ", - message(forEvent: actualEvent, value: actualValue) + actual: message(forEvent: actualEvent, value: actualValue) ) }) } @@ -111,7 +110,7 @@ func sendValueAndComplete(where predicate: @esc return sendValueAndComplete(where: predicate, expectation: { (actualEvent, actualValue) in .expectedCustomValueTo( "send value to satisfy predicate and complete", - message(forEvent: actualEvent, value: actualValue) + actual: message(forEvent: actualEvent, value: actualValue) ) }) } @@ -120,7 +119,7 @@ func sendValueAndComplete(_ expected return sendValue(where: { $0 == expectedValue }, expectation: { (actualEvent, actualValue) in .expectedCustomValueTo( "send value <\(stringify(expectedValue))> and complete", - message(forEvent: actualEvent, value: actualValue) + actual: message(forEvent: actualEvent, value: actualValue) ) }) } @@ -129,7 +128,7 @@ func sendEmptyValueAndComplete() -> Predicate w return sendValue(where: { true }, expectation: { (actualEvent, actualValue) in .expectedCustomValueTo( "send value and complete", - message(forEvent: actualEvent, value: actualValue) + actual: message(forEvent: actualEvent, value: actualValue) ) }) } @@ -149,7 +148,7 @@ func complete() -> Predicate where T.Valu } return PredicateResult( bool: completed, - message: .expectedCustomValueTo("complete", message(forEvent: actualEvent)) + message: .expectedCustomValueTo("complete", actual: message(forEvent: actualEvent)) ) } } @@ -189,7 +188,7 @@ func fail(where predicate: @escaping (E) -> Boo return fail(where: predicate, expectation: { (actualEvent, actualError) in .expectedCustomValueTo( "send error to satisfy predicate", - message(forEvent: actualEvent, error: actualError) + actual: message(forEvent: actualEvent, error: actualError) ) }) } @@ -198,25 +197,25 @@ func fail(with expectedError: E) -> Predicate", - message(forEvent: actualEvent, error: actualError) + actual: message(forEvent: actualEvent, error: actualError) ) }) } func fail(with expectedError: E) -> Predicate where T.Error == E { return fail(where: { $0 == expectedError }, expectation: { (actualEvent, actualError) in - .expectedCustomValueTo( - "send error <\(stringify(expectedError))>", - message(forEvent: actualEvent, error: actualError) - ) + .expectedCustomValueTo( + "send error <\(stringify(expectedError))>", + actual: message(forEvent: actualEvent, error: actualError) + ) }) } -func failWithNoError() -> Predicate where T.Error == NoError { +func failWithNoError() -> Predicate where T.Error == Never { return fail(where: { _ in true }, expectation: { (actualEvent, actualError) in .expectedCustomValueTo( "send error ", - message(forEvent: actualEvent, error: actualError) + actual: message(forEvent: actualEvent, error: actualError) ) }) } @@ -236,7 +235,7 @@ func interrupt() -> Predicate where T.Val } return PredicateResult( bool: interrupted, - message: .expectedCustomValueTo("interrupt", message(forEvent: actualEvent)) + message: .expectedCustomValueTo("interrupt", actual: message(forEvent: actualEvent)) ) } } diff --git a/Example/Tests/Calls/SwiftyMockReactiveCallsSpec.swift b/Example/Tests/Calls/SwiftyMockReactiveCallsSpec.swift index d161e3f..89a8e39 100644 --- a/Example/Tests/Calls/SwiftyMockReactiveCallsSpec.swift +++ b/Example/Tests/Calls/SwiftyMockReactiveCallsSpec.swift @@ -10,7 +10,6 @@ import Foundation import Quick import Nimble import ReactiveSwift -import Result @testable import SwiftyMock protocol ReactiveCalculator { diff --git a/SwiftyMock.podspec b/SwiftyMock.podspec index 40908ab..6529f59 100644 --- a/SwiftyMock.podspec +++ b/SwiftyMock.podspec @@ -12,7 +12,7 @@ Pod::Spec.new do |s| s.author = { 'Stanfy' => 'hello@stanfy.com' } s.source = { :git => 'https://github.com/Stanfy/SwiftyMock.git', :tag => s.version.to_s } - s.ios.deployment_target = '8.0' + s.ios.deployment_target = '11.0' s.default_subspec = 'Core' @@ -22,7 +22,7 @@ Pod::Spec.new do |s| s.subspec 'ReactiveCocoa' do |rs| rs.dependency 'SwiftyMock/Core' - rs.dependency 'ReactiveCocoa', '~> 7.1' + rs.dependency 'ReactiveCocoa'#, '~> 7.1' rs.source_files = 'SwiftyMock/Classes/ReactiveCocoa/**/*' end diff --git a/SwiftyMock/Classes/ReactiveCocoa/ReactiveExtensions.swift b/SwiftyMock/Classes/ReactiveCocoa/ReactiveExtensions.swift index 5ac3479..fa9c6ef 100644 --- a/SwiftyMock/Classes/ReactiveCocoa/ReactiveExtensions.swift +++ b/SwiftyMock/Classes/ReactiveCocoa/ReactiveExtensions.swift @@ -6,7 +6,6 @@ // MARK: Reactive Function Call Mock/Stub/Spy import ReactiveSwift -import Result // MARK: - Reactive Call Mock/Stub/Spy