Skip to content

Commit 218515d

Browse files
author
nghialv
committed
resolve warnings
1 parent 9f7b064 commit 218515d

File tree

2 files changed

+20
-10
lines changed

2 files changed

+20
-10
lines changed

Net.podspec

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "Net"
3-
s.version = "0.1"
3+
s.version = "0.2.1"
44
s.summary = "Http Request wrapper written in Swift"
55
s.homepage = "https://github.com/nghialv"
66
s.screenshots = "https://camo.githubusercontent.com/18ae3452d66a0b8ad14ee6c897814044c79cec98/68747470733a2f2f646c2e64726f70626f7875736572636f6e74656e742e636f6d2f752f383535363634362f73637265656e73686f74322e706e67"
@@ -10,8 +10,8 @@ Pod::Spec.new do |s|
1010
s.social_media_url = "https://twitter.com/nghialv2607"
1111

1212
s.platform = :ios
13-
s.ios.deployment_target = "7.0"
14-
s.source = { :git => "https://github.com/nghialv/Net.git", :tag => "0.1" }
13+
s.ios.deployment_target = "8.0"
14+
s.source = { :git => "https://github.com/nghialv/Net.git", :tag => "0.2.1" }
1515

1616
s.source_files = "Net/*"
1717
s.requires_arc = true

Net/Net.swift

+17-7
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//
88

99
import Foundation
10+
import UIKit
1011

1112
// TODO: authentication
1213
// TODO: cache
@@ -81,8 +82,17 @@ class Net : NSObject, NSURLSessionDataDelegate, NSURLSessionDownloadDelegate, NS
8182
func setupSession(backgroundIdentifier: String? = nil) {
8283
if backgroundIdentifier != nil {
8384
if backgroundSession == nil {
84-
//backgroundSessionConfig = NSURLSessionConfiguration.backgroundSessionConfigurationWithIdentifier(backgroundIdentifier!)
85-
backgroundSessionConfig = NSURLSessionConfiguration.backgroundSessionConfiguration(backgroundIdentifier!)
85+
86+
func systemVersionGreaterThanOrEqualTo(version: String) -> Bool {
87+
let osVersion = UIDevice.currentDevice().systemVersion
88+
return osVersion.compare(version, options: NSStringCompareOptions.NumericSearch) != NSComparisonResult.OrderedAscending
89+
}
90+
91+
if systemVersionGreaterThanOrEqualTo("8.0") {
92+
backgroundSessionConfig = NSURLSessionConfiguration.backgroundSessionConfigurationWithIdentifier(backgroundIdentifier!)
93+
} else {
94+
backgroundSessionConfig = NSURLSessionConfiguration.backgroundSessionConfiguration(backgroundIdentifier!)
95+
}
8696
backgroundSessionConfig!.HTTPMaximumConnectionsPerHost = HTTPMaximumconnectionsPerHost
8797

8898
backgroundSession = NSURLSession(configuration: backgroundSessionConfig, delegate: self, delegateQueue: nil)
@@ -113,7 +123,7 @@ class Net : NSObject, NSURLSessionDataDelegate, NSURLSessionDownloadDelegate, NS
113123

114124
func GET(# absoluteUrl: String, params: NSDictionary?, successHandler: SuccessHandler, failureHandler: FailureHandler)
115125
-> NSURLSessionTask {
116-
return httpRequest(.GET, url: absoluteUrl, params: params, successHandler: successHandler, failureHandler: failureHandler, isAbsoluteUrl: true)
126+
return httpRequest(.GET, url: absoluteUrl, params: params, isAbsoluteUrl: true, successHandler: successHandler, failureHandler: failureHandler)
117127
}
118128

119129
// POST
@@ -124,7 +134,7 @@ class Net : NSObject, NSURLSessionDataDelegate, NSURLSessionDownloadDelegate, NS
124134

125135
func POST(# absoluteUrl: String, params: NSDictionary?, successHandler: SuccessHandler, failureHandler: FailureHandler)
126136
-> NSURLSessionTask {
127-
return httpRequest(.POST, url: absoluteUrl, params: params, successHandler: successHandler, failureHandler: failureHandler, isAbsoluteUrl: true)
137+
return httpRequest(.POST, url: absoluteUrl, params: params, isAbsoluteUrl: true, successHandler: successHandler, failureHandler: failureHandler)
128138
}
129139

130140
// PUT
@@ -135,7 +145,7 @@ class Net : NSObject, NSURLSessionDataDelegate, NSURLSessionDownloadDelegate, NS
135145

136146
func PUT(# absoluteUrl: String, params: NSDictionary?, successHandler: SuccessHandler, failureHandler: FailureHandler)
137147
-> NSURLSessionTask {
138-
return httpRequest(.PUT, url: absoluteUrl, params: params, successHandler: successHandler, failureHandler: failureHandler, isAbsoluteUrl: true)
148+
return httpRequest(.PUT, url: absoluteUrl, params: params, isAbsoluteUrl: true, successHandler: successHandler, failureHandler: failureHandler)
139149
}
140150

141151
// DELETE
@@ -145,7 +155,7 @@ class Net : NSObject, NSURLSessionDataDelegate, NSURLSessionDownloadDelegate, NS
145155
}
146156

147157
func DELETE(# absoluteUrl: String, params: NSDictionary?, successHandler: SuccessHandler, failureHandler: FailureHandler) -> NSURLSessionTask {
148-
return httpRequest(.DELETE, url: absoluteUrl, params: params, successHandler: successHandler, failureHandler: failureHandler, isAbsoluteUrl: true)
158+
return httpRequest(.DELETE, url: absoluteUrl, params: params, isAbsoluteUrl: true, successHandler: successHandler, failureHandler: failureHandler)
149159
}
150160

151161
// DOWNLOAD
@@ -296,7 +306,7 @@ class Net : NSObject, NSURLSessionDataDelegate, NSURLSessionDownloadDelegate, NS
296306
*
297307
* @return request instance
298308
*/
299-
private func httpRequest(method: HttpMethod, url: String, params: NSDictionary?, successHandler: SuccessHandler, failureHandler: FailureHandler, isAbsoluteUrl: Bool = false) -> NSURLSessionTask {
309+
private func httpRequest(method: HttpMethod, url: String, params: NSDictionary?, isAbsoluteUrl: Bool = false, successHandler: SuccessHandler, failureHandler: FailureHandler) -> NSURLSessionTask {
300310
let urlString = isAbsoluteUrl ? url : "\(baseUrl.absoluteString!)\(url)"
301311
NSLog(urlString)
302312

0 commit comments

Comments
 (0)