fix: gh-action failing to find isiOSAppOnMac on processInfo

apache · Apr 6, 2022 · 8938cf7 · 8938cf7
1 parent 396e8c7
commit 8938cf7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/src/ios/CDVDevice.m b/src/ios/CDVDevice.m
@@ -21,6 +21,8 @@ Licensed to the Apache Software Foundation (ASF) under one
 #include <sys/sysctl.h>
 #include "TargetConditionals.h"
 
+#import <Availability.h>
+
 #import <Cordova/CDV.h>
 #import "CDVDevice.h"
 
@@ -116,12 +118,13 @@ - (BOOL)isVirtual
 
 - (BOOL) isiOSAppOnMac
 {
+    #if __IPHONE_14_0
     if (@available(iOS 14.0, *)) {
-        return [NSProcessInfo processInfo].isiOSAppOnMac;
-    } else {
-        // Fallback on earlier versions, and platforms
-        return false;
+        return [[NSProcessInfo processInfo] isiOSAppOnMac];
     }
+    #endif
+
+    return false;
 }
 
 @end
diff --git a/src/osx/CDVDevice.m b/src/osx/CDVDevice.m
@@ -19,6 +19,8 @@ Licensed to the Apache Software Foundation (ASF) under one
 
 #include <sys/sysctl.h>
 
+#import <Availability.h>
+
 #import "CDVDevice.h"
 
 #define SYSTEM_VERSION_PLIST    @"/System/Library/CoreServices/SystemVersion.plist"
@@ -110,13 +112,15 @@ + (NSString*) cordovaVersion {
     return CDV_VERSION;
 }
 
-+ (BOOL) isiOSAppOnMac {
+- (BOOL) isiOSAppOnMac
+{
+    #if __IPHONE_14_0
     if (@available(iOS 14.0, *)) {
-        return [NSProcessInfo processInfo].isiOSAppOnMac;
-    } else {
-        // Fallback on earlier versions and platforms
-        return false;
+        return [[NSProcessInfo processInfo] isiOSAppOnMac];
     }
+    #endif
+
+    return false;
 }
 
 @end