Merge pull request #289 from octokit/update-dependencies

Update dependencies
octokit · Feb 18, 2016 · 1287f62 · 1287f62
2 parents ee557d8 + 70957fc
commit 1287f62
Show file tree

Hide file tree

Showing 33 changed files with 64 additions and 64 deletions.
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,3 +1,3 @@
 github "jspahrsummers/xcconfigs" >= 0.8.1
-github "Quick/Quick" ~> 0.6
-github "Quick/Nimble" ~> 2.0
+github "Quick/Quick" ~> 0.9
+github "Quick/Nimble" ~> 3.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,5 +1,5 @@
-github "Mantle/Mantle" "1.5.5"
-github "Quick/Nimble" "v2.0.0"
-github "Quick/Quick" "v0.6.0"
+github "Mantle/Mantle" "1.5.6"
+github "Quick/Nimble" "v3.1.0"
+github "Quick/Quick" "v0.9.1"
 github "ReactiveCocoa/ReactiveCocoa" "v2.5"
-github "jspahrsummers/xcconfigs" "0.8.1"
+github "jspahrsummers/xcconfigs" "0.9"
diff --git a/Carthage/Checkouts/Mantle b/Carthage/Checkouts/Mantle
diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble
diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick
diff --git a/Carthage/Checkouts/xcconfigs b/Carthage/Checkouts/xcconfigs
diff --git a/OctoKitTests/NSDateFormatterAdditionsSpec.m b/OctoKitTests/NSDateFormatterAdditionsSpec.m
@@ -6,9 +6,9 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //
 
-#import <Nimble/Nimble.h>
 #import <OctoKit/OctoKit.h>
-#import <Quick/Quick.h>
+@import Nimble;
+@import Quick;
 
 QuickSpecBegin(NSDateFormatterAdditions)
 

diff --git a/OctoKitTests/NSURLAdditionsSpec.m b/OctoKitTests/NSURLAdditionsSpec.m
@@ -6,9 +6,9 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //
 
-#import <Nimble/Nimble.h>
 #import <OctoKit/OctoKit.h>
-#import <Quick/Quick.h>
+@import Nimble;
+@import Quick;
 
 QuickSpecBegin(NSURLAdditions)
 

diff --git a/OctoKitTests/NSValueTransformerAdditionsSpec.m b/OctoKitTests/NSValueTransformerAdditionsSpec.m
@@ -6,9 +6,9 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //
 
-#import <Nimble/Nimble.h>
 #import <OctoKit/OctoKit.h>
-#import <Quick/Quick.h>
+@import Nimble;
+@import Quick;
 
 QuickSpecBegin(NSValueTransformerAdditions)
 

diff --git a/OctoKitTests/OCTAuthorizationSpec.m b/OctoKitTests/OCTAuthorizationSpec.m
@@ -6,9 +6,9 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //
 
-#import <Nimble/Nimble.h>
 #import <OctoKit/OctoKit.h>
-#import <Quick/Quick.h>
+@import Nimble;
+@import Quick;
 
 #import "OCTObjectSpec.h"
 

diff --git a/OctoKitTests/OCTBranchSpec.m b/OctoKitTests/OCTBranchSpec.m
@@ -6,9 +6,9 @@
 //  Copyright (c) 2014 GitHub. All rights reserved.
 //
 
-#import <Nimble/Nimble.h>
 #import <OctoKit/OctoKit.h>
-#import <Quick/Quick.h>
+@import Nimble;
+@import Quick;
 
 #import "OCTObject+Private.h"
 

diff --git a/OctoKitTests/OCTClientSpec.m b/OctoKitTests/OCTClientSpec.m
@@ -7,10 +7,10 @@
 //
 
 #import <ISO8601DateFormatter/ISO8601DateFormatter.h>
-#import <Nimble/Nimble.h>
 #import <OctoKit/OctoKit.h>
 #import <OHHTTPStubs/OHHTTPStubs.h>
-#import <Quick/Quick.h>
+@import Nimble;
+@import Quick;
 
 #import "OCTTestClient.h"
 

