Merge pull request #315 from XiaopingSun/versionUpdate

longbai · web-flow · commit 2699c6ac22eb · 2020-01-04T22:44:29.000+08:00
compatibility for mac os
diff --git a/QiniuSDK.xcodeproj/xcshareddata/xcschemes/QiniuSDK_Mac.xcscheme b/QiniuSDK.xcodeproj/xcshareddata/xcschemes/QiniuSDK_Mac.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1130"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -28,16 +28,6 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "DF2CDE0919DAC05500CE01FB"
-               BuildableName = "QiniuSDK_MacTests.xctest"
-               BlueprintName = "QiniuSDK_MacTests"
-               ReferencedContainer = "container:QiniuSDK.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
@@ -66,13 +56,6 @@
             ReferencedContainer = "container:QiniuSDK.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">
diff --git a/QiniuSDK/Common/QNALAssetFile.h b/QiniuSDK/Common/QNALAssetFile.h
@@ -11,6 +11,7 @@
 #import "QNFileDelegate.h"
 
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED)
+#if !TARGET_OS_MACCATALYST
 @class ALAsset;
 @interface QNALAssetFile : NSObject <QNFileDelegate>
 
@@ -26,3 +27,4 @@
                error:(NSError *__autoreleasing *)error;
 @end
 #endif
+#endif
diff --git a/QiniuSDK/Common/QNALAssetFile.m b/QiniuSDK/Common/QNALAssetFile.m
@@ -9,8 +9,8 @@
 #import "QNALAssetFile.h"
 
 #ifdef __IPHONE_OS_VERSION_MAX_ALLOWED
+#if !TARGET_OS_MACCATALYST
 #import <AssetsLibrary/AssetsLibrary.h>
-
 #import "QNResponseInfo.h"
 
 @interface QNALAssetFile ()
@@ -84,3 +84,4 @@ - (int64_t)size {
 }
 @end
 #endif
+#endif
diff --git a/QiniuSDK/Common/QNPHAssetFile.h b/QiniuSDK/Common/QNPHAssetFile.h
@@ -10,7 +10,8 @@
 
 #import "QNFileDelegate.h"
 
-API_AVAILABLE_BEGIN(macos(10.13), ios(9.1), tvos(10))
+API_AVAILABLE_BEGIN(ios(9.1))
+API_UNAVAILABLE_BEGIN(macos, tvos)
 
 @class PHAsset;
 @interface QNPHAssetFile : NSObject <QNFileDelegate>
@@ -27,3 +28,4 @@ API_AVAILABLE_BEGIN(macos(10.13), ios(9.1), tvos(10))
 @end
 
 API_AVAILABLE_END
+API_UNAVAILABLE_END
diff --git a/QiniuSDK/Common/QNPHAssetFile.m b/QiniuSDK/Common/QNPHAssetFile.m
@@ -11,6 +11,8 @@
 #import <Photos/Photos.h>
 #import "QNResponseInfo.h"
 
+#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 90100)
+
 @interface QNPHAssetFile ()
 
 @property (nonatomic) PHAsset *phAsset;
@@ -180,3 +182,5 @@ - (NSString *)getInfo {
 }
 
 @end
+
+#endif
diff --git a/QiniuSDK/Common/QNPHAssetResource.h b/QiniuSDK/Common/QNPHAssetResource.h
@@ -10,7 +10,8 @@
 
 #import "QNFileDelegate.h"
 
-API_AVAILABLE_BEGIN(macos(10.15), ios(9), tvos(10))
+API_AVAILABLE_BEGIN(ios(9))
+API_UNAVAILABLE_BEGIN(macos, tvos)
 
 @class PHAssetResource;
 
@@ -30,3 +31,4 @@ API_AVAILABLE_BEGIN(macos(10.15), ios(9), tvos(10))
 @end
 
 API_AVAILABLE_END
+API_UNAVAILABLE_END
diff --git a/QiniuSDK/Common/QNPHAssetResource.m b/QiniuSDK/Common/QNPHAssetResource.m
@@ -11,6 +11,8 @@
 #import <Photos/Photos.h>
 #import "QNResponseInfo.h"
 
