Merge pull request #432 from zapcannon87/master

zapcannon87 · web-flow · commit c32ba456e967 · 2021-09-22T19:35:38.000+08:00
fix: support xcode 13
diff --git a/.version b/.version
@@ -1 +1 @@
-17.9.1
+17.9.2
diff --git a/LeanCloud.podspec b/LeanCloud.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'LeanCloud'
-  s.version      = '17.9.1'
+  s.version      = '17.9.2'
   s.license      = { :type => 'Apache License, Version 2.0', :file => 'LICENSE' }
   s.summary      = 'LeanCloud Swift SDK'
   s.homepage     = 'https://leancloud.cn/'
diff --git a/Sources/Foundation/Query.swift b/Sources/Foundation/Query.swift
@@ -551,11 +551,12 @@ public class LCQuery: NSObject, NSCopying, NSCoding {
         completionQueue: DispatchQueue = .main,
         completion: @escaping (LCQueryResult<T>) -> Void) -> LCRequest
     {
-        return self._find(cachePolicy: cachePolicy) { result in
+        let _completion: (LCQueryResult<T>) -> Void = { result in
             completionQueue.async {
                 completion(result)
             }
         }
+        return self._find(cachePolicy: cachePolicy, completion: _completion)
     }
     
     @discardableResult
@@ -624,11 +625,12 @@ public class LCQuery: NSObject, NSCopying, NSCoding {
         completionQueue: DispatchQueue = .main,
         completion: @escaping (LCValueResult<T>) -> Void) -> LCRequest
     {
-        return self._getFirst(cachePolicy: cachePolicy) { result in
+        let _completion: (LCValueResult<T>) -> Void = { result in
             completionQueue.async {
                 completion(result)
             }
         }
+        return self._getFirst(cachePolicy: cachePolicy, completion: _completion)
     }
     
     @discardableResult
@@ -701,14 +703,15 @@ public class LCQuery: NSObject, NSCopying, NSCoding {
         completionQueue: DispatchQueue = .main,
         completion: @escaping (LCValueResult<T>) -> Void) -> LCRequest
     {
-        return self._get(
-            objectId: objectId,
-            cachePolicy: cachePolicy)
-        { result in
+        let _completion: (LCValueResult<T>) -> Void = { result in
             completionQueue.async {
                 completion(result)
             }
         }
+        return self._get(
+            objectId: objectId,
+            cachePolicy: cachePolicy,
+            completion: _completion)
     }
     
     @discardableResult
diff --git a/Sources/Foundation/User.swift b/Sources/Foundation/User.swift
@@ -183,18 +183,18 @@ open class LCUser: LCObject {
         username: String,
         password: String,
         completionQueue: DispatchQueue = .main,
-        completion: @escaping (LCValueResult<User>) -> Void)
-        -> LCRequest
+        completion: @escaping (LCValueResult<User>) -> Void) -> LCRequest
     {
+        let completionInBackground: (LCValueResult<User>) -> Void = { result in
+            completionQueue.async {
+                completion(result)
+            }
+        }
         return self.logIn(
             application: application,
             username: username,
             password: password,
-            completionInBackground: { result in
-                completionQueue.async {
-                    completion(result)
-                }
-        })
+            completionInBackground: completionInBackground)
     }
 
     @discardableResult
@@ -245,18 +245,18 @@ open class LCUser: LCObject {
         email: String,
         password: String,
         completionQueue: DispatchQueue = .main,
-        completion: @escaping (LCValueResult<User>) -> Void)
-        -> LCRequest
+        completion: @escaping (LCValueResult<User>) -> Void) -> LCRequest
     {
+        let completionInBackground: (LCValueResult<User>) -> Void = { (result) in
+            completionQueue.async {
+                completion(result)
+            }
+        }
         return self.logIn(
             application: application,
             email: email,
             password: password,
-            completionInBackground: { (result) in
-                completionQueue.async {
-                    completion(result)
-                }
-        })
+            completionInBackground: completionInBackground)
     }
     
     @discardableResult
@@ -307,18 +307,18 @@ open class LCUser: LCObject {
         mobilePhoneNumber: String,
         password: String,
         completionQueue: DispatchQueue = .main,
-        completion: @escaping (LCValueResult<User>) -> Void)
-        -> LCRequest
+        completion: @escaping (LCValueResult<User>) -> Void) -> LCRequest
     {
+        let completionInBackground: (LCValueResult<User>) -> Void = { result in
+            completionQueue.async {
+                completion(result)
+            }
+        }
         return self.logIn(
             application: application,
             mobilePhoneNumber: mobilePhoneNumber,
             password: password,
-            completionInBackground: { result in
-                completionQueue.async {
-                    completion(result)
-                }
-        })
+            completionInBackground: completionInBackground)
     }
 
     @discardableResult
