Skip to content

Commit

Permalink
Merge pull request #61 from ReactiveCocoa/cartfile-reactiveswift-6.1
Browse files Browse the repository at this point in the history
Explicitly require ReactiveSwift 6.1 in Cartfile
  • Loading branch information
ikesyo authored Sep 7, 2019
2 parents f9a1c12 + cdbdf4d commit 5f4b66e
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 31 deletions.
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "ReactiveCocoa/ReactiveObjC" ~> 3.1.1
github "ReactiveCocoa/ReactiveSwift" ~> 6.0.0
github "ReactiveCocoa/ReactiveSwift" ~> 6.1
4 changes: 2 additions & 2 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github "Quick/Nimble" "v8.0.1"
github "Quick/Nimble" "v8.0.2"
github "Quick/Quick" "v2.1.0"
github "ReactiveCocoa/ReactiveObjC" "3.1.1"
github "ReactiveCocoa/ReactiveSwift" "6.1.0"
github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"
github "jspahrsummers/xcconfigs" "d0f8992afad45262cfe3a3cf512e7127fdcf296c"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Nimble
Submodule Nimble updated 44 files
+1 −1 .hound.yml
+39 −34 .travis.yml
+1 −1 Gemfile
+14 −14 Gemfile.lock
+6 −2 Nimble.podspec
+24 −11 Nimble.xcodeproj/project.pbxproj
+1 −1 Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-iOS.xcscheme
+1 −1 Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-macOS.xcscheme
+1 −1 Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-tvOS.xcscheme
+5 −2 Package.swift
+21 −0 [email protected]
+23 −0 README.md
+18 −18 Sources/Nimble/Adapters/NMBExpectation.swift
+2 −2 Sources/Nimble/Expression.swift
+10 −6 Sources/Nimble/Matchers/BeCloseTo.swift
+6 −4 Sources/Nimble/Matchers/BeGreaterThan.swift
+6 −4 Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift
+2 −11 Sources/Nimble/Matchers/BeIdenticalTo.swift
+6 −4 Sources/Nimble/Matchers/BeLessThan.swift
+6 −4 Sources/Nimble/Matchers/BeLessThanOrEqual.swift
+5 −3 Sources/Nimble/Matchers/MatcherProtocols.swift
+42 −13 Sources/Nimble/Matchers/PostNotification.swift
+13 −10 Sources/Nimble/Matchers/RaisesException.swift
+6 −0 Sources/Nimble/Matchers/SatisfyAllOf.swift
+6 −0 Sources/Nimble/Matchers/SatisfyAnyOf.swift
+1 −5 Sources/Nimble/Utils/Await.swift
+2 −13 Sources/Nimble/Utils/Stringers.swift
+1 −1 Tests/NimbleTests/Helpers/utils.swift
+2 −2 Tests/NimbleTests/Matchers/BeAKindOfTest.swift
+1 −1 Tests/NimbleTests/Matchers/BeAnInstanceOfTest.swift
+3 −3 Tests/NimbleTests/Matchers/BeEmptyTest.swift
+0 −2 Tests/NimbleTests/Matchers/BeGreaterThanOrEqualToTest.swift
+1 −1 Tests/NimbleTests/Matchers/BeIdenticalToTest.swift
+0 −2 Tests/NimbleTests/Matchers/BeLessThanOrEqualToTest.swift
+0 −2 Tests/NimbleTests/Matchers/BeginWithTest.swift
+1 −1 Tests/NimbleTests/Matchers/ContainTest.swift
+0 −2 Tests/NimbleTests/Matchers/EndWithTest.swift
+1 −11 Tests/NimbleTests/Matchers/EqualTest.swift
+2 −2 Tests/NimbleTests/Matchers/MatchErrorTest.swift
+7 −11 Tests/NimbleTests/Matchers/PostNotificationTest.swift
+1 −1 Tests/NimbleTests/Matchers/RaisesExceptionTest.swift
+1 −1 Tests/NimbleTests/Matchers/ThrowAssertionTest.swift
+1 −1 script/release
+5 −5 test
2 changes: 1 addition & 1 deletion Carthage/Checkouts/xcconfigs
58 changes: 32 additions & 26 deletions ReactiveObjCBridge.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,12 @@
BEA5E5E21D864DED00A1F0F2 /* ReactiveObjC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ReactiveObjC.framework; path = "build/Debug-appletvos/ReactiveObjC.framework"; sourceTree = "<group>"; };
BEA5E5E41D864DF400A1F0F2 /* ReactiveObjC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ReactiveObjC.framework; path = "build/Debug-appletvos/ReactiveObjC.framework"; sourceTree = "<group>"; };
BEA5E5E61D864E7200A1F0F2 /* TestError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestError.swift; sourceTree = "<group>"; };
CD8D21C12322E4BE00C3996F /* macOS-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-Application.xcconfig"; sourceTree = "<group>"; };
CD8D21C22322E4BE00C3996F /* macOS-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-Framework.xcconfig"; sourceTree = "<group>"; };
CD8D21C32322E4BE00C3996F /* macOS-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
CD8D21C42322E4BE00C3996F /* macOS-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-Base.xcconfig"; sourceTree = "<group>"; };
CD8D21C52322E4BE00C3996F /* macOS-XCTest.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-XCTest.xcconfig"; sourceTree = "<group>"; };
CD8D21C62322E4BE00C3996F /* macOS-DynamicLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "macOS-DynamicLibrary.xcconfig"; sourceTree = "<group>"; };
CDC42E2E1AE7AB8B00965373 /* Result.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Result.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D037672B19EDA75D00A782A9 /* Quick.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Quick.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D04725EA19E49ED7006002AA /* ReactiveObjCBridge.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ReactiveObjCBridge.framework; sourceTree = BUILT_PRODUCTS_DIR; };
Expand All @@ -163,11 +169,6 @@
D047263319E49FE8006002AA /* iOS-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-Base.xcconfig"; sourceTree = "<group>"; };
D047263419E49FE8006002AA /* iOS-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-Framework.xcconfig"; sourceTree = "<group>"; };
D047263519E49FE8006002AA /* iOS-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "iOS-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
D047263719E49FE8006002AA /* Mac-Application.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Application.xcconfig"; sourceTree = "<group>"; };
D047263819E49FE8006002AA /* Mac-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Base.xcconfig"; sourceTree = "<group>"; };
D047263919E49FE8006002AA /* Mac-DynamicLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-DynamicLibrary.xcconfig"; sourceTree = "<group>"; };
D047263A19E49FE8006002AA /* Mac-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-Framework.xcconfig"; sourceTree = "<group>"; };
D047263B19E49FE8006002AA /* Mac-StaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Mac-StaticLibrary.xcconfig"; sourceTree = "<group>"; };
D047263C19E49FE8006002AA /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
D05E662419EDD82000904ACA /* Nimble.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Nimble.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D0A226101A72F30B00D33B74 /* ObjectiveCBridgingSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = ObjectiveCBridgingSpec.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
Expand Down Expand Up @@ -293,6 +294,19 @@
name = Frameworks;
sourceTree = "<group>";
};
CD8D21C02322E4BE00C3996F /* macOS */ = {
isa = PBXGroup;
children = (
CD8D21C12322E4BE00C3996F /* macOS-Application.xcconfig */,
CD8D21C22322E4BE00C3996F /* macOS-Framework.xcconfig */,
CD8D21C32322E4BE00C3996F /* macOS-StaticLibrary.xcconfig */,
CD8D21C42322E4BE00C3996F /* macOS-Base.xcconfig */,
CD8D21C52322E4BE00C3996F /* macOS-XCTest.xcconfig */,
CD8D21C62322E4BE00C3996F /* macOS-DynamicLibrary.xcconfig */,
);
path = macOS;
sourceTree = "<group>";
};
D04725E019E49ED7006002AA = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -365,7 +379,7 @@
children = (
D047262619E49FE8006002AA /* Base */,
D047263119E49FE8006002AA /* iOS */,
D047263619E49FE8006002AA /* Mac OS X */,
CD8D21C02322E4BE00C3996F /* macOS */,
A97451321B3A935E00F48E55 /* watchOS */,
57A4D2431BA13F9700F7D4B1 /* tvOS */,
D047263C19E49FE8006002AA /* README.md */,
Expand Down Expand Up @@ -416,18 +430,6 @@
path = iOS;
sourceTree = "<group>";
};
D047263619E49FE8006002AA /* Mac OS X */ = {
isa = PBXGroup;
children = (
D047263719E49FE8006002AA /* Mac-Application.xcconfig */,
D047263819E49FE8006002AA /* Mac-Base.xcconfig */,
D047263919E49FE8006002AA /* Mac-DynamicLibrary.xcconfig */,
D047263A19E49FE8006002AA /* Mac-Framework.xcconfig */,
D047263B19E49FE8006002AA /* Mac-StaticLibrary.xcconfig */,
);
path = "Mac OS X";
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
Expand Down Expand Up @@ -1038,6 +1040,7 @@
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CODE_SIGNING_REQUIRED = NO;
Expand All @@ -1063,6 +1066,7 @@
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CODE_SIGNING_REQUIRED = NO;
Expand All @@ -1083,7 +1087,7 @@
};
D047260119E49ED7006002AA /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = D047263A19E49FE8006002AA /* Mac-Framework.xcconfig */;
baseConfigurationReference = CD8D21C22322E4BE00C3996F /* macOS-Framework.xcconfig */;
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
Expand All @@ -1100,7 +1104,7 @@
};
D047260219E49ED7006002AA /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = D047263A19E49FE8006002AA /* Mac-Framework.xcconfig */;
baseConfigurationReference = CD8D21C22322E4BE00C3996F /* macOS-Framework.xcconfig */;
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
Expand All @@ -1117,7 +1121,7 @@
};
D047260419E49ED7006002AA /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = D047263719E49FE8006002AA /* Mac-Application.xcconfig */;
baseConfigurationReference = CD8D21C12322E4BE00C3996F /* macOS-Application.xcconfig */;
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(DEVELOPER_FRAMEWORKS_DIR)",
Expand All @@ -1133,7 +1137,7 @@
};
D047260519E49ED7006002AA /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = D047263719E49FE8006002AA /* Mac-Application.xcconfig */;
baseConfigurationReference = CD8D21C12322E4BE00C3996F /* macOS-Application.xcconfig */;
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(DEVELOPER_FRAMEWORKS_DIR)",
Expand Down Expand Up @@ -1219,6 +1223,7 @@
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CODE_SIGNING_REQUIRED = NO;
Expand All @@ -1237,7 +1242,7 @@
};
D047263E19E4A008006002AA /* Profile */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = D047263A19E49FE8006002AA /* Mac-Framework.xcconfig */;
baseConfigurationReference = CD8D21C22322E4BE00C3996F /* macOS-Framework.xcconfig */;
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
Expand All @@ -1254,7 +1259,7 @@
};
D047263F19E4A008006002AA /* Profile */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = D047263719E49FE8006002AA /* Mac-Application.xcconfig */;
baseConfigurationReference = CD8D21C12322E4BE00C3996F /* macOS-Application.xcconfig */;
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(DEVELOPER_FRAMEWORKS_DIR)",
Expand Down Expand Up @@ -1308,6 +1313,7 @@
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CODE_SIGNING_REQUIRED = NO;
Expand All @@ -1326,7 +1332,7 @@
};
D047264319E4A00B006002AA /* Test */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = D047263A19E49FE8006002AA /* Mac-Framework.xcconfig */;
baseConfigurationReference = CD8D21C22322E4BE00C3996F /* macOS-Framework.xcconfig */;
buildSettings = {
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
Expand All @@ -1343,7 +1349,7 @@
};
D047264419E4A00B006002AA /* Test */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = D047263719E49FE8006002AA /* Mac-Application.xcconfig */;
baseConfigurationReference = CD8D21C12322E4BE00C3996F /* macOS-Application.xcconfig */;
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(DEVELOPER_FRAMEWORKS_DIR)",
Expand Down

0 comments on commit 5f4b66e

Please sign in to comment.