erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-05 00:15:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

disable bitcode and set target iOS version to 11 for xcode 14.2 compatibility

Browse source
This commit is contained in:
sgschantz 2023-01-11 14:23:56 +07:00
parent 61b1e3dfeb
commit 0fc69b82e5
5 changed files with 23 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj
View file

@ -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;

6
ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj
View file

@ -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 = "";

8
ios/tools/KeyboardCalibrator/KeyboardCalibrator.xcodeproj/project.pbxproj
View file

@ -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",

27
ios/tools/KeyboardCalibrator/KeyboardCalibrator/DummyInputViewController.swift
View file

@ -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

6
ios/tools/KeyboardCalibrator/KeyboardCalibrator/ViewController.swift
View file

@ -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 {