Skip to content

carthage update #591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 27, 2016
Merged

carthage update #591

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4388cae
carthage update
tiennou Sep 22, 2016
2038841
Test if migrating to Xcode 8 works on Travis
pietbrauer Oct 27, 2016
6675b7f
Use Xcode8
pietbrauer Oct 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
carthage update 
ZipArchive is actually on its swift23 branch because Xcode 7
  • Loading branch information
@tiennou
tiennou committed Sep 22, 2016
commit 4388caeefd2ffcec952002bbca5651a727e665c2
6 changes: 3 additions & 3 deletions Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github "Quick/Nimble" "v4.0.0"
github "Quick/Quick" "v0.9.2"
github "ZipArchive/ZipArchive" "v1.1"
github "Quick/Nimble" "v4.1.0"
github "Quick/Quick" "v0.9.3"
github "ZipArchive/ZipArchive" "v1.6.1"
github "jspahrsummers/xcconfigs" "0.9"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Nimble
Open in desktop
Submodule Nimble updated 20 files
+1 −0 .ruby-version
+15 −0 .travis.yml
+2 −3 CONTRIBUTING.md
+4 −0 Gemfile
+63 −0 Gemfile.lock
+2 −1 Nimble.podspec
+86 −80 Nimble.xcodeproj/project.pbxproj
+7 −4 README.md
+9 −0 Sources/Nimble/Adapters/ObjectiveC/CurrentTestCaseTracker.h
+0 −25 Sources/Nimble/Adapters/ObjectiveC/CurrentTestCaseTracker.m
+1 −1 Sources/Nimble/Adapters/ObjectiveC/NMBExceptionCapture.m
+78 −0 Sources/Nimble/Adapters/ObjectiveC/XCTestObservationCenter+Register.m
+2 −1 Sources/Nimble/Expectation.swift
+4 −4 Sources/Nimble/Matchers/BeCloseTo.swift
+4 −4 Sources/Nimble/Matchers/Contain.swift
+1 −1 Sources/Nimble/Nimble.h
+51 −0 Tests/Nimble/Matchers/BeCloseToTest.swift
+18 −0 Tests/Nimble/Matchers/ContainTest.swift
+4 −18 script/release
+28 −3 test
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Quick
Open in desktop
Submodule Quick updated 35 files
+1 −0 .ruby-version
+37 −6 .travis.yml
+2 −3 CONTRIBUTING.md
+2 −2 Documentation/en-us/InstallingQuick.md
+4 −0 Documentation/en-us/QuickInObjectiveC.md
+2 −2 Documentation/en-us/SharedExamples.md
+0 −1 Documentation/ja/ArrangeActAssert.md
+0 −2 Documentation/ja/BehavioralTesting.md
+2 −2 Documentation/ja/InstallingQuick.md
+1 −1 Documentation/ja/MoreResources.md
+3 −3 Documentation/ja/SharedExamples.md
+75 −0 Documentation/zh-cn/SettingUpYourXcodeProject.md
+1 −1 Externals/Nimble
+3 −0 Gemfile
+67 −0 Gemfile.lock
+2 −1 Quick.podspec
+41 −7 Quick.xcodeproj/project.pbxproj
+5 −5 Quick.xcodeproj/xcshareddata/xcschemes/Quick-OSX.xcscheme
+5 −5 Quick.xcodeproj/xcshareddata/xcschemes/Quick-iOS.xcscheme
+1 −1 Quick.xcodeproj/xcshareddata/xcschemes/Quick-tvOS.xcscheme
+0 −18 QuickTests/FunctionalTests/ContextTests.swift
+2 −2 README.md
+19 −24 Rakefile
+6 −8 Sources/Quick/DSL/World+DSL.swift
+18 −18 Sources/Quick/QuickSpec.m
+1 −0 Sources/Quick/World.h
+9 −0 Sources/Quick/World.swift
+19 −0 Sources/QuickTests/FunctionalTests/CrossReferencingSpecs.swift
+4 −0 Sources/QuickTests/Helpers/QCKSpecRunner.m
+29 −5 Sources/QuickTests/Helpers/XCTestObservationCenter+QCKSuspendObservation.m
+2 −0 Sources/QuickTests/main.swift
+0 −3 circle.yml
+3 −20 script/release
+0 −3 script/travis-install-osx
+8 −4 script/travis-script-osx
2 changes: 1 addition & 1 deletion Carthage/Checkouts/ZipArchive
Open in desktop
Submodule ZipArchive updated 30 files
+7 −0 .travis.yml
+92 −30 ObjectiveCExample/ObjectiveCExample.xcodeproj/project.pbxproj
+101 −0 ObjectiveCExample/ObjectiveCExample.xcodeproj/xcshareddata/xcschemes/ObjectiveCExample.xcscheme
+5 −0 ObjectiveCExample/ObjectiveCExample/Assets.xcassets/AppIcon.appiconset/Contents.json
+91 −3 ObjectiveCExample/ObjectiveCExample/Base.lproj/Main.storyboard
+9 −0 ObjectiveCExample/ObjectiveCExample/Sample Data/China to ban ivory trade.md
+9 −0 ObjectiveCExample/ObjectiveCExample/Sample Data/Kerry in Syria.md
+ − ObjectiveCExample/ObjectiveCExample/Sample Data/wapo twitter banner.png
+107 −4 ObjectiveCExample/ObjectiveCExample/ViewController.m
+1 −1 ObjectiveCExample/ObjectiveCExampleTests/CollectingDelegate.h
+21 −8 ObjectiveCExample/ObjectiveCExampleTests/SSZipArchiveTests.m
+9 −1 ObjectiveCExample/Podfile
+6 −4 ObjectiveCExample/Podfile.lock
+4 −0 README.md
+20 −0 Release-Instructions.md
+6 −4 SSZipArchive.podspec
+26 −0 SSZipArchive/SSZipArchive+Swift.swift
+31 −15 SSZipArchive/SSZipArchive.h
+192 −78 SSZipArchive/SSZipArchive.m
+1 −1 SSZipArchive/SSZipCommon.h
+0 −1 SSZipArchive/ZipArchive.h
+1 −1 SSZipArchive/minizip/unzip.c
+1 −1 SSZipArchive/minizip/unzip.h
+6 −4 SwiftExample/Podfile.lock
+42 −31 SwiftExample/SwiftExample.xcodeproj/project.pbxproj
+6 −6 SwiftExample/SwiftExample/AppDelegate.swift
+29 −23 SwiftExample/SwiftExample/Base.lproj/Main.storyboard
+19 −22 SwiftExample/SwiftExample/ViewController.swift
+1 −1 SwiftExample/SwiftExampleTests/SwiftExampleTests.swift
+20 −6 ZipArchive.xcodeproj/project.pbxproj