Fix compile error on Xcode 12 for iOS 14 (#630)

fluttercandies · Oct 20, 2021 · e4569f1 · e4569f1
1 parent f4b9a1a
commit e4569f1
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
@@ -1,6 +1,10 @@
 name: Build test
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
 
 jobs:
   test_iOS:
@@ -21,6 +25,7 @@ jobs:
       - run: flutter pub get
       - run: flutter pub publish --dry-run
       - run: flutter analyze lib example/lib
+      - run: /usr/bin/xcodebuild -version
       - run: cd example ; flutter build ios --no-codesign
 
   test_macOS:
@@ -37,11 +42,12 @@ jobs:
       - uses: subosito/flutter-action@v1
         with:
           channel: stable
+      - run: flutter config --enable-macos-desktop
       - run: ./copy_on_publish.sh
       - run: flutter pub get
       - run: flutter pub publish --dry-run
       - run: flutter analyze lib example/lib
-      - run: flutter config --enable-macos-desktop
+      - run: /usr/bin/xcodebuild -version
       - run: cd example ; flutter build macos --debug
 
   test_android:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.3.9+1
+Fixes:
+- Fix compile error on Xcode 12 for iOS 14. (#630)
+
 ## 1.3.9
 Fixes:
 - Fix `presentLimited` issues on iOS 14 real devices. (#627)

diff --git a/ios/Classes/PMPlugin.m b/ios/Classes/PMPlugin.m
@@ -145,7 +145,7 @@ - (void)requestPermissionStatus:(int)requestAccessLevel
 }
 
 - (void)presentLimited:(ResultHandler*)handler {
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_14_0
+#if __IPHONE_14_0
     if (@available(iOS 14, *)) {
         UIViewController* controller = [self getCurrentViewController];
         if (!controller) {
@@ -155,7 +155,7 @@ - (void)presentLimited:(ResultHandler*)handler {
                             details:nil]];
             return;
         }
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_15_0
+#if __IPHONE_15_0
         if (@available(iOS 15, *)) {
             [PHPhotoLibrary.sharedPhotoLibrary
              presentLimitedLibraryPickerFromViewController: controller
@@ -170,17 +170,19 @@ - (void)presentLimited:(ResultHandler*)handler {
         [PHPhotoLibrary.sharedPhotoLibrary presentLimitedLibraryPickerFromViewController: controller];
         [handler reply:nil];
 #endif
+        return;
     }
-#endif
+#else
     [handler reply:nil];
+#endif
 }
 #endif
 
 #if TARGET_OS_OSX
 - (void)handlePermission:(PMManager *)manager
                  handler:(ResultHandler*)handler
       requestAccessLevel:(int)requestAccessLevel {
-#if __MAC_OS_VERSION_MAX_ALLOWED >= __MAC_11_0
+#if __MAC_11_0
     if (@available(macOS 11.0, *)) {
         [PHPhotoLibrary requestAuthorizationForAccessLevel:requestAccessLevel handler:^(PHAuthorizationStatus status) {
             [self replyPermssionResult:handler status:status];
@@ -199,7 +201,7 @@ - (void)handlePermission:(PMManager *)manager
 
 - (void)requestPermissionStatus:(int)requestAccessLevel
                 completeHandler:(void (^)(PHAuthorizationStatus status))completeHandler {
-#if __MAC_OS_VERSION_MAX_ALLOWED >= __MAC_11_0
+#if __MAC_11_0
     if (@available(macOS 11.0, *)) {
         [PHPhotoLibrary requestAuthorizationForAccessLevel:requestAccessLevel handler:^(PHAuthorizationStatus status) {
             completeHandler(status);

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: photo_manager
 description: You can scan photos and albums. Only api, not have ui. you can use the api to create your image picker. or use photo
-version: 1.3.9
+version: 1.3.9+1
 homepage: https://github.com/CaiJingLong/flutter_photo_manager
 # author: caijinglong<cjl_spy@163.com>