diff --git a/OctoKitTests/OCTCommitCommentSpec.m b/OctoKitTests/OCTCommitCommentSpec.m
@@ -7,9 +7,9 @@
 //
 
 #import <ISO8601DateFormatter/ISO8601DateFormatter.h>
-#import <Nimble/Nimble.h>
 #import <OctoKit/OctoKit.h>
-#import <Quick/Quick.h>
+@import Nimble;
+@import Quick;
 
 #import "OCTObjectSpec.h"
 

diff --git a/OctoKitTests/OCTCommitSpec.m b/OctoKitTests/OCTCommitSpec.m
@@ -6,9 +6,9 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //
 
-#import <Nimble/Nimble.h>
 #import <OctoKit/OctoKit.h>
-#import <Quick/Quick.h>
+@import Nimble;
+@import Quick;
 
 #import "OCTObjectSpec.h"
 

diff --git a/OctoKitTests/OCTContentSpec.m b/OctoKitTests/OCTContentSpec.m
@@ -6,9 +6,9 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //
 
-#import <Nimble/Nimble.h>
 #import <OctoKit/OctoKit.h>
-#import <Quick/Quick.h>
+@import Nimble;
+@import Quick;
 
 #import "OCTObjectSpec.h"
 

diff --git a/OctoKitTests/OCTEventSpec.m b/OctoKitTests/OCTEventSpec.m
@@ -7,9 +7,9 @@
 //
 
 #import <ISO8601DateFormatter/ISO8601DateFormatter.h>
-#import <Nimble/Nimble.h>
 #import <OctoKit/OctoKit.h>
-#import <Quick/Quick.h>
+@import Nimble;
+@import Quick;
 
 #import "OCTObjectSpec.h"
 

diff --git a/OctoKitTests/OCTGistEditSpec.m b/OctoKitTests/OCTGistEditSpec.m
@@ -5,9 +5,9 @@
 //  Created by Chris Lundie on 2014-03-07.
 //
 
-#import <Nimble/Nimble.h>
 #import <OctoKit/OctoKit.h>
-#import <Quick/Quick.h>
+@import Nimble;
+@import Quick;
 
 #import "OCTObjectSpec.h"
 

diff --git a/OctoKitTests/OCTGistSpec.m b/OctoKitTests/OCTGistSpec.m
@@ -7,9 +7,9 @@
 //
 
 #import <ISO8601DateFormatter/ISO8601DateFormatter.h>
-#import <Nimble/Nimble.h>
 #import <OctoKit/OctoKit.h>
-#import <Quick/Quick.h>
+@import Nimble;
+@import Quick;
 
 #import "OCTObjectSpec.h"
 

diff --git a/OctoKitTests/OCTGitCommitFileSpec.m b/OctoKitTests/OCTGitCommitFileSpec.m
@@ -3,9 +3,9 @@
 // Copyright (c) 2014 GitHub. All rights reserved.
 //
 
-#import <Nimble/Nimble.h>
 #import <OctoKit/OctoKit.h>
-#import <Quick/Quick.h>
+@import Nimble;
+@import Quick;
 
 QuickSpecBegin(OCTGitCommitFileSpec)
 

diff --git a/OctoKitTests/OCTGitCommitSpec.m b/OctoKitTests/OCTGitCommitSpec.m
@@ -6,9 +6,9 @@
 //  Copyright (c) 2014 GitHub. All rights reserved.
 //
 
-#import <Nimble/Nimble.h>
 #import <OctoKit/OctoKit.h>
-#import <Quick/Quick.h>
+@import Nimble;
+@import Quick;
 
 QuickSpecBegin(OCTGitCommitSpec)
 

diff --git a/OctoKitTests/OCTIssueCommentSpec.m b/OctoKitTests/OCTIssueCommentSpec.m
@@ -7,9 +7,9 @@
 //
 
 #import <ISO8601DateFormatter/ISO8601DateFormatter.h>
-#import <Nimble/Nimble.h>
 #import <OctoKit/OctoKit.h>
-#import <Quick/Quick.h>
+@import Nimble;
+@import Quick;
 
 #import "OCTObjectSpec.h"
 

