Skip to content

Commit 5a6258e

Browse files
committed
Update Alamofire,SnapKit to swift-2 branches
1 parent be1cbaf commit 5a6258e

39 files changed

Lines changed: 3211 additions & 3055 deletions

src/Bequest/Additions/UIViewController+BQSTAlerts.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ extension UIViewController {
2121
}
2222

2323
func BQSTShowSimpleErrorAlert(title: String, error: NSError?) {
24-
print("Request error: \(error)")
24+
print("Request error: \(error)", appendNewline: false)
2525

2626
let msg: String = (error?.userInfo?[NSUnderlyingErrorKey] as! NSError).localizedDescription
2727
?? BQSTLocalizedString("REQUEST_RESPONSE_GENERIC_ERROR")

src/Bequest/Controllers/BQSTRequestController.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ class BQSTRequestController: UIViewController, UICollectionViewDelegate, UIColle
160160
return
161161
}
162162

163-
print("Sending a request of type \(request.HTTPMethod!) to URL \(request.URL!)")
163+
print("Sending a request of type \(request.HTTPMethod!) to URL \(request.URL!)", appendNewline: false)
164164

165165
self.progressButton.progressPercentage = 0
166166
self.progressButton.progressState = .Loading
@@ -217,7 +217,7 @@ class BQSTRequestController: UIViewController, UICollectionViewDelegate, UIColle
217217
/// MARK: UICollectionViewDelegate
218218

219219
func collectionView(collectionView: UICollectionView, didSelectItemAtIndexPath indexPath: NSIndexPath) {
220-
print("Selected index \(indexPath)")
220+
print("Selected index \(indexPath)", appendNewline: false)
221221
}
222222

223223
/// MARK: UICollectionViewDelegateFlowLayout

src/Bequest/Networking/BQSTHTTPResponse.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public struct BQSTHTTPResponse {
7777

7878
serializedResponse.contentType = contentType
7979

80-
print("content-type: \(contentTypeRaw)")
80+
print("content-type: \(contentTypeRaw)", appendNewline: false)
8181

8282
switch contentType {
8383
case .JSON:

src/Podfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ def import_pods
1313
pod 'TTTAttributedLabel'
1414
pod 'JTSImageViewController'
1515
pod 'CYRTextView'
16-
pod 'SnapKit'
16+
pod 'SnapKit', :git => 'git@github.com:SnapKit/SnapKit.git', :branch => 'swift-2.0'
1717

1818
# Networking
19-
pod 'Alamofire'
19+
pod 'Alamofire', :git => 'git@github.com:Alamofire/Alamofire.git', :branch => 'swift-2.0'
2020
end
2121

2222
target :Bequest do

src/Podfile.lock

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,55 @@
11
PODS:
2-
- Alamofire (1.2.2)
2+
- Alamofire (1.2.3)
33
- CYRTextView (0.4.0)
44
- JTSImageViewController (1.4)
55
- KIF (3.2.3):
66
- KIF/XCTest (= 3.2.3)
77
- KIF/XCTest (3.2.3)
88
- Nimble (0.4.2)
99
- pop (1.0.7)
10-
- Quick (0.3.1)
10+
- Quick (0.4.0)
1111
- SnapKit (0.12.0)
1212
- SSDataSources (0.8.5)
13-
- TTTAttributedLabel (1.13.3)
13+
- TTTAttributedLabel (1.13.4)
1414

1515
DEPENDENCIES:
16-
- Alamofire
16+
- Alamofire (from `git@github.com:Alamofire/Alamofire.git`, branch `swift-2.0`)
1717
- CYRTextView
1818
- JTSImageViewController
1919
- KIF
2020
- Nimble
2121
- pop
2222
- Quick
23-
- SnapKit
23+
- SnapKit (from `git@github.com:SnapKit/SnapKit.git`, branch `swift-2.0`)
2424
- SSDataSources
2525
- TTTAttributedLabel
2626

27+
EXTERNAL SOURCES:
28+
Alamofire:
29+
:branch: swift-2.0
30+
:git: git@github.com:Alamofire/Alamofire.git
31+
SnapKit:
32+
:branch: swift-2.0
33+
:git: git@github.com:SnapKit/SnapKit.git
34+
35+
CHECKOUT OPTIONS:
36+
Alamofire:
37+
:commit: fd71afb3a0af2042b9f05a6b9f29317ad4903703
38+
:git: git@github.com:Alamofire/Alamofire.git
39+
SnapKit:
40+
:commit: dce953eba6462f0598dae52b351615f4948f25a2
41+
:git: git@github.com:SnapKit/SnapKit.git
42+
2743
SPEC CHECKSUMS:
28-
Alamofire: 11a6022f5089887d92ffb5a3014c97a0a915ab98
44+
Alamofire: 5550bf0b575ed1a4bf9be572f9463e1015cc169e
2945
CYRTextView: 1c1a4d708eee54ecad66b8ad42dbfe73083bdfce
3046
JTSImageViewController: 6a367b144e257db02cdfacdba78d684377d3777b
3147
KIF: a94bffe9c97e449e44f8fa481c53243d21309e1e
3248
Nimble: 49b7a7da8919f42823d37c6d68cc6d15a7009f32
3349
pop: 628ffc631644601567ee8bfaaaea493ebd7d0923
34-
Quick: 824572d3d198d51e52cf4aa722cebf7e59952a35
50+
Quick: 2286bfff349102670c6d2dafd0d2cefab42f5f0b
3551
SnapKit: 00c388aa3bf1944c1b55472f31e841f75bd83882
3652
SSDataSources: b01170fb23b82acf0649194e9189b0bf5f702681
37-
TTTAttributedLabel: 6f3174aef8e738f44dff97c2eb7d8184f6ab6277
53+
TTTAttributedLabel: 0a2ac7b2dd726d32a070dafb01446026b11e624f
3854

3955
COCOAPODS: 0.37.2

src/Pods/Alamofire/README.md

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Pods/Alamofire/Source/Alamofire.swift

Lines changed: 41 additions & 41 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)