Skip to content

Commit 3ee9981

Browse files
committed
Update Swift Example
Deployment Target, NSURLSession instead of NSURLConnection…
1 parent 1cf8864 commit 3ee9981

File tree

7 files changed

+92
-208
lines changed

7 files changed

+92
-208
lines changed

Examples/Swift/MainViewController.swift

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,14 @@ class MainViewController: UIViewController {
5959
let urlString = "http://www.opensource.apple.com/source/Git/Git-26/src/git-htmldocs/git-commit.txt?txt"
6060
let req = URLRequest(url: URL(string: urlString)!)
6161

62-
NSURLConnection.sendAsynchronousRequest(req, queue: OperationQueue.main) { (_, data, _) in
63-
sender.isEnabled = true
64-
if let receivedData = data, let receivedText = NSString(data: receivedData, encoding: String.Encoding.ascii.rawValue) {
65-
self.textView.text = receivedText as String
62+
URLSession.shared.dataTask(with: req) { data, _, _ in
63+
DispatchQueue.main.async {
64+
sender.isEnabled = true
65+
if let receivedData = data, let receivedText = NSString(data: receivedData, encoding: String.Encoding.ascii.rawValue) {
66+
self.textView.text = receivedText as String
67+
}
6668
}
67-
}
69+
}.resume()
6870
}
6971

7072
weak var textStub: HTTPStubsDescriptor?
@@ -95,14 +97,16 @@ class MainViewController: UIViewController {
9597
let urlString = "http://images.apple.com/support/assets/images/products/iphone/hero_iphone4-5_wide.png"
9698
let req = URLRequest(url: URL(string: urlString)!)
9799

98-
NSURLConnection.sendAsynchronousRequest(req, queue: OperationQueue.main) { (_, data, _) in
99-
sender.isEnabled = true
100-
if let receivedData = data {
101-
DispatchQueue.main.async {
102-
self.imageView.image = UIImage(data: receivedData)
100+
URLSession.shared.dataTask(with: req) { data, _, _ in
101+
DispatchQueue.main.async {
102+
sender.isEnabled = true
103+
if let receivedData = data {
104+
DispatchQueue.main.async {
105+
self.imageView.image = UIImage(data: receivedData)
106+
}
103107
}
104108
}
105-
}
109+
}.resume()
106110
}
107111

108112
weak var imageStub: HTTPStubsDescriptor?

Examples/Swift/OHHTTPStubsDemo.xcodeproj/project.pbxproj

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -144,8 +144,9 @@
144144
099F73FF1AE2D049001108A5 /* Project object */ = {
145145
isa = PBXProject;
146146
attributes = {
147+
BuildIndependentTargetsInParallel = YES;
147148
LastSwiftUpdateCheck = 0700;
148-
LastUpgradeCheck = 1020;
149+
LastUpgradeCheck = 1520;
149150
ORGANIZATIONNAME = AliSoftware;
150151
TargetAttributes = {
151152
099F74061AE2D049001108A5 = {
@@ -264,6 +265,7 @@
264265
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
265266
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
266267
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
268+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
267269
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
268270
CLANG_WARN_STRICT_PROTOTYPES = YES;
269271
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -289,7 +291,7 @@
289291
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
290292
GCC_WARN_UNUSED_FUNCTION = YES;
291293
GCC_WARN_UNUSED_VARIABLE = YES;
292-
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
294+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
293295
MTL_ENABLE_DEBUG_INFO = YES;
294296
ONLY_ACTIVE_ARCH = YES;
295297
SDKROOT = iphoneos;
@@ -322,6 +324,7 @@
322324
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
323325
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
324326
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
327+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
325328
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
326329
CLANG_WARN_STRICT_PROTOTYPES = YES;
327330
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -340,10 +343,11 @@
340343
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
341344
GCC_WARN_UNUSED_FUNCTION = YES;
342345
GCC_WARN_UNUSED_VARIABLE = YES;
343-
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
346+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
344347
MTL_ENABLE_DEBUG_INFO = NO;
345348
SDKROOT = iphoneos;
346-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
349+
SWIFT_COMPILATION_MODE = wholemodule;
350+
SWIFT_OPTIMIZATION_LEVEL = "-O";
347351
SWIFT_VERSION = 5.0;
348352
TARGETED_DEVICE_FAMILY = "1,2";
349353
VALIDATE_PRODUCT = YES;
@@ -356,8 +360,11 @@
356360
buildSettings = {
357361
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
358362
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
359-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
360-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
363+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
364+
LD_RUNPATH_SEARCH_PATHS = (
365+
"$(inherited)",
366+
"@executable_path/Frameworks",
367+
);
361368
PRODUCT_BUNDLE_IDENTIFIER = "com.alisoftware.$(PRODUCT_NAME:rfc1034identifier)";
362369
PRODUCT_NAME = "$(TARGET_NAME)";
363370
};
@@ -369,8 +376,11 @@
369376
buildSettings = {
370377
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
371378
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/Info.plist";
372-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
373-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
379+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
380+
LD_RUNPATH_SEARCH_PATHS = (
381+
"$(inherited)",
382+
"@executable_path/Frameworks",
383+
);
374384
PRODUCT_BUNDLE_IDENTIFIER = "com.alisoftware.$(PRODUCT_NAME:rfc1034identifier)";
375385
PRODUCT_NAME = "$(TARGET_NAME)";
376386
};

Examples/Swift/OHHTTPStubsDemo.xcodeproj/xcshareddata/xcschemes/OHHTTPStubsDemo.xcscheme

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
4-
version = "1.3">
3+
LastUpgradeVersion = "1520"
4+
version = "1.8">
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">

Examples/Swift/Pods/Pods.xcodeproj/project.pbxproj

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

Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs.xcconfig

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)