Skip to content

Commit

Permalink
Update dependencies to support Swift 3
Browse files Browse the repository at this point in the history
  • Loading branch information
mattrubin committed Dec 17, 2016
1 parent 0218aa1 commit 485b637
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "antitypical/Result" ~> 2.1.1
github "antitypical/Result" ~> 3.0
8 changes: 4 additions & 4 deletions Cartfile.private
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github "jspahrsummers/xcconfigs" >= 0.10
github "Quick/Quick" ~> 0.9.3
github "Quick/Nimble" ~> 4.1.0
github "modocache/Guanaco" "77e8544d3f454859a1a0907f3f53d53605f5de70"
github "ZipArchive/ZipArchive" ~> 1.1
github "Quick/Quick" ~> 1.0
github "Quick/Nimble" ~> 5.0
github "modocache/Guanaco" "6b85ad93b4e7fde8a59d23f94c438a97e1696293"
github "ZipArchive/ZipArchive" ~> 1.6
10 changes: 5 additions & 5 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
github "Quick/Nimble" "v4.1.0"
github "Quick/Quick" "v0.9.3"
github "antitypical/Result" "2.1.3"
github "ZipArchive/ZipArchive" "v1.1"
github "Quick/Nimble" "v5.1.1"
github "Quick/Quick" "v1.0.0"
github "antitypical/Result" "3.1.0"
github "ZipArchive/ZipArchive" "v1.6.2"
github "jspahrsummers/xcconfigs" "0.10"
github "modocache/Guanaco" "77e8544d3f454859a1a0907f3f53d53605f5de70"
github "modocache/Guanaco" "6b85ad93b4e7fde8a59d23f94c438a97e1696293"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Nimble
Submodule Nimble updated 159 files
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Quick
Submodule Quick updated 146 files
2 changes: 1 addition & 1 deletion Carthage/Checkouts/ZipArchive
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
+25 −0 SSZipArchive/SSZipArchive+Swift.swift
+31 −15 SSZipArchive/SSZipArchive.h
+182 −77 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
+18 −6 ZipArchive.xcodeproj/project.pbxproj

0 comments on commit 485b637

Please sign in to comment.