diff --git a/packages/device_info_plus/device_info_plus/.gitignore b/packages/device_info_plus/device_info_plus/.gitignore index ece9169b44..ae982492cb 100644 --- a/packages/device_info_plus/device_info_plus/.gitignore +++ b/packages/device_info_plus/device_info_plus/.gitignore @@ -13,6 +13,8 @@ examples/all_plugins/pubspec.yaml .build/ Podfile +!example/ios/Podfile +!example/macos/Podfile Podfile.lock Pods/ .swiftpm/ diff --git a/packages/device_info_plus/device_info_plus/example/ios/Podfile b/packages/device_info_plus/device_info_plus/example/ios/Podfile new file mode 100644 index 0000000000..d5049d3239 --- /dev/null +++ b/packages/device_info_plus/device_info_plus/example/ios/Podfile @@ -0,0 +1 @@ +platform :ios, '15.0' \ No newline at end of file diff --git a/packages/device_info_plus/device_info_plus/example/ios/Runner.xcodeproj/project.pbxproj b/packages/device_info_plus/device_info_plus/example/ios/Runner.xcodeproj/project.pbxproj index e52dbe9053..d4c1006027 100644 --- a/packages/device_info_plus/device_info_plus/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/device_info_plus/device_info_plus/example/ios/Runner.xcodeproj/project.pbxproj @@ -451,7 +451,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -469,7 +469,7 @@ CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -579,7 +579,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -628,7 +628,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -648,7 +648,7 @@ CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -671,7 +671,7 @@ CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/packages/device_info_plus/device_info_plus/example/macos/Podfile b/packages/device_info_plus/device_info_plus/example/macos/Podfile new file mode 100644 index 0000000000..de318b71e0 --- /dev/null +++ b/packages/device_info_plus/device_info_plus/example/macos/Podfile @@ -0,0 +1 @@ +platform :osx, '15.0' \ No newline at end of file diff --git a/packages/device_info_plus/device_info_plus/example/macos/Runner.xcodeproj/project.pbxproj b/packages/device_info_plus/device_info_plus/example/macos/Runner.xcodeproj/project.pbxproj index 17738f85dc..43ee3cd2de 100644 --- a/packages/device_info_plus/device_info_plus/example/macos/Runner.xcodeproj/project.pbxproj +++ b/packages/device_info_plus/device_info_plus/example/macos/Runner.xcodeproj/project.pbxproj @@ -553,7 +553,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; @@ -632,7 +632,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -679,7 +679,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; diff --git a/packages/device_info_plus/device_info_plus/ios/device_info_plus.podspec b/packages/device_info_plus/device_info_plus/ios/device_info_plus.podspec index 6038dd2988..af9c4c44d5 100644 --- a/packages/device_info_plus/device_info_plus/ios/device_info_plus.podspec +++ b/packages/device_info_plus/device_info_plus/ios/device_info_plus.podspec @@ -17,7 +17,7 @@ Downloaded by pub (not CocoaPods). s.source_files = 'device_info_plus/Sources/device_info_plus/**/*.{h,m}' s.public_header_files = 'device_info_plus/Sources/device_info_plus/include/**/*.h' s.dependency 'Flutter' - s.platform = :ios, '12.0' + s.platform = :ios, '15.0' s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } s.resource_bundles = {'device_info_plus_privacy' => ['device_info_plus/Sources/device_info_plus/PrivacyInfo.xcprivacy']} end diff --git a/packages/device_info_plus/device_info_plus/ios/device_info_plus/Sources/device_info_plus/FPPDeviceInfoPlusPlugin.m b/packages/device_info_plus/device_info_plus/ios/device_info_plus/Sources/device_info_plus/FPPDeviceInfoPlusPlugin.m index 83a9a00e75..7dad780768 100644 --- a/packages/device_info_plus/device_info_plus/ios/device_info_plus/Sources/device_info_plus/FPPDeviceInfoPlusPlugin.m +++ b/packages/device_info_plus/device_info_plus/ios/device_info_plus/Sources/device_info_plus/FPPDeviceInfoPlusPlugin.m @@ -31,8 +31,16 @@ - (void)handleMethodCall:(FlutterMethodCall *)call isiOSAppOnMac = [NSNumber numberWithBool:[info isiOSAppOnMac]]; } NSNumber *isiOSAppOnVision = [NSNumber numberWithBool:NO]; - if (@available(iOS 26.1, *)) { - isiOSAppOnVision = [NSNumber numberWithBool:[info isiOSAppOnVision]]; + if (@available(iOS 15.0, *)) { + if (@available(iOS 26.1, *)) { + SEL isiOSAppOnVisionSelector = NSSelectorFromString(@"isiOSAppOnVision"); + if ([info respondsToSelector:isiOSAppOnVisionSelector]) { + BOOL (*isiOSAppOnVisionIMP)(id, SEL) = + (BOOL (*)(id, SEL))[info methodForSelector:isiOSAppOnVisionSelector]; + isiOSAppOnVision = + [NSNumber numberWithBool:isiOSAppOnVisionIMP(info, isiOSAppOnVisionSelector)]; + } + } } NSError *error = nil; NSDictionary *fsAttributes = [[NSFileManager defaultManager] attributesOfFileSystemForPath:NSHomeDirectory() error:&error]; diff --git a/packages/device_info_plus/device_info_plus/macos/device_info_plus.podspec b/packages/device_info_plus/device_info_plus/macos/device_info_plus.podspec index a5031bea80..63da1d364a 100644 --- a/packages/device_info_plus/device_info_plus/macos/device_info_plus.podspec +++ b/packages/device_info_plus/device_info_plus/macos/device_info_plus.podspec @@ -18,6 +18,6 @@ https://github.com/flutter/flutter/issues/46618 s.dependency 'FlutterMacOS' s.platform = :osx - s.osx.deployment_target = '10.14' + s.osx.deployment_target = '15.0' s.resource_bundles = {'device_info_plus_privacy' => ['device_info_plus/Sources/device_info_plus/PrivacyInfo.xcprivacy']} end