From 0fc69b82e587ccc8f329fae2180fd094ec54b2b7 Mon Sep 17 00:00:00 2001 From: sgschantz Date: Wed, 11 Jan 2023 14:23:56 +0700 Subject: [PATCH] disable bitcode and set target iOS version to 11 for xcode 14.2 compatibility --- .../KeymanEngine.xcodeproj/project.pbxproj | 18 ++++++------- .../Keyman/Keyman.xcodeproj/project.pbxproj | 6 ++--- .../project.pbxproj | 8 +++--- .../DummyInputViewController.swift | 27 +++++-------------- .../KeyboardCalibrator/ViewController.swift | 6 +---- 5 files changed, 23 insertions(+), 42 deletions(-) diff --git a/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj b/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj index 8cc8d1beea..1f71d4225e 100644 --- a/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj +++ b/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj @@ -1851,7 +1851,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_BITCODE = YES; + ENABLE_BITCODE = NO; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -1907,7 +1907,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_BITCODE = YES; + ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; @@ -1938,7 +1938,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = F27FCAF6157FD95E00FBBA20 /* Keyman-lib.xcconfig */; buildSettings = { - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; STRIP_INSTALLED_PRODUCT = NO; STRIP_STYLE = all; @@ -1951,7 +1951,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = F27FCAF6157FD95E00FBBA20 /* Keyman-lib.xcconfig */; buildSettings = { - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTS_MACCATALYST = NO; }; @@ -2069,7 +2069,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; KEYMAN_ROOT = "$(SRCROOT)/../../.."; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; @@ -2102,7 +2102,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_BITCODE = YES; + ENABLE_BITCODE = NO; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -2134,7 +2134,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = F27FCAF6157FD95E00FBBA20 /* Keyman-lib.xcconfig */; buildSettings = { - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTS_MACCATALYST = NO; }; @@ -2344,7 +2344,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; KEYMAN_ROOT = "$(SRCROOT)/../../.."; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG NO_SENTRY"; @@ -2387,7 +2387,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; KEYMAN_ROOT = "$(SRCROOT)/../../.."; SKIP_INSTALL = YES; SWIFT_COMPILATION_MODE = wholemodule; diff --git a/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj b/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj index 2cc124df77..ce6c0f9619 100644 --- a/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj +++ b/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj @@ -1225,7 +1225,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; KEYMAN_ROOT = "$(SRCROOT)/../../.."; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ""; @@ -1277,7 +1277,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; KEYMAN_ROOT = "$(SRCROOT)/../../.."; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; @@ -1424,7 +1424,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; KEYMAN_ROOT = "$(SRCROOT)/../../.."; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ""; diff --git a/ios/tools/KeyboardCalibrator/KeyboardCalibrator.xcodeproj/project.pbxproj b/ios/tools/KeyboardCalibrator/KeyboardCalibrator.xcodeproj/project.pbxproj index 541becc3c1..69426b2230 100644 --- a/ios/tools/KeyboardCalibrator/KeyboardCalibrator.xcodeproj/project.pbxproj +++ b/ios/tools/KeyboardCalibrator/KeyboardCalibrator.xcodeproj/project.pbxproj @@ -390,7 +390,7 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = WHE552KZN5; INFOPLIST_FILE = CalibrationKbd/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -411,7 +411,7 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = WHE552KZN5; INFOPLIST_FILE = CalibrationKbd/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -548,7 +548,7 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = WHE552KZN5; INFOPLIST_FILE = KeyboardCalibrator/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -569,7 +569,7 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = WHE552KZN5; INFOPLIST_FILE = KeyboardCalibrator/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/ios/tools/KeyboardCalibrator/KeyboardCalibrator/DummyInputViewController.swift b/ios/tools/KeyboardCalibrator/KeyboardCalibrator/DummyInputViewController.swift index b66ba6fba6..65be466604 100644 --- a/ios/tools/KeyboardCalibrator/KeyboardCalibrator/DummyInputViewController.swift +++ b/ios/tools/KeyboardCalibrator/KeyboardCalibrator/DummyInputViewController.swift @@ -37,11 +37,7 @@ private class CustomInputView: UIInputView { func setConstraints() { var guide: UILayoutGuide - if #available(iOS 11.0, *) { - guide = self.safeAreaLayoutGuide - } else { - guide = self.layoutMarginsGuide - } + guide = self.safeAreaLayoutGuide if height != 0 { innerView.heightAnchor.constraint(equalToConstant: height).isActive = true @@ -49,15 +45,9 @@ private class CustomInputView: UIInputView { innerView.heightAnchor.constraint(equalTo: guide.heightAnchor).isActive = true } - if #available(iOS 11.0, *) { - innerView.widthAnchor.constraint(equalTo: guide.widthAnchor).isActive = true - innerView.leftAnchor.constraint(equalTo: guide.leftAnchor).isActive = true - insetView.widthAnchor.constraint(equalTo: guide.widthAnchor).isActive = true - } else { - innerView.widthAnchor.constraint(equalTo: self.widthAnchor).isActive = true - innerView.leftAnchor.constraint(equalTo: self.leftAnchor).isActive = true - insetView.widthAnchor.constraint(equalTo: self.widthAnchor).isActive = true - } + innerView.widthAnchor.constraint(equalTo: guide.widthAnchor).isActive = true + innerView.leftAnchor.constraint(equalTo: guide.leftAnchor).isActive = true + insetView.widthAnchor.constraint(equalTo: guide.widthAnchor).isActive = true innerView.bottomAnchor.constraint(equalTo: insetView.topAnchor).isActive = true @@ -172,13 +162,8 @@ class DummyInputViewController: UIInputViewController { self.view.addSubview(self.nextKeyboardButton) var guide: UILayoutGuide - if #available(iOS 11.0, *) { - guide = self.view.safeAreaLayoutGuide - self.nextKeyboardButton.isHidden = !self.needsInputModeSwitchKey || !asSystemKeyboard - } else { - guide = self.view.layoutMarginsGuide - self.nextKeyboardButton.isHidden = false // Seems buggy to vary, and it matters greatly on older devices. - } + guide = self.view.safeAreaLayoutGuide + self.nextKeyboardButton.isHidden = !self.needsInputModeSwitchKey || !asSystemKeyboard self.nextKeyboardButton.leftAnchor.constraint(equalTo: guide.leftAnchor).isActive = true self.nextKeyboardButton.bottomAnchor.constraint(equalTo: guide.bottomAnchor).isActive = true diff --git a/ios/tools/KeyboardCalibrator/KeyboardCalibrator/ViewController.swift b/ios/tools/KeyboardCalibrator/KeyboardCalibrator/ViewController.swift index 551988e5a0..35af76de68 100644 --- a/ios/tools/KeyboardCalibrator/KeyboardCalibrator/ViewController.swift +++ b/ios/tools/KeyboardCalibrator/KeyboardCalibrator/ViewController.swift @@ -149,11 +149,7 @@ class ViewController: UIViewController { @IBAction func performCapture() { let rect = kbdFrame?.cgRectValue - if #available(iOS 11.0, *) { - capture.insetBottom = self.view.safeAreaInsets.bottom - } else { - capture.insetBottom = self.view.layoutMargins.bottom - } + capture.insetBottom = self.view.safeAreaInsets.bottom // Determine correct capture mode switch captureMode {