+#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 90000)
+
 enum {
     kAMASSETMETADATA_PENDINGREADS = 1,
     kAMASSETMETADATA_ALLFINISHED = 0
@@ -167,3 +169,5 @@ - (NSData *)fetchDataFromAsset:(PHAssetResource *)videoResource error:(NSError *
 }
 
 @end
+
+#endif
diff --git a/QiniuSDK/Storage/QNUploadManager.h b/QiniuSDK/Storage/QNUploadManager.h
@@ -13,10 +13,13 @@
 @class QNResponseInfo;
 @class QNUploadOption;
 @class QNConfiguration;
-@class ALAsset;
 @class PHAsset;
 @class PHAssetResource;
 
+#if !TARGET_OS_MACCATALYST
+@class ALAsset;
+#endif
+
 /**
  *    上传完成后的回调函数
  *
@@ -106,6 +109,7 @@ typedef void (^QNUpCompletionHandler)(QNResponseInfo *info, NSString *key, NSDic
        complete:(QNUpCompletionHandler)completionHandler
          option:(QNUploadOption *)option;
 
+#if !TARGET_OS_MACCATALYST
 /**
  *    上传ALAsset文件
  *
@@ -119,7 +123,8 @@ typedef void (^QNUpCompletionHandler)(QNResponseInfo *info, NSString *key, NSDic
                key:(NSString *)key
              token:(NSString *)token
           complete:(QNUpCompletionHandler)completionHandler
-            option:(QNUploadOption *)option;
+            option:(QNUploadOption *)option API_UNAVAILABLE(macos, tvos);
+#endif
 
 /**
  *    上传PHAsset文件(IOS8 andLater)
@@ -134,7 +139,7 @@ typedef void (^QNUpCompletionHandler)(QNResponseInfo *info, NSString *key, NSDic
                key:(NSString *)key
              token:(NSString *)token
           complete:(QNUpCompletionHandler)completionHandler
-            option:(QNUploadOption *)option API_AVAILABLE(macos(10.15), ios(9.1), tvos(10));
+            option:(QNUploadOption *)option API_AVAILABLE(ios(9.1)) API_UNAVAILABLE(macos, tvos);
 
 /**
  *    上传PHAssetResource文件(IOS9.1 andLater)
@@ -150,6 +155,6 @@ typedef void (^QNUpCompletionHandler)(QNResponseInfo *info, NSString *key, NSDic
                        key:(NSString *)key
                      token:(NSString *)token
                   complete:(QNUpCompletionHandler)completionHandler
-                    option:(QNUploadOption *)option API_AVAILABLE(macos(10.15), ios(9), tvos(10));
+                    option:(QNUploadOption *)option API_AVAILABLE(ios(9)) API_UNAVAILABLE(macos, tvos);
 
 @end
diff --git a/QiniuSDK/Storage/QNUploadManager.m b/QiniuSDK/Storage/QNUploadManager.m
@@ -9,17 +9,20 @@
 #import <Foundation/Foundation.h>
 
 #if __IPHONE_OS_VERSION_MIN_REQUIRED
-#import "QNALAssetFile.h"
-#import <AssetsLibrary/AssetsLibrary.h>
 #import <MobileCoreServices/MobileCoreServices.h>
 #import <UIKit/UIKit.h>
 
+#if !TARGET_OS_MACCATALYST
+#import <AssetsLibrary/AssetsLibrary.h>
+#import "QNALAssetFile.h"
+#endif
+
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000
 #import "QNPHAssetFile.h"
 #import <Photos/Photos.h>
 #endif
 
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 90100
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 90000
 #import "QNPHAssetResource.h"
 #endif
 
@@ -279,11 +282,13 @@ - (void)putFile:(NSString *)filePath
     }
 }
 
+#if !TARGET_OS_MACCATALYST
 - (void)putALAsset:(ALAsset *)asset
                key:(NSString *)key
              token:(NSString *)token
           complete:(QNUpCompletionHandler)completionHandler
             option:(QNUploadOption *)option {
+#if __IPHONE_OS_VERSION_MIN_REQUIRED
     if ([QNUploadManager checkAndNotifyError:key token:token input:asset complete:completionHandler]) {
         return;
     }
@@ -300,13 +305,16 @@ - (void)putALAsset:(ALAsset *)asset
         }
         [self putFileInternal:file key:key token:token complete:completionHandler option:option];
     }
+#endif
 }
+#endif
 
 - (void)putPHAsset:(PHAsset *)asset
                key:(NSString *)key
              token:(NSString *)token
           complete:(QNUpCompletionHandler)completionHandler
             option:(QNUploadOption *)option {
+#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 90100)
     if ([QNUploadManager checkAndNotifyError:key token:token input:asset complete:completionHandler]) {
         return;
     }
@@ -323,13 +331,15 @@ - (void)putPHAsset:(PHAsset *)asset
         }
         [self putFileInternal:file key:key token:token complete:completionHandler option:option];
     }
+#endif
 }
 
 - (void)putPHAssetResource:(PHAssetResource *)assetResource
                        key:(NSString *)key
                      token:(NSString *)token
                   complete:(QNUpCompletionHandler)completionHandler
                     option:(QNUploadOption *)option {
+#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 90000)
     if ([QNUploadManager checkAndNotifyError:key token:token input:assetResource complete:completionHandler]) {
         return;
     }
@@ -345,6 +355,7 @@ - (void)putPHAssetResource:(PHAssetResource *)assetResource
         }
         [self putFileInternal:file key:key token:token complete:completionHandler option:option];
     }
+#endif
 }
 
 @end

Original file line number	Diff line number	Diff line change
`@@ -9,17 +9,20 @@`
`9`	`9`	`#import <Foundation/Foundation.h>`
`10`	`10`
`11`	`11`	`#if __IPHONE_OS_VERSION_MIN_REQUIRED`
`12`		`-#import "QNALAssetFile.h"`
`13`		`-#import <AssetsLibrary/AssetsLibrary.h>`
`14`	`12`	`#import <MobileCoreServices/MobileCoreServices.h>`
`15`	`13`	`#import <UIKit/UIKit.h>`
`16`	`14`
	`15`	`+#if !TARGET_OS_MACCATALYST`
	`16`	`+#import <AssetsLibrary/AssetsLibrary.h>`
	`17`	`+#import "QNALAssetFile.h"`
	`18`	`+#endif`
	`19`	`+`
`17`	`20`	`#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000`
`18`	`21`	`#import "QNPHAssetFile.h"`
`19`	`22`	`#import <Photos/Photos.h>`
`20`	`23`	`#endif`
`21`	`24`
`22`		`-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 90100`
	`25`	`+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 90000`
`23`	`26`	`#import "QNPHAssetResource.h"`
`24`	`27`	`#endif`
`25`	`28`
`@@ -279,11 +282,13 @@ - (void)putFile:(NSString *)filePath`
`279`	`282`	`}`
`280`	`283`	`}`
`281`	`284`
	`285`	`+#if !TARGET_OS_MACCATALYST`
`282`	`286`	`- (void)putALAsset:(ALAsset *)asset`
`283`	`287`	`key:(NSString *)key`
`284`	`288`	`token:(NSString *)token`
`285`	`289`	`complete:(QNUpCompletionHandler)completionHandler`
`286`	`290`	`option:(QNUploadOption *)option {`
	`291`	`+#if __IPHONE_OS_VERSION_MIN_REQUIRED`
`287`	`292`	`if ([QNUploadManager checkAndNotifyError:key token:token input:asset complete:completionHandler]) {`
`288`	`293`	`return;`
`289`	`294`	`}`
`@@ -300,13 +305,16 @@ - (void)putALAsset:(ALAsset *)asset`
`300`	`305`	`}`
`301`	`306`	`[self putFileInternal:file key:key token:token complete:completionHandler option:option];`
`302`	`307`	`}`
	`308`	`+#endif`
`303`	`309`	`}`
	`310`	`+#endif`
`304`	`311`
`305`	`312`	`- (void)putPHAsset:(PHAsset *)asset`
`306`	`313`	`key:(NSString *)key`
`307`	`314`	`token:(NSString *)token`
`308`	`315`	`complete:(QNUpCompletionHandler)completionHandler`
`309`	`316`	`option:(QNUploadOption *)option {`
	`317`	`+#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 90100)`
`310`	`318`	`if ([QNUploadManager checkAndNotifyError:key token:token input:asset complete:completionHandler]) {`
`311`	`319`	`return;`
`312`	`320`	`}`
`@@ -323,13 +331,15 @@ - (void)putPHAsset:(PHAsset *)asset`
`323`	`331`	`}`
`324`	`332`	`[self putFileInternal:file key:key token:token complete:completionHandler option:option];`
`325`	`333`	`}`
	`334`	`+#endif`
`326`	`335`	`}`
`327`	`336`
`328`	`337`	`- (void)putPHAssetResource:(PHAssetResource *)assetResource`
`329`	`338`	`key:(NSString *)key`
`330`	`339`	`token:(NSString *)token`
`331`	`340`	`complete:(QNUpCompletionHandler)completionHandler`
`332`	`341`	`option:(QNUploadOption *)option {`
	`342`	`+#if (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 90000)`
`333`	`343`	`if ([QNUploadManager checkAndNotifyError:key token:token input:assetResource complete:completionHandler]) {`
`334`	`344`	`return;`
`335`	`345`	`}`
`@@ -345,6 +355,7 @@ - (void)putPHAssetResource:(PHAssetResource *)assetResource`
`345`	`355`	`}`
`346`	`356`	`[self putFileInternal:file key:key token:token complete:completionHandler option:option];`
`347`	`357`	`}`
	`358`	`+#endif`
`348`	`359`	`}`
`349`	`360`
`350`	`361`	`@end`