Skip to content

Commit e659287

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

File tree

6 files changed

+25
-240
lines changed

6 files changed

+25
-240
lines changed

Examples/ObjC/MainViewController.m

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ - (IBAction)downloadText:(UIButton*)sender
7373
NSURLRequest* req = [NSURLRequest requestWithURL:[NSURL URLWithString:urlString]];
7474

7575
// This is a very handy way to send an asynchronous method, but only available in iOS5+
76-
[NSURLConnection sendAsynchronousRequest:req
77-
queue:[NSOperationQueue mainQueue]
78-
completionHandler:^(NSURLResponse* resp, NSData* data, NSError* error)
79-
{
80-
sender.enabled = YES;
81-
NSString* receivedText = [[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding];
82-
self.textView.text = receivedText;
83-
}];
76+
[[[NSURLSession sharedSession] dataTaskWithRequest:req
77+
completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
78+
dispatch_async(dispatch_get_main_queue(), ^{
79+
sender.enabled = YES;
80+
NSString* receivedText = [[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding];
81+
self.textView.text = receivedText;
82+
});
83+
}] resume];
8484
}
8585

8686

@@ -124,15 +124,13 @@ - (IBAction)downloadImage:(UIButton*)sender
124124
NSURLRequest* req = [NSURLRequest requestWithURL:[NSURL URLWithString:urlString]];
125125

126126
// This is a very handy way to send an asynchronous method, but only available in iOS5+
127-
[NSURLConnection sendAsynchronousRequest:req
128-
queue:[NSOperationQueue mainQueue]
129-
completionHandler:^(NSURLResponse* resp, NSData* data, NSError* error)
130-
{
131-
dispatch_async(dispatch_get_main_queue(), ^{
127+
[[[NSURLSession sharedSession] dataTaskWithRequest:req
128+
completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
129+
dispatch_async(dispatch_get_main_queue(), ^{
132130
sender.enabled = YES;
133131
self.imageView.image = [UIImage imageWithData:data];
134-
});
135-
}];
132+
});
133+
}] resume];
136134
}
137135

138136
- (IBAction)installImageStub:(UISwitch *)sender

Examples/ObjC/OHHTTPStubsDemo.xcodeproj/project.pbxproj

Lines changed: 11 additions & 4 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 */
@@ -157,7 +157,8 @@
157157
098FBDC615D704E800623941 /* Project object */ = {
158158
isa = PBXProject;
159159
attributes = {
160-
LastUpgradeCheck = 1020;
160+
BuildIndependentTargetsInParallel = YES;
161+
LastUpgradeCheck = 1520;
161162
ORGANIZATIONNAME = AliSoftware;
162163
TargetAttributes = {
163164
098FBDCE15D704E800623941 = {
@@ -249,6 +250,7 @@
249250
CLANG_WARN_INFINITE_RECURSION = YES;
250251
CLANG_WARN_INT_CONVERSION = YES;
251252
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
253+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
252254
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
253255
CLANG_WARN_STRICT_PROTOTYPES = YES;
254256
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
@@ -259,6 +261,7 @@
259261
COPY_PHASE_STRIP = NO;
260262
ENABLE_STRICT_OBJC_MSGSEND = YES;
261263
ENABLE_TESTABILITY = YES;
264+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
262265
GCC_C_LANGUAGE_STANDARD = gnu99;
263266
GCC_DYNAMIC_NO_PIC = NO;
264267
GCC_NO_COMMON_BLOCKS = YES;
@@ -282,7 +285,7 @@
282285
GCC_WARN_UNKNOWN_PRAGMAS = YES;
283286
GCC_WARN_UNUSED_FUNCTION = YES;
284287
GCC_WARN_UNUSED_VARIABLE = YES;
285-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
288+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
286289
ONLY_ACTIVE_ARCH = YES;
287290
OTHER_LDFLAGS = "-ObjC";
288291
SDKROOT = iphoneos;
@@ -307,6 +310,7 @@
307310
CLANG_WARN_INFINITE_RECURSION = YES;
308311
CLANG_WARN_INT_CONVERSION = YES;
309312
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
313+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
310314
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
311315
CLANG_WARN_STRICT_PROTOTYPES = YES;
312316
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
@@ -316,6 +320,7 @@
316320
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
317321
COPY_PHASE_STRIP = YES;
318322
ENABLE_STRICT_OBJC_MSGSEND = YES;
323+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
319324
GCC_C_LANGUAGE_STANDARD = gnu99;
320325
GCC_NO_COMMON_BLOCKS = YES;
321326
GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
@@ -332,7 +337,7 @@
332337
GCC_WARN_UNKNOWN_PRAGMAS = YES;
333338
GCC_WARN_UNUSED_FUNCTION = YES;
334339
GCC_WARN_UNUSED_VARIABLE = YES;
335-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
340+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
336341
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
337342
OTHER_LDFLAGS = "-ObjC";
338343
SDKROOT = iphoneos;
@@ -348,6 +353,7 @@
348353
GCC_PRECOMPILE_PREFIX_HEADER = YES;
349354
GCC_PREFIX_HEADER = "Supporting Files/OHHTTPStubsDemo-Prefix.pch";
350355
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/OHHTTPStubsDemo-Info.plist";
356+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
351357
PRODUCT_BUNDLE_IDENTIFIER = "com.alisoftware.${PRODUCT_NAME:rfc1034identifier}";
352358
PRODUCT_NAME = "$(TARGET_NAME)";
353359
WRAPPER_EXTENSION = app;
@@ -362,6 +368,7 @@
362368
GCC_PRECOMPILE_PREFIX_HEADER = YES;
363369
GCC_PREFIX_HEADER = "Supporting Files/OHHTTPStubsDemo-Prefix.pch";
364370
INFOPLIST_FILE = "$(SRCROOT)/Supporting Files/OHHTTPStubsDemo-Info.plist";
371+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
365372
PRODUCT_BUNDLE_IDENTIFIER = "com.alisoftware.${PRODUCT_NAME:rfc1034identifier}";
366373
PRODUCT_NAME = "$(TARGET_NAME)";
367374
WRAPPER_EXTENSION = app;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1520"
44
version = "2.0">
55
<BuildAction
66
parallelizeBuildables = "YES"

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

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

Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo-frameworks.sh

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

Examples/ObjC/Pods/Target Support Files/Pods-OHHTTPStubsDemo/Pods-OHHTTPStubsDemo-resources.sh

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

0 commit comments

Comments
 (0)