Skip to content

Commit

Permalink
Update depenencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@jakubvano
jakubvano committed Mar 29, 2019
1 parent 92e5d3c commit 3ee7332
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 43 deletions.
6 changes: 3 additions & 3 deletions Cartfile.resolved
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github "Quick/Nimble" "v7.3.3"
github "Quick/Quick" "v1.3.4"
github "Swinject/Swinject" "2.5.0"
github "Quick/Nimble" "v8.0.1"
github "Quick/Quick" "v2.0.0"
github "Swinject/Swinject" "2.6.0"
github "jspahrsummers/xcconfigs" "0.12"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Nimble
Submodule Nimble updated 97 files
+1 −1 .swift-version
+16 −4 .swiftlint.yml
+24 −53 .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 [email protected]
+7 −22 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
+10 −4 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
+8 −8 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
+42 −114 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
+5 −0 Tests/NimbleTests/objc/ObjCAsyncTest.m
+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 48 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
+6 −6 Quick.xcodeproj/project.pbxproj
+8 −0 Quick.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+3 −1 README.md
+9 −6 Rakefile
+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/Swinject
Submodule Swinject updated 11 files
+16 −2 .travis.yml
+2 −2 Cartfile.private
+2 −2 Cartfile.resolved
+1 −0 README.md
+1 −1 Sources/Container.Logging.swift
+3 −1 Sources/GraphIdentifier.swift
+1 −1 Sources/Info.plist
+5 −5 Sources/ServiceKey.swift
+1 −1 Swinject.podspec
+2 −10 Swinject.xcodeproj/project.pbxproj
+1 −1 Tests/SwinjectTests/Info.plist
67 changes: 30 additions & 37 deletions SwinjectPropertyLoader.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -678,17 +678,17 @@
isa = PBXGroup;
children = (
98D563911CDB28CE00DECDC0 /* Quick.framework */,
98D563931CDB28CE00DECDC0 /* Quick-macOSTests.xctest */,
98D563951CDB28CE00DECDC0 /* QuickFocused-macOSTests.xctest */,
8FAB6A471E2C44CF005E52F1 /* QuickAfterSuite-macOSTests.xctest */,
98D563931CDB28CE00DECDC0 /* Quick - macOSTests.xctest */,
98D563951CDB28CE00DECDC0 /* QuickFocused - macOSTests.xctest */,
8FAB6A471E2C44CF005E52F1 /* QuickAfterSuite - macOSTests.xctest */,
98D563971CDB28CE00DECDC0 /* Quick.framework */,
98D563991CDB28CE00DECDC0 /* Quick-iOSTests.xctest */,
98D5639B1CDB28CE00DECDC0 /* QuickFocused-iOSTests.xctest */,
8FAB6A491E2C44CF005E52F1 /* QuickAfterSuite-iOSTests.xctest */,
98D563991CDB28CE00DECDC0 /* Quick - iOSTests.xctest */,
98D5639B1CDB28CE00DECDC0 /* QuickFocused - iOSTests.xctest */,
8FAB6A491E2C44CF005E52F1 /* QuickAfterSuite - iOSTests.xctest */,
98D5639D1CDB28CE00DECDC0 /* Quick.framework */,
98D5639F1CDB28CE00DECDC0 /* Quick-tvOSTests.xctest */,
98D563A11CDB28CE00DECDC0 /* QuickFocused-tvOSTests.xctest */,
8FAB6A4B1E2C44CF005E52F1 /* QuickAfterSuite-tvOSTests.xctest */,
98D5639F1CDB28CE00DECDC0 /* Quick - tvOSTests.xctest */,
98D563A11CDB28CE00DECDC0 /* QuickFocused - tvOSTests.xctest */,
8FAB6A4B1E2C44CF005E52F1 /* QuickAfterSuite - tvOSTests.xctest */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -908,6 +908,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
);
mainGroup = 985903FC1CDB0AA700275E4A;
Expand Down Expand Up @@ -941,24 +942,24 @@
/* End PBXProject section */