@@ -369,18 +369,18 @@ open class LCUser: LCObject {
         mobilePhoneNumber: String,
         verificationCode: String,
         completionQueue: DispatchQueue = .main,
-        completion: @escaping (LCValueResult<User>) -> Void)
-        -> LCRequest
+        completion: @escaping (LCValueResult<User>) -> Void) -> LCRequest
     {
+        let completionInBackground: (LCValueResult<User>) -> Void = { result in
+            completionQueue.async {
+                completion(result)
+            }
+        }
         return self.logIn(
             application: application,
             mobilePhoneNumber: mobilePhoneNumber,
             verificationCode: verificationCode,
-            completionInBackground: { result in
-                completionQueue.async {
-                    completion(result)
-                }
-        })
+            completionInBackground: completionInBackground)
     }
 
     @discardableResult
@@ -451,17 +451,17 @@ open class LCUser: LCObject {
         application: LCApplication = .default,
         sessionToken: String,
         completionQueue: DispatchQueue = .main,
-        completion: @escaping (LCValueResult<User>) -> Void)
-        -> LCRequest
+        completion: @escaping (LCValueResult<User>) -> Void) -> LCRequest
     {
+        let completionInBackground: (LCValueResult<User>) -> Void = { result in
+            completionQueue.async {
+                completion(result)
+            }
+        }
         return self.logIn(
             application: application,
             sessionToken: sessionToken,
-            completionInBackground: { result in
-                completionQueue.async {
-                    completion(result)
-                }
-        })
+            completionInBackground: completionInBackground)
     }
     
     @discardableResult
@@ -518,18 +518,18 @@ open class LCUser: LCObject {
         mobilePhoneNumber: String,
         verificationCode: String,
         completionQueue: DispatchQueue = .main,
-        completion: @escaping (LCValueResult<User>) -> Void)
-        -> LCRequest
+        completion: @escaping (LCValueResult<User>) -> Void) -> LCRequest
     {
+        let completionInBackground: (LCValueResult<User>) -> Void = { result in
+            completionQueue.async {
+                completion(result)
+            }
+        }
         return self.signUpOrLogIn(
             application: application,
             mobilePhoneNumber: mobilePhoneNumber,
             verificationCode: verificationCode,
-            completionInBackground: { result in
-                completionQueue.async {
-                    completion(result)
-                }
-        })
+            completionInBackground: completionInBackground)
     }
 
     @discardableResult
diff --git a/Sources/Foundation/Version.swift b/Sources/Foundation/Version.swift
@@ -9,5 +9,5 @@
 import Foundation
 
 public struct Version {
-    public static let versionString = "17.9.1"
+    public static let versionString = "17.9.2"
 }

Original file line number	Diff line number	Diff line change
`@@ -551,11 +551,12 @@ public class LCQuery: NSObject, NSCopying, NSCoding {`
`551`	`551`	`completionQueue: DispatchQueue = .main,`
`552`	`552`	`completion: @escaping (LCQueryResult<T>) -> Void) -> LCRequest`
`553`	`553`	`{`
`554`		`- return self._find(cachePolicy: cachePolicy) { result in`
	`554`	`+ let _completion: (LCQueryResult<T>) -> Void = { result in`
`555`	`555`	`completionQueue.async {`
`556`	`556`	`completion(result)`
`557`	`557`	`}`
`558`	`558`	`}`
	`559`	`+ return self._find(cachePolicy: cachePolicy, completion: _completion)`
`559`	`560`	`}`
`560`	`561`
`561`	`562`	`@discardableResult`
`@@ -624,11 +625,12 @@ public class LCQuery: NSObject, NSCopying, NSCoding {`
`624`	`625`	`completionQueue: DispatchQueue = .main,`
`625`	`626`	`completion: @escaping (LCValueResult<T>) -> Void) -> LCRequest`
`626`	`627`	`{`
`627`		`- return self._getFirst(cachePolicy: cachePolicy) { result in`
	`628`	`+ let _completion: (LCValueResult<T>) -> Void = { result in`
`628`	`629`	`completionQueue.async {`
`629`	`630`	`completion(result)`
`630`	`631`	`}`
`631`	`632`	`}`
	`633`	`+ return self._getFirst(cachePolicy: cachePolicy, completion: _completion)`
`632`	`634`	`}`
`633`	`635`
`634`	`636`	`@discardableResult`
`@@ -701,14 +703,15 @@ public class LCQuery: NSObject, NSCopying, NSCoding {`
`701`	`703`	`completionQueue: DispatchQueue = .main,`
`702`	`704`	`completion: @escaping (LCValueResult<T>) -> Void) -> LCRequest`
`703`	`705`	`{`
`704`		`- return self._get(`
`705`		`- objectId: objectId,`
`706`		`- cachePolicy: cachePolicy)`
`707`		`- { result in`
	`706`	`+ let _completion: (LCValueResult<T>) -> Void = { result in`
`708`	`707`	`completionQueue.async {`
`709`	`708`	`completion(result)`
`710`	`709`	`}`
`711`	`710`	`}`
	`711`	`+ return self._get(`
	`712`	`+ objectId: objectId,`
	`713`	`+ cachePolicy: cachePolicy,`
	`714`	`+ completion: _completion)`
`712`	`715`	`}`
`713`	`716`
`714`	`717`	`@discardableResult`
Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,5 @@`
`9`	`9`	`import Foundation`
`10`	`10`
`11`	`11`	`public struct Version {`
`12`		`- public static let versionString = "17.9.1"`
	`12`	`+ public static let versionString = "17.9.2"`
`13`	`13`	`}`