Merge pull request #581 from zapcannon87/master

release: 12.0.1
leancloud · Oct 16, 2019 · ecbdfd8 · ecbdfd8
2 parents 2e67cce + 01f548f
commit ecbdfd8
Show file tree

Hide file tree

Showing 39 changed files with 1,156 additions and 1,755 deletions.
diff --git a/AVOS/AVOS.xcodeproj/project.pbxproj b/AVOS/AVOS.xcodeproj/project.pbxproj
diff --git a/AVOS/AVOS.xcodeproj/xcshareddata/xcschemes/AVOSCloud-iOS.xcscheme b/AVOS/AVOS.xcodeproj/xcshareddata/xcschemes/AVOSCloud-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1110"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/AVOS/AVOS.xcodeproj/xcshareddata/xcschemes/AVOSCloud-iOSTests.xcscheme b/AVOS/AVOS.xcodeproj/xcshareddata/xcschemes/AVOSCloud-iOSTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1110"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/AVOS/AVOS.xcodeproj/xcshareddata/xcschemes/AVOSCloud-macOS.xcscheme b/AVOS/AVOS.xcodeproj/xcshareddata/xcschemes/AVOSCloud-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1110"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/AVOS/AVOS.xcodeproj/xcshareddata/xcschemes/AVOSCloud-tvOS.xcscheme b/AVOS/AVOS.xcodeproj/xcshareddata/xcschemes/AVOSCloud-tvOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1110"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/AVOS/AVOS.xcodeproj/xcshareddata/xcschemes/AVOSCloud-watchOS.xcscheme b/AVOS/AVOS.xcodeproj/xcshareddata/xcschemes/AVOSCloud-watchOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1110"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/AVOS/AVOS.xcodeproj/xcshareddata/xcschemes/AVOSCloudIM-iOS.xcscheme b/AVOS/AVOS.xcodeproj/xcshareddata/xcschemes/AVOSCloudIM-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1110"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/AVOS/AVOS.xcodeproj/xcshareddata/xcschemes/AVOSCloudIM-iOSTests.xcscheme b/AVOS/AVOS.xcodeproj/xcshareddata/xcschemes/AVOSCloudIM-iOSTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1110"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/AVOS/AVOS.xcodeproj/xcshareddata/xcschemes/AVOSCloudIM-macOS.xcscheme b/AVOS/AVOS.xcodeproj/xcshareddata/xcschemes/AVOSCloudIM-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1110"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/AVOS/AVOS.xcodeproj/xcshareddata/xcschemes/AVOSCloudLiveQuery-iOS.xcscheme b/AVOS/AVOS.xcodeproj/xcshareddata/xcschemes/AVOSCloudLiveQuery-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1110"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/AVOS/AVOS.xcodeproj/xcshareddata/xcschemes/AVOSCloudLiveQuery-iOSTests.xcscheme b/AVOS/AVOS.xcodeproj/xcshareddata/xcschemes/AVOSCloudLiveQuery-iOSTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1110"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/AVOS/AVOS.xcodeproj/xcshareddata/xcschemes/AVOSCloudLiveQuery-macOS.xcscheme b/AVOS/AVOS.xcodeproj/xcshareddata/xcschemes/AVOSCloudLiveQuery-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1110"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "838CE3361EC980DE00B24F5B"
+               BlueprintIdentifier = "D305F7E02355A02A00222EBC"
                BuildableName = "AVOSCloudLiveQuery.framework"
                BlueprintName = "AVOSCloudLiveQuery-macOS"
                ReferencedContainer = "container:AVOS.xcodeproj">
@@ -40,15 +40,6 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "838CE3361EC980DE00B24F5B"
-            BuildableName = "AVOSCloudLiveQuery.framework"
-            BlueprintName = "AVOSCloudLiveQuery-macOS"
-            ReferencedContainer = "container:AVOS.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -59,7 +50,7 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "838CE3361EC980DE00B24F5B"
+            BlueprintIdentifier = "D305F7E02355A02A00222EBC"
             BuildableName = "AVOSCloudLiveQuery.framework"
             BlueprintName = "AVOSCloudLiveQuery-macOS"
             ReferencedContainer = "container:AVOS.xcodeproj">

diff --git a/AVOS/AVOS.xcodeproj/xcshareddata/xcschemes/CLI.xcscheme b/AVOS/AVOS.xcodeproj/xcshareddata/xcschemes/CLI.xcscheme
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1110"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D305F7A62355760100222EBC"
+               BuildableName = "CLI"
+               BlueprintName = "CLI"
+               ReferencedContainer = "container:AVOS.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D305F7A62355760100222EBC"
+            BuildableName = "CLI"
+            BlueprintName = "CLI"
+            ReferencedContainer = "container:AVOS.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D305F7A62355760100222EBC"
+            BuildableName = "CLI"
+            BlueprintName = "CLI"
+            ReferencedContainer = "container:AVOS.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/AVOS/AVOSCloud/AVOSCloud.h b/AVOS/AVOSCloud/AVOSCloud.h
@@ -62,7 +62,7 @@
 // Router
 #import "LCRouter.h"
 
-#if TARGET_OS_IOS && !TARGET_OS_WATCH
+#if !TARGET_OS_WATCH
 // Analytics
 #import "AVAnalytics.h"
 #endif

diff --git a/AVOS/AVOSCloud/AVOSCloud.m b/AVOS/AVOSCloud/AVOSCloud.m
@@ -281,15 +281,14 @@ + (void)handleRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
 
 // MARK: - Deprecated
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-implementations"
 + (void)startNetworkStatistics {
     [[LCNetworkStatistics sharedInstance] start];
 }
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 + (void)setStorageType:(AVStorageType)storageType {}
 + (void)setServiceRegion:(AVServiceRegion)serviceRegion {}
-#pragma clang diagnostic pop
 
 +(void)requestSmsCodeWithPhoneNumber:(NSString *)phoneNumber
                             callback:(AVBooleanResultBlock)callback {
@@ -350,5 +349,6 @@ + (void)requestVoiceCodeWithPhoneNumber:(NSString *)phoneNumber
         [AVUtils callBooleanResultBlock:callback error:error];
     }];
 }
+#pragma clang diagnostic pop
 
 @end