/* Begin PBXReferenceProxy section */
8FAB6A471E2C44CF005E52F1 /* QuickAfterSuite-macOSTests.xctest */ = {
8FAB6A471E2C44CF005E52F1 /* QuickAfterSuite - macOSTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "QuickAfterSuite-macOSTests.xctest";
path = "QuickAfterSuite - macOSTests.xctest";
remoteRef = 8FAB6A461E2C44CF005E52F1 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
8FAB6A491E2C44CF005E52F1 /* QuickAfterSuite-iOSTests.xctest */ = {
8FAB6A491E2C44CF005E52F1 /* QuickAfterSuite - iOSTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "QuickAfterSuite-iOSTests.xctest";
path = "QuickAfterSuite - iOSTests.xctest";
remoteRef = 8FAB6A481E2C44CF005E52F1 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
8FAB6A4B1E2C44CF005E52F1 /* QuickAfterSuite-tvOSTests.xctest */ = {
8FAB6A4B1E2C44CF005E52F1 /* QuickAfterSuite - tvOSTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "QuickAfterSuite-tvOSTests.xctest";
path = "QuickAfterSuite - tvOSTests.xctest";
remoteRef = 8FAB6A4A1E2C44CF005E52F1 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
Expand Down Expand Up @@ -1060,17 +1061,17 @@
remoteRef = 98D563901CDB28CE00DECDC0 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
98D563931CDB28CE00DECDC0 /* Quick-macOSTests.xctest */ = {
98D563931CDB28CE00DECDC0 /* Quick - macOSTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "Quick-macOSTests.xctest";
path = "Quick - macOSTests.xctest";
remoteRef = 98D563921CDB28CE00DECDC0 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
98D563951CDB28CE00DECDC0 /* QuickFocused-macOSTests.xctest */ = {
98D563951CDB28CE00DECDC0 /* QuickFocused - macOSTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "QuickFocused-macOSTests.xctest";
path = "QuickFocused - macOSTests.xctest";
remoteRef = 98D563941CDB28CE00DECDC0 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
Expand All @@ -1081,17 +1082,17 @@
remoteRef = 98D563961CDB28CE00DECDC0 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
98D563991CDB28CE00DECDC0 /* Quick-iOSTests.xctest */ = {
98D563991CDB28CE00DECDC0 /* Quick - iOSTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "Quick-iOSTests.xctest";
path = "Quick - iOSTests.xctest";
remoteRef = 98D563981CDB28CE00DECDC0 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
98D5639B1CDB28CE00DECDC0 /* QuickFocused-iOSTests.xctest */ = {
98D5639B1CDB28CE00DECDC0 /* QuickFocused - iOSTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "QuickFocused-iOSTests.xctest";
path = "QuickFocused - iOSTests.xctest";
remoteRef = 98D5639A1CDB28CE00DECDC0 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
Expand All @@ -1102,17 +1103,17 @@
remoteRef = 98D5639C1CDB28CE00DECDC0 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
98D5639F1CDB28CE00DECDC0 /* Quick-tvOSTests.xctest */ = {
98D5639F1CDB28CE00DECDC0 /* Quick - tvOSTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "Quick-tvOSTests.xctest";
path = "Quick - tvOSTests.xctest";
remoteRef = 98D5639E1CDB28CE00DECDC0 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
98D563A11CDB28CE00DECDC0 /* QuickFocused-tvOSTests.xctest */ = {
98D563A11CDB28CE00DECDC0 /* QuickFocused - tvOSTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "QuickFocused-tvOSTests.xctest";
path = "QuickFocused - tvOSTests.xctest";
remoteRef = 98D563A01CDB28CE00DECDC0 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
Expand Down Expand Up @@ -1363,7 +1364,6 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.el-eleven.SwinjectPropertyLoader";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = 4;
};
name = Debug;
Expand All @@ -1379,7 +1379,6 @@
INFOPLIST_FILE = Sources/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.el-eleven.SwinjectPropertyLoader";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = 4;
};
name = Release;
Expand All @@ -1394,7 +1393,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = YES;
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
TVOS_DEPLOYMENT_TARGET = 9.0;
VERSIONING_SYSTEM = "apple-generic";
Expand All @@ -1412,7 +1411,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = NO;
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
TVOS_DEPLOYMENT_TARGET = 9.0;
VERSIONING_SYSTEM = "apple-generic";
Expand Down Expand Up @@ -1457,7 +1456,6 @@
INFOPLIST_FILE = Tests/Info.plist;
PRODUCT_BUNDLE_IDENTIFIER = "com.el-eleven.SwinjectPropertyLoaderTests";
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -1468,7 +1466,6 @@
INFOPLIST_FILE = Tests/Info.plist;
PRODUCT_BUNDLE_IDENTIFIER = "com.el-eleven.SwinjectPropertyLoaderTests";
PRODUCT_NAME = "$(PROJECT_NAME)Tests";
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand All @@ -1484,7 +1481,6 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.el-eleven.SwinjectPropertyLoader";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -1499,7 +1495,6 @@
INFOPLIST_FILE = Sources/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.el-eleven.SwinjectPropertyLoader";
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand Down Expand Up @@ -1535,7 +1530,6 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.el-eleven.SwinjectPropertyLoader";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = 3;
};
name = Debug;
Expand All @@ -1551,7 +1545,6 @@
INFOPLIST_FILE = Sources/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.el-eleven.SwinjectPropertyLoader";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = 3;
};
name = Release;
Expand Down

0 comments on commit 3ee7332

Please sign in to comment.