diff --git a/OctoKitTests/OCTIssueSpec.m b/OctoKitTests/OCTIssueSpec.m
@@ -7,8 +7,8 @@
 //
 
 #import <OctoKit/OctoKit.h>
-#import <Quick/Quick.h>
-#import <Nimble/Nimble.h>
+@import Quick;
+@import Nimble;
 
 #import "OCTObjectSpec.h"
 

diff --git a/OctoKitTests/OCTObjectSpec.m b/OctoKitTests/OCTObjectSpec.m
@@ -6,9 +6,9 @@
 //  Copyright (c) 2012 GitHub. All rights reserved.
 //
 
-#import <Nimble/Nimble.h>
-#import <Quick/Quick.h>
 #import <OctoKit/OctoKit.h>
+@import Nimble;
+@import Quick;
 
 #import "OCTObject+Private.h"
 #import "OCTObjectSpec.h"

diff --git a/OctoKitTests/OCTOrganizationSpec.m b/OctoKitTests/OCTOrganizationSpec.m
@@ -6,9 +6,9 @@
 //  Copyright (c) 2012 GitHub. All rights reserved.
 //
 
-#import <Nimble/Nimble.h>
 #import <OctoKit/OctoKit.h>
-#import <Quick/Quick.h>
+@import Nimble;
+@import Quick;
 
 #import "OCTObjectSpec.h"
 

diff --git a/OctoKitTests/OCTPullRequestCommentSpec.m b/OctoKitTests/OCTPullRequestCommentSpec.m
@@ -7,9 +7,9 @@
 //
 
 #import <ISO8601DateFormatter/ISO8601DateFormatter.h>
-#import <Nimble/Nimble.h>
 #import <OctoKit/OctoKit.h>
-#import <Quick/Quick.h>
+@import Nimble;
+@import Quick;
 
 #import "OCTObjectSpec.h"
 

diff --git a/OctoKitTests/OCTPullRequestSpec.m b/OctoKitTests/OCTPullRequestSpec.m
@@ -7,9 +7,9 @@
 //
 
 #import <ISO8601DateFormatter/ISO8601DateFormatter.h>
-#import <Nimble/Nimble.h>
 #import <OctoKit/OctoKit.h>
-#import <Quick/Quick.h>
+@import Nimble;
+@import Quick;
 
 #import "OCTObjectSpec.h"
 #import "OCTObject+Private.h"

diff --git a/OctoKitTests/OCTRefSpec.m b/OctoKitTests/OCTRefSpec.m
@@ -6,9 +6,9 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //
 
-#import <Nimble/Nimble.h>
 #import <OctoKit/OctoKit.h>
-#import <Quick/Quick.h>
+@import Nimble;
+@import Quick;
 
 #import "OCTObjectSpec.h"
 

diff --git a/OctoKitTests/OCTRepositorySpec.m b/OctoKitTests/OCTRepositorySpec.m
@@ -7,9 +7,9 @@
 //
 
 #import <ISO8601DateFormatter/ISO8601DateFormatter.h>
-#import <Nimble/Nimble.h>
 #import <OctoKit/OctoKit.h>
-#import <Quick/Quick.h>
+@import Nimble;
+@import Quick;
 
 #import "OCTObjectSpec.h"
 #import "OCTObject+Private.h"

diff --git a/OctoKitTests/OCTResponseSpec.m b/OctoKitTests/OCTResponseSpec.m
@@ -6,9 +6,9 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //
 
-#import <Nimble/Nimble.h>
 #import <OctoKit/OctoKit.h>
-#import <Quick/Quick.h>
+@import Nimble;
+@import Quick;
 
 NSString *etag = @"\"644b5b0155e6404a9cc4bd9d8b1ae730\"";
 

diff --git a/OctoKitTests/OCTServerSpec.m b/OctoKitTests/OCTServerSpec.m
@@ -6,9 +6,9 @@
 //  Copyright (c) 2012 GitHub. All rights reserved.
 //
 
-#import <Nimble/Nimble.h>
 #import <OctoKit/OctoKit.h>
-#import <Quick/Quick.h>
+@import Nimble;
+@import Quick;
 
 #import "OCTServer+Private.h"
 

diff --git a/OctoKitTests/OCTTreeSpec.m b/OctoKitTests/OCTTreeSpec.m
@@ -6,9 +6,9 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //
 
-#import <Nimble/Nimble.h>
 #import <OctoKit/OctoKit.h>
-#import <Quick/Quick.h>
+@import Nimble;
+@import Quick;
 
 #import "OCTObjectSpec.h"
 

diff --git a/OctoKitTests/OCTUserSpec.m b/OctoKitTests/OCTUserSpec.m
@@ -6,9 +6,9 @@
 //  Copyright (c) 2012 GitHub. All rights reserved.
 //
 
-#import <Nimble/Nimble.h>
 #import <OctoKit/OctoKit.h>
-#import <Quick/Quick.h>
+@import Nimble;
+@import Quick;
 
 #import "OCTObject+Private.h"
 #import "OCTObjectSpec.h"

diff --git a/OctoKitTests/RACSignalAdditionsSpec.m b/OctoKitTests/RACSignalAdditionsSpec.m
@@ -6,9 +6,9 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //
 
-#import <Nimble/Nimble.h>
 #import <OctoKit/OctoKit.h>
-#import <Quick/Quick.h>
+@import Nimble;
+@import Quick;
 
 QuickSpecBegin(RACSignalAdditions)
+18 −18		Mantle.xcodeproj/project.pbxproj
+1 −1		Mantle/MTLManagedObjectAdapter.m
+2 −2		Mantle/MTLModel+NSCoding.m
+2 −2		Mantle/MTLModel.m
+0 −0		Mantle/extobjc/MTLEXTKeyPathCoding.h
+0 −0		Mantle/extobjc/MTLEXTRuntimeExtensions.h
+1 −1		Mantle/extobjc/MTLEXTRuntimeExtensions.m
+0 −0		Mantle/extobjc/MTLEXTScope.h
+1 −1		Mantle/extobjc/MTLEXTScope.m
+7 −0		.gitignore
+13 −6		CONTRIBUTING.md
+2 −1		Nimble.podspec
+425 −18		Nimble.xcodeproj/project.pbxproj
+5 −5		Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-OSX.xcscheme
+5 −5		Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-iOS.xcscheme
+99 −0		Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-tvOS.xcscheme
+5 −4		Nimble/Adapters/AssertionRecorder.swift
+35 −0		Nimble/Adapters/NimbleEnvironment.swift
+71 −32		Nimble/DSL+Wait.swift
+29 −1		Nimble/DSL.swift
+2 −1		Nimble/Expectation.swift
+3 −3		Nimble/Info.plist
+31 −0		Nimble/Matchers/Equal.swift
+4 −4		Nimble/Matchers/HaveCount.swift
+2 −2		Nimble/Matchers/MatcherProtocols.swift
+66 −0		Nimble/Matchers/SatisfyAnyOf.swift
+3 −3		Nimble/Nimble.h
+354 −0		Nimble/Utils/Async.swift
+0 −86		Nimble/Utils/Poll.swift
+45 −12		Nimble/Wrappers/AsyncMatcherWrapper.swift
+6 −0		Nimble/objc/DSL.h
+4 −0		Nimble/objc/DSL.m
+3 −0		Nimble/objc/NMBExceptionCapture.h
+1 −1		Nimble/objc/NMBExceptionCapture.m
+81 −19		NimbleTests/AsynchronousTest.swift
+1 −1		NimbleTests/Info.plist
+29 −0		NimbleTests/Matchers/EqualTest.swift
+15 −13		NimbleTests/Matchers/HaveCountTest.swift
+40 −0		NimbleTests/Matchers/SatisfyAnyOfTest.swift
+4 −2		NimbleTests/objc/ObjCAsyncTest.m
+12 −5		NimbleTests/objc/ObjCHaveCount.m
+32 −0		NimbleTests/objc/ObjCSatisfyAnyOfTest.m
+47 −16		README.md
+14 −13		script/release