From 4c435bc0fa93c43ffa4647a2fb3cecb80f62bed3 Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Wed, 9 Oct 2019 13:02:52 +0100 Subject: [PATCH 1/2] Update to iOS11 and Swift 5. --- Gutenberg.podspec | 4 ++-- ios/gutenberg.xcodeproj/project.pbxproj | 12 ++++++------ .../ios/RNTAztecView.xcodeproj/project.pbxproj | 10 +++++----- .../project.pbxproj | 11 ++++++----- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/Gutenberg.podspec b/Gutenberg.podspec index 3e727689c63f7..bd6db8bbb9189 100644 --- a/Gutenberg.podspec +++ b/Gutenberg.podspec @@ -11,12 +11,12 @@ Pod::Spec.new do |s| s.homepage = 'https://github.com/wordpress-mobile/gutenberg-mobile' s.license = package['license'] s.authors = 'Automattic' - s.platform = :ios, '10.0' + s.platform = :ios, '11.0' s.source = { :git => 'https://github.com/wordpress-mobile/gutenberg-mobile.git' } s.source_files = 'react-native-gutenberg-bridge/ios/*.{h,m,swift}' s.requires_arc = true s.preserve_paths = 'bundle/ios/*' - s.swift_version = '4.2' + s.swift_version = '5.0' s.dependency 'React', react_native_version s.dependency 'React-RCTImage', react_native_version diff --git a/ios/gutenberg.xcodeproj/project.pbxproj b/ios/gutenberg.xcodeproj/project.pbxproj index 58af4dfee9f77..9074d50b59de0 100644 --- a/ios/gutenberg.xcodeproj/project.pbxproj +++ b/ios/gutenberg.xcodeproj/project.pbxproj @@ -1544,7 +1544,7 @@ "$(SRCROOT)/../node_modules/react-native-video/ios/**", ); INFOPLIST_FILE = gutenberg/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(SRCROOT)/../react-native-aztec/ios/**", @@ -1558,7 +1558,7 @@ PRODUCT_NAME = gutenberg; SWIFT_OBJC_BRIDGING_HEADER = "gutenberg-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; }; @@ -1582,7 +1582,7 @@ "$(SRCROOT)/../node_modules/react-native-video/ios/**", ); INFOPLIST_FILE = gutenberg/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(SRCROOT)/../react-native-aztec/ios/**", @@ -1595,7 +1595,7 @@ ); PRODUCT_NAME = gutenberg; SWIFT_OBJC_BRIDGING_HEADER = "gutenberg-Bridging-Header.h"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; }; @@ -1797,7 +1797,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -1832,7 +1832,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; diff --git a/react-native-aztec/ios/RNTAztecView.xcodeproj/project.pbxproj b/react-native-aztec/ios/RNTAztecView.xcodeproj/project.pbxproj index 2e7e0f064f16a..dae0f9a478586 100644 --- a/react-native-aztec/ios/RNTAztecView.xcodeproj/project.pbxproj +++ b/react-native-aztec/ios/RNTAztecView.xcodeproj/project.pbxproj @@ -167,7 +167,7 @@ TargetAttributes = { F145CFC52087D16A006C159A = { CreatedOnToolsVersion = 9.3; - LastSwiftMigration = 0940; + LastSwiftMigration = 1110; }; }; }; @@ -287,7 +287,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -341,7 +341,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; @@ -371,7 +371,7 @@ SKIP_INSTALL = YES; SWIFT_OBJC_BRIDGING_HEADER = "RNTAztecView/RCTAztecView-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -396,7 +396,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OBJC_BRIDGING_HEADER = "RNTAztecView/RCTAztecView-Bridging-Header.h"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; diff --git a/react-native-gutenberg-bridge/ios/RNReactNativeGutenbergBridge.xcodeproj/project.pbxproj b/react-native-gutenberg-bridge/ios/RNReactNativeGutenbergBridge.xcodeproj/project.pbxproj index cb27f149af57b..a5d6d5607aacd 100644 --- a/react-native-gutenberg-bridge/ios/RNReactNativeGutenbergBridge.xcodeproj/project.pbxproj +++ b/react-native-gutenberg-bridge/ios/RNReactNativeGutenbergBridge.xcodeproj/project.pbxproj @@ -111,7 +111,7 @@ TargetAttributes = { 58B511DA1A9E6C8500147676 = { CreatedOnToolsVersion = 6.1.1; - LastSwiftMigration = 1010; + LastSwiftMigration = 1110; }; }; }; @@ -120,6 +120,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, ); mainGroup = 58B511D21A9E6C8500147676; @@ -185,7 +186,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -222,7 +223,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; @@ -249,7 +250,7 @@ SKIP_INSTALL = YES; SWIFT_OBJC_BRIDGING_HEADER = "RNReactNativeGutenbergBridge-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; USER_HEADER_SEARCH_PATHS = ""; }; name = Debug; @@ -273,7 +274,7 @@ PRODUCT_NAME = RNReactNativeGutenbergBridge; SKIP_INSTALL = YES; SWIFT_OBJC_BRIDGING_HEADER = "RNReactNativeGutenbergBridge-Bridging-Header.h"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; USER_HEADER_SEARCH_PATHS = ""; }; name = Release; From f0012fe9c6a79a0581431ccb389117ba5c178513 Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Wed, 9 Oct 2019 13:55:02 +0100 Subject: [PATCH 2/2] Remove check for iOS 11 --- react-native-aztec/ios/RNTAztecView/RCTAztecView.swift | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/react-native-aztec/ios/RNTAztecView/RCTAztecView.swift b/react-native-aztec/ios/RNTAztecView/RCTAztecView.swift index 78c1dc91e4351..a9f9aed2919b4 100644 --- a/react-native-aztec/ios/RNTAztecView/RCTAztecView.swift +++ b/react-native-aztec/ios/RNTAztecView/RCTAztecView.swift @@ -132,9 +132,7 @@ class RCTAztecView: Aztec.TextView { textContainerInset = .zero contentInset = .zero addPlaceholder() - if #available(iOS 11.0, *) { - textDragInteraction?.isEnabled = false - } + textDragInteraction?.isEnabled = false storage.htmlConverter.characterToReplaceLastEmptyLine = Character(.zeroWidthSpace) shouldNotifyOfNonUserChanges = false }