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

Merge pull request #13077 from keymanapp/chore/mac/12696-xcode-16-upgrade

Browse source 
chore(mac, ios): build and run with xcode 16
This commit is contained in:
Shawn Schantz 2025-02-05 13:14:15 +07:00 • committed by GitHub
commit 558a57f72f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ios/Cartfile.resolved
View file

@ -1,4 +1,4 @@
github "ashleymills/Reachability.swift" "v5.2.4"
github "devicekit/DeviceKit" "5.5.0"
github "getsentry/sentry-cocoa" "8.38.0"
github "getsentry/sentry-cocoa" "8.44.0"
github "weichsel/ZIPFoundation" "0.9.19"

2
ios/engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/ios-host.js
View file

@ -131,7 +131,7 @@ function getOskWidth() {
function getOskHeight() {
var height = oskHeight;
if(keyman.osk.banner._activeType != 'blank') {
if(keyman.osk && keyman.osk.banner && keyman.osk.banner._activeType != 'blank') {
height = height - keyman.osk.banner.height;
}
return height;

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

@ -1004,7 +1004,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = "/usr/bin/env bash";
shellScript = "\"$KEYMAN_ROOT/resources/build/xcode-wrap.sh\" \"$KEYMAN_ROOT/resources/build/set-bundle-versions-and-settings-tagged.sh\"\n";
shellScript = "\"$KEYMAN_ROOT/resources/build/xcode-wrap.sh\" \"$KEYMAN_ROOT/resources/build/set-bundle-versions-and-settings-tagged.sh\"\necho \"script - set version complete\"\n";
showEnvVarsInLog = 0;
};
CED3CFDA240E49DF001540A1 /* ShellScript */ = {

2
mac/build.sh
View file

@ -109,7 +109,7 @@ execBuildCommand() {
set +e
local ret_code=0
eval "$cmnd" || ret_code=$?
set -ex
set -e
printXCodeBuildScriptLogs

2
oem/firstvoices/ios/Cartfile
View file

@ -1,4 +1,4 @@
github "weichsel/ZIPFoundation" ~> 0.9
github "devicekit/DeviceKit" ~> 5.0
github "ashleymills/Reachability.swift"
github "getsentry/sentry-cocoa" ~> 8.7.0
github "getsentry/sentry-cocoa" ~> 8.38.0

8
oem/firstvoices/ios/Cartfile.resolved
View file

@ -1,4 +1,4 @@
github "ashleymills/Reachability.swift" "v5.1.0"
github "devicekit/DeviceKit" "5.1.0"
github "getsentry/sentry-cocoa" "8.15.2"
github "weichsel/ZIPFoundation" "0.9.17"
github "ashleymills/Reachability.swift" "v5.2.4"
github "devicekit/DeviceKit" "5.5.0"
github "getsentry/sentry-cocoa" "8.44.0"
github "weichsel/ZIPFoundation" "0.9.19"