Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(mac, ios): build and run with xcode 16 #13077

Merged
merged 3 commits into from
Feb 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ios/Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -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"
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 */ = {
Expand Down
2 changes: 1 addition & 1 deletion mac/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ execBuildCommand() {
set +e
local ret_code=0
eval "$cmnd" || ret_code=$?
set -ex
set -e

printXCodeBuildScriptLogs

Expand Down
2 changes: 1 addition & 1 deletion oem/firstvoices/ios/Cartfile
Original file line number Diff line number Diff line change
@@ -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 changes: 4 additions & 4 deletions oem/firstvoices/ios/Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -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"