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

Commit

Permalink
Merge pull request #289 from octokit/update-dependencies
Browse files Browse the repository at this point in the history 
Update dependencies
  • Loading branch information
@mdiep
mdiep committed Feb 18, 2016
2 parents ee557d8 + 70957fc commit 1287f62
Show file tree
Hide file tree
Showing 33 changed files with 64 additions and 64 deletions.
4 changes: 2 additions & 2 deletions Cartfile.private
View file
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions Cartfile.resolved
View file
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Mantle
Submodule Mantle updated 9 files
+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
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Nimble
Submodule Nimble updated 35 files
+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
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Quick
Submodule Quick updated 109 files
2 changes: 1 addition & 1 deletion Carthage/Checkouts/xcconfigs
Submodule xcconfigs updated from 99624a to d78854
4 changes: 2 additions & 2 deletions OctoKitTests/NSDateFormatterAdditionsSpec.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions OctoKitTests/NSURLAdditionsSpec.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions OctoKitTests/NSValueTransformerAdditionsSpec.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions OctoKitTests/OCTAuthorizationSpec.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions OctoKitTests/OCTBranchSpec.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions OctoKitTests/OCTClientSpec.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions OctoKitTests/OCTCommitCommentSpec.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions OctoKitTests/OCTCommitSpec.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions OctoKitTests/OCTContentSpec.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions OctoKitTests/OCTEventSpec.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions OctoKitTests/OCTGistEditSpec.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions OctoKitTests/OCTGistSpec.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions OctoKitTests/OCTGitCommitFileSpec.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions OctoKitTests/OCTGitCommitSpec.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions OctoKitTests/OCTIssueCommentSpec.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions OctoKitTests/OCTIssueSpec.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//

#import <OctoKit/OctoKit.h>
#import <Quick/Quick.h>
#import <Nimble/Nimble.h>
@import Quick;
@import Nimble;

#import "OCTObjectSpec.h"

Expand Down
4 changes: 2 additions & 2 deletions OctoKitTests/OCTObjectSpec.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions OctoKitTests/OCTOrganizationSpec.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions OctoKitTests/OCTPullRequestCommentSpec.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions OctoKitTests/OCTPullRequestSpec.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions OctoKitTests/OCTRefSpec.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions OctoKitTests/OCTRepositorySpec.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions OctoKitTests/OCTResponseSpec.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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\"";

Expand Down
4 changes: 2 additions & 2 deletions OctoKitTests/OCTServerSpec.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions OctoKitTests/OCTTreeSpec.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions OctoKitTests/OCTUserSpec.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions OctoKitTests/RACSignalAdditionsSpec.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit 1287f62

Please sign in to comment.