From 9eacb6eb1b5af5c8a303d948e923cd5f3226e3ad Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Fri, 17 Dec 2021 10:59:07 +0100 Subject: [PATCH] Set iOS min supported version to 11.0 --- .../app-mobile/ios/Joplin.xcodeproj/project.pbxproj | 12 ++++++------ packages/app-mobile/ios/Podfile | 5 ++++- packages/app-mobile/ios/Podfile.lock | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj b/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj index 42dc38a5a5..f64c5c5e91 100644 --- a/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj +++ b/packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj @@ -496,7 +496,7 @@ DEVELOPMENT_TEAM = A9BXAFS6CT; ENABLE_BITCODE = NO; INFOPLIST_FILE = Joplin/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 12.6.1; OTHER_LDFLAGS = ( @@ -524,7 +524,7 @@ CURRENT_PROJECT_VERSION = 78; DEVELOPMENT_TEAM = A9BXAFS6CT; INFOPLIST_FILE = Joplin/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 12.6.1; OTHER_LDFLAGS = ( @@ -588,7 +588,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 = 11.0; LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)"; LIBRARY_SEARCH_PATHS = ( "\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"", @@ -641,7 +641,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 = 11.0; LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)"; LIBRARY_SEARCH_PATHS = ( "\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"", @@ -672,7 +672,7 @@ DEVELOPMENT_TEAM = A9BXAFS6CT; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = ShareExtension/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; MARKETING_VERSION = 12.6.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; @@ -703,7 +703,7 @@ DEVELOPMENT_TEAM = A9BXAFS6CT; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = ShareExtension/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; MARKETING_VERSION = 12.6.1; MTL_FAST_MATH = YES; diff --git a/packages/app-mobile/ios/Podfile b/packages/app-mobile/ios/Podfile index 21485de820..d225d4c471 100644 --- a/packages/app-mobile/ios/Podfile +++ b/packages/app-mobile/ios/Podfile @@ -6,7 +6,10 @@ require_relative '../node_modules/@react-native-community/cli-platform-ios/nativ # # 2021-11-04: Set to 13.0 because it crashes with 12.x # https://github.com/laurent22/joplin/issues/5671 -platform :ios, '13.0' +# +# 2021-12-17: Changed back to 11.0 because after the fix it works with at least +# 12.x, and probably 11.0 too, which is the version supported by React Native. +platform :ios, '11.0' target 'Joplin' do config = use_native_modules! diff --git a/packages/app-mobile/ios/Podfile.lock b/packages/app-mobile/ios/Podfile.lock index a35d056952..132a2b3a28 100644 --- a/packages/app-mobile/ios/Podfile.lock +++ b/packages/app-mobile/ios/Podfile.lock @@ -565,6 +565,6 @@ SPEC CHECKSUMS: RNVectorIcons: bc69e6a278b14842063605de32bec61f0b251a59 Yoga: 2b4a01651f42a32f82e6cef3830a3ba48088237f -PODFILE CHECKSUM: 3ccf11f600ddb42a825b2bb9a341a19f5c891f2b +PODFILE CHECKSUM: 3503e0565874e79261edc56dcddb35b3a49a2984 COCOAPODS: 1.10.2