Skip to content

Commit b9a633a

Browse files
jhershjhersh
committed
pod updates
1 parent eed7434 commit b9a633a

File tree

86 files changed

+2652
-2245
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+2652
-2245
lines changed

‎circle.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ machine:
33
LANG: en_US.UTF-8
44
LC_CTYPE: en_US.UTF-8
55
xcode:
6-
version: "6.3.1"
6+
version: "7.0"
77
dependencies:
88
pre:
99
- xcrun instruments -w "iPhone 6 (8.3 Simulator)" || exit 0

‎src/Bequest.xcodeproj/project.pbxproj‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,8 @@
316316
5E6B02221A1D2DA500EB5CCC /* Project object */ = {
317317
isa = PBXProject;
318318
attributes = {
319-
LastUpgradeCheck = 0610;
319+
LastSwiftUpdateCheck = 0700;
320+
LastUpgradeCheck = 0700;
320321
ORGANIZATIONNAME = BQST;
321322
TargetAttributes = {
322323
5E6B02291A1D2DA500EB5CCC = {
@@ -564,6 +565,7 @@
564565
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
565566
COPY_PHASE_STRIP = NO;
566567
ENABLE_STRICT_OBJC_MSGSEND = YES;
568+
ENABLE_TESTABILITY = YES;
567569
GCC_C_LANGUAGE_STANDARD = gnu99;
568570
GCC_DYNAMIC_NO_PIC = NO;
569571
GCC_OPTIMIZATION_LEVEL = 0;
@@ -705,6 +707,7 @@
705707
GCC_WARN_PEDANTIC = YES;
706708
GCC_WARN_STRICT_SELECTOR_MATCH = YES;
707709
INFOPLIST_FILE = "Bequest/Supporting Files/Info.plist";
710+
PRODUCT_BUNDLE_IDENTIFIER = "net.splinesoft.$(PRODUCT_NAME:rfc1034identifier)";
708711
PRODUCT_NAME = "$(TARGET_NAME)";
709712
SWIFT_OBJC_BRIDGING_HEADER = "Bequest/Supporting Files/Bequest-Bridging-Header.h";
710713
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -729,6 +732,7 @@
729732
GCC_WARN_PEDANTIC = YES;
730733
GCC_WARN_STRICT_SELECTOR_MATCH = YES;
731734
INFOPLIST_FILE = "Bequest/Supporting Files/Info.plist";
735+
PRODUCT_BUNDLE_IDENTIFIER = "net.splinesoft.$(PRODUCT_NAME:rfc1034identifier)";
732736
PRODUCT_NAME = "$(TARGET_NAME)";
733737
SWIFT_OBJC_BRIDGING_HEADER = "Bequest/Supporting Files/Bequest-Bridging-Header.h";
734738
};
@@ -749,6 +753,7 @@
749753
);
750754
INFOPLIST_FILE = BequestTests/Info.plist;
751755
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
756+
PRODUCT_BUNDLE_IDENTIFIER = "net.splinesoft.$(PRODUCT_NAME:rfc1034identifier)";
752757
PRODUCT_NAME = "$(TARGET_NAME)";
753758
SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/BequestTests/BequestTestsBridgingHeader.h";
754759
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Bequest.app/Bequest";
@@ -766,6 +771,7 @@
766771
);
767772
INFOPLIST_FILE = BequestTests/Info.plist;
768773
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
774+
PRODUCT_BUNDLE_IDENTIFIER = "net.splinesoft.$(PRODUCT_NAME:rfc1034identifier)";
769775
PRODUCT_NAME = "$(TARGET_NAME)";
770776
SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/BequestTests/BequestTestsBridgingHeader.h";
771777
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Bequest.app/Bequest";
@@ -864,6 +870,7 @@
864870
GCC_WARN_PEDANTIC = YES;
865871
GCC_WARN_STRICT_SELECTOR_MATCH = YES;
866872
INFOPLIST_FILE = "Bequest/Supporting Files/Info.plist";
873+
PRODUCT_BUNDLE_IDENTIFIER = "net.splinesoft.$(PRODUCT_NAME:rfc1034identifier)";
867874
PRODUCT_NAME = "$(TARGET_NAME)";
868875
SWIFT_OBJC_BRIDGING_HEADER = "Bequest/Supporting Files/Bequest-Bridging-Header.h";
869876
};
@@ -880,6 +887,7 @@
880887
);
881888
INFOPLIST_FILE = BequestTests/Info.plist;
882889
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
890+
PRODUCT_BUNDLE_IDENTIFIER = "net.splinesoft.$(PRODUCT_NAME:rfc1034identifier)";
883891
PRODUCT_NAME = "$(TARGET_NAME)";
884892
SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/BequestTests/BequestTestsBridgingHeader.h";
885893
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Bequest.app/Bequest";

‎src/Bequest.xcodeproj/xcshareddata/xcschemes/Bequest Adhoc.xcscheme‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0610"
3+
LastUpgradeVersion = "0700"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -62,6 +62,8 @@
6262
ReferencedContainer = "container:Bequest.xcodeproj">
6363
</BuildableReference>
6464
</MacroExpansion>
65+
<AdditionalOptions>
66+
</AdditionalOptions>
6567
</TestAction>
6668
<LaunchAction
6769
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
@@ -71,8 +73,10 @@
7173
buildConfiguration = "Adhoc"
7274
ignoresPersistentStateOnLaunch = "NO"
7375
debugDocumentVersioning = "YES"
76+
debugServiceExtension = "internal"
7477
allowLocationSimulation = "YES">
75-
<BuildableProductRunnable>
78+
<BuildableProductRunnable
79+
runnableDebuggingMode = "0">
7680
<BuildableReference
7781
BuildableIdentifier = "primary"
7882
BlueprintIdentifier = "5E6B02291A1D2DA500EB5CCC"
@@ -90,7 +94,8 @@
9094
useCustomWorkingDirectory = "NO"
9195
buildConfiguration = "Adhoc"
9296
debugDocumentVersioning = "YES">
93-
<BuildableProductRunnable>
97+
<BuildableProductRunnable
98+
runnableDebuggingMode = "0">
9499
<BuildableReference
95100
BuildableIdentifier = "primary"
96101
BlueprintIdentifier = "5E6B02291A1D2DA500EB5CCC"

‎src/Bequest.xcodeproj/xcshareddata/xcschemes/Bequest Dev.xcscheme‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0610"
3+
LastUpgradeVersion = "0700"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,6 +40,7 @@
4040
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4141
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4242
shouldUseLaunchSchemeArgsEnv = "YES"
43+
codeCoverageEnabled = "YES"
4344
buildConfiguration = "Debug">
4445
<Testables>
4546
<TestableReference
@@ -62,6 +63,8 @@
6263
ReferencedContainer = "container:Bequest.xcodeproj">
6364
</BuildableReference>
6465
</MacroExpansion>
66+
<AdditionalOptions>
67+
</AdditionalOptions>
6568
</TestAction>
6669
<LaunchAction
6770
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
@@ -71,8 +74,10 @@
7174
buildConfiguration = "Debug"
7275
ignoresPersistentStateOnLaunch = "NO"
7376
debugDocumentVersioning = "YES"
77+
debugServiceExtension = "internal"
7478
allowLocationSimulation = "YES">
75-
<BuildableProductRunnable>
79+
<BuildableProductRunnable
80+
runnableDebuggingMode = "0">
7681
<BuildableReference
7782
BuildableIdentifier = "primary"
7883
BlueprintIdentifier = "5E6B02291A1D2DA500EB5CCC"
@@ -90,7 +95,8 @@
9095
useCustomWorkingDirectory = "NO"
9196
buildConfiguration = "Debug"
9297
debugDocumentVersioning = "YES">
93-
<BuildableProductRunnable>
98+
<BuildableProductRunnable
99+
runnableDebuggingMode = "0">
94100
<BuildableReference
95101
BuildableIdentifier = "primary"
96102
BlueprintIdentifier = "5E6B02291A1D2DA500EB5CCC"

‎src/Bequest.xcodeproj/xcshareddata/xcschemes/Bequest Release.xcscheme‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0610"
3+
LastUpgradeVersion = "0700"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -62,6 +62,8 @@
6262
ReferencedContainer = "container:Bequest.xcodeproj">
6363
</BuildableReference>
6464
</MacroExpansion>
65+
<AdditionalOptions>
66+
</AdditionalOptions>
6567
</TestAction>
6668
<LaunchAction
6769
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
@@ -71,8 +73,10 @@
7173
buildConfiguration = "Release"
7274
ignoresPersistentStateOnLaunch = "NO"
7375
debugDocumentVersioning = "YES"
76+
debugServiceExtension = "internal"
7477
allowLocationSimulation = "YES">
75-
<BuildableProductRunnable>
78+
<BuildableProductRunnable
79+
runnableDebuggingMode = "0">
7680
<BuildableReference
7781
BuildableIdentifier = "primary"
7882
BlueprintIdentifier = "5E6B02291A1D2DA500EB5CCC"
@@ -90,7 +94,8 @@
9094
useCustomWorkingDirectory = "NO"
9195
buildConfiguration = "Release"
9296
debugDocumentVersioning = "YES">
93-
<BuildableProductRunnable>
97+
<BuildableProductRunnable
98+
runnableDebuggingMode = "0">
9499
<BuildableReference
95100
BuildableIdentifier = "primary"
96101
BlueprintIdentifier = "5E6B02291A1D2DA500EB5CCC"

‎src/Bequest/Additions/NSData+BQSTAdditions.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ extension NSData {
4747
return convertedString
4848
}
4949

50-
func BQSTString(#contentType: String?) -> NSString {
50+
func BQSTString(contentType contentType: String?) -> NSString {
5151
var string: NSString?
5252

5353
if let contentTypeComponents = contentType?.componentsSeparatedByString(";") {

‎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-
println("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/BQSTNavigationController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class BQSTNavigationController: UINavigationController {
1919
return self.visibleViewController.shouldAutorotate()
2020
}
2121

22-
override func supportedInterfaceOrientations() -> Int {
22+
override func supportedInterfaceOrientations() -> UIInterfaceOrientationMask {
2323
return self.visibleViewController.supportedInterfaceOrientations()
2424
}
2525

‎src/Bequest/Controllers/BQSTRequestController.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,19 +148,19 @@ class BQSTRequestController: UIViewController, UICollectionViewDelegate, UIColle
148148

149149
let request: NSURLRequest = BQSTRequestManager.sharedManager.currentRequest
150150

151-
if count(request.URL!.absoluteString!) == 0 {
151+
if (request.URL!.absoluteString!).characters.count == 0 {
152152
self.BQSTShowSimpleErrorAlert(BQSTLocalizedString("REQUEST_URL_MISSING"),
153153
message: BQSTLocalizedString("REQUEST_URL_MISSING_DETAIL"))
154154
return
155155
}
156156

157-
if request.HTTPMethod == nil || count(request.HTTPMethod!) == 0 {
157+
if request.HTTPMethod == nil || (request.HTTPMethod!).characters.count == 0 {
158158
self.BQSTShowSimpleErrorAlert(BQSTLocalizedString("REQUEST_METHOD_MISSING"),
159159
message: BQSTLocalizedString("REQUEST_METHOD_MISSING_DETAIL"))
160160
return
161161
}
162162

163-
println("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-
println("Selected index \(indexPath)")
220+
print("Selected index \(indexPath)", appendNewline: false)
221221
}
222222

223223
/// MARK: UICollectionViewDelegateFlowLayout

‎src/Bequest/Controllers/BQSTResponseController.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ class BQSTResponseController: UITableViewController {
166166
}
167167

168168
if requestHeaders.count > 0 {
169-
let sortedNames: [NSObject] = (requestHeaders.keys.array.sorted {
169+
let sortedNames: [NSObject] = (requestHeaders.keys.array.sort {
170170
return ($0 as! String) < ($1 as! String)
171171
})
172172

@@ -185,7 +185,7 @@ class BQSTResponseController: UITableViewController {
185185
// Response Headers
186186
if let responseHeaders = response?.allHeaderFields {
187187
if responseHeaders.count > 0 {
188-
let sortedNames: [NSObject] = (responseHeaders.keys.array.sorted {
188+
let sortedNames: [NSObject] = (responseHeaders.keys.array.sort {
189189
return ($0 as! String) < ($1 as! String)
190190
})
191191

@@ -213,13 +213,13 @@ class BQSTResponseController: UITableViewController {
213213
case .HTML, .TXT:
214214
let str = parsedResponse?.object as? String
215215

216-
if str != nil && count(str!) > 0 {
216+
if str != nil && (str!).characters.count > 0 {
217217
addBodySection()
218218
}
219219
case .JSON:
220220
let dict = parsedResponse?.object as? [NSObject:AnyObject]
221221

222-
if dict != nil && count(dict!) > 0 {
222+
if dict != nil && (dict!).count > 0 {
223223
addBodySection()
224224
}
225225
default:
@@ -339,7 +339,7 @@ class BQSTResponseController: UITableViewController {
339339
override func tableView(tableView: UITableView,
340340
canPerformAction action: Selector,
341341
forRowAtIndexPath indexPath: NSIndexPath,
342-
withSender sender: AnyObject) -> Bool {
342+
withSender sender: AnyObject?) -> Bool {
343343

344344
switch self.responseSectionAtIndex(indexPath.section) {
345345
case .ResponseHeaders, .RequestHeaders, .Request:
@@ -352,7 +352,7 @@ class BQSTResponseController: UITableViewController {
352352
override func tableView(tableView: UITableView,
353353
performAction action: Selector,
354354
forRowAtIndexPath indexPath: NSIndexPath,
355-
withSender sender: AnyObject!) {
355+
withSender sender: AnyObject?) {
356356

357357
switch self.responseSectionAtIndex(indexPath.section) {
358358
case .ResponseHeaders, .RequestHeaders, .Request:

0 commit comments

Comments
 (0)