From a6fae662629e174b5fae1fc0c86f8aaaf2655db3 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Wed, 16 Sep 2020 19:32:29 +0800
Subject: [PATCH] update for Xcode 12 GM, iOS Deployment Target 9.0

---
 China.xcodeproj/project.pbxproj               | 16 ++++++++----
 .../xcschemes/MonkeyKing.xcscheme             |  2 +-
 China/AlipayViewController.swift              | 25 +++++++++++--------
 China/WeChatViewController.swift              | 22 +++++++++-------
 4 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/China.xcodeproj/project.pbxproj b/China.xcodeproj/project.pbxproj
index bf05e07..953c836 100644
--- a/China.xcodeproj/project.pbxproj
+++ b/China.xcodeproj/project.pbxproj
@@ -280,7 +280,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 1120;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = nixWork;
 				TargetAttributes = {
 					50FBA6B41BA2AFAD00E69BB3 = {
@@ -432,6 +432,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -456,7 +457,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -491,6 +492,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -509,7 +511,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -572,14 +574,16 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = MonkeyKing/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MARKETING_VERSION = 1.16.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nixWork.MonkeyKing;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SUPPORTS_MACCATALYST = NO;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -598,13 +602,15 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = MonkeyKing/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MARKETING_VERSION = 1.16.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.nixWork.MonkeyKing;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SUPPORTS_MACCATALYST = NO;
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
diff --git a/China.xcodeproj/xcshareddata/xcschemes/MonkeyKing.xcscheme b/China.xcodeproj/xcshareddata/xcschemes/MonkeyKing.xcscheme
index 669f314..66ff0af 100644
--- a/China.xcodeproj/xcshareddata/xcschemes/MonkeyKing.xcscheme
+++ b/China.xcodeproj/xcshareddata/xcschemes/MonkeyKing.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1120"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/China/AlipayViewController.swift b/China/AlipayViewController.swift
index 2cc05da..1b3962f 100644
--- a/China/AlipayViewController.swift
+++ b/China/AlipayViewController.swift
@@ -75,18 +75,23 @@ class AlipayViewController: UIViewController {
     // MARK: Pay
 
     @IBAction func pay(_ sender: UIButton) {
-        do {
-            registerAccount()
-            let data = try NSURLConnection.sendSynchronousRequest(URLRequest(url: URL(string: "https://www.example.com/pay.php?payType=alipay")!), returning: nil)
-            let urlString = String(data: data, encoding: .utf8)!
-            let url = URL(string: urlString)!
-            let order = MonkeyKing.Order.alipay(url: url)
-            MonkeyKing.deliver(order) { result in
-                print("result: \(result)")
+        registerAccount()
+
+        let request = URLRequest(url: URL(string: "https://www.example.com/pay.php?payType=alipay")!)
+        let task = URLSession.shared.dataTask(with: request) { data, _, error in
+            if let error = error {
+                print(error)
+            } else {
+                guard let data = data else { return }
+                guard let urlString = String(data: data, encoding: .utf8) else { return }
+                guard let url = URL(string: urlString) else { return }
+
+                MonkeyKing.deliver(.alipay(url: url)) { result in
+                    print("result:", result)
+                }
             }
-        } catch {
-            print(error)
         }
+        task.resume()
     }
 
     // MARK: Oauth
diff --git a/China/WeChatViewController.swift b/China/WeChatViewController.swift
index 043f2ce..6fe27b6 100644
--- a/China/WeChatViewController.swift
+++ b/China/WeChatViewController.swift
@@ -185,17 +185,21 @@ extension WeChatViewController {
 extension WeChatViewController {
 
     @IBAction func pay(_ sender: UIButton) {
-        do {
-            let data = try NSURLConnection.sendSynchronousRequest(URLRequest(url: URL(string: "http://www.example.com/pay.php?payType=weixin")!), returning: nil)
-            let urlString = String(data: data, encoding: .utf8)!
-            let url = URL(string: urlString)!
-            let order = MonkeyKing.Order.weChat(url: url)
-            MonkeyKing.deliver(order) { result in
-                print("result: \(result)")
+        let request = URLRequest(url: URL(string: "http://www.example.com/pay.php?payType=weixin")!)
+        let task = URLSession.shared.dataTask(with: request) { data, _, error in
+            if let error = error {
+                print(error)
+            } else {
+                guard let data = data else { return }
+                guard let urlString = String(data: data, encoding: .utf8) else { return }
+                guard let url = URL(string: urlString) else { return }
+
+                MonkeyKing.deliver(.weChat(url: url)) { result in
+                    print("result:", result)
+                }
             }
-        } catch {
-            print(error)
         }
+        task.resume()
     }
 }