From fb1d86874e9247843329d330301c0369824f99d4 Mon Sep 17 00:00:00 2001 From: sgschantz Date: Thu, 30 Jan 2025 12:21:15 +0700 Subject: [PATCH 1/3] chore(mac): builds and runs locally with xcode 16 --- .../resources/Keyman.bundle/Contents/Resources/ios-host.js | 2 +- ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/ios-host.js b/ios/engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/ios-host.js index bd323b970b..ac07362391 100644 --- a/ios/engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/ios-host.js +++ b/ios/engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/ios-host.js @@ -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; diff --git a/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj b/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj index 6211f26573..a8b4f8624b 100644 --- a/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj +++ b/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj @@ -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 */ = { From 6a2c01e71faaecc078effc122d44075f2eb08eb9 Mon Sep 17 00:00:00 2001 From: sgschantz Date: Mon, 3 Feb 2025 10:19:46 +0700 Subject: [PATCH 2/3] chore(mac): suppress verbose bash script logging --- mac/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mac/build.sh b/mac/build.sh index 8f17ba868d..00e577a45d 100755 --- a/mac/build.sh +++ b/mac/build.sh @@ -109,7 +109,7 @@ execBuildCommand() { set +e local ret_code=0 eval "$cmnd" || ret_code=$? - set -ex + set -e printXCodeBuildScriptLogs From 78520fa32a4604c5100b0cd03d78f97f6915ebf5 Mon Sep 17 00:00:00 2001 From: sgschantz Date: Wed, 5 Feb 2025 12:12:57 +0700 Subject: [PATCH 3/3] chore(mac): update sentry version for firstvoices --- ios/Cartfile.resolved | 2 +- oem/firstvoices/ios/Cartfile | 2 +- oem/firstvoices/ios/Cartfile.resolved | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ios/Cartfile.resolved b/ios/Cartfile.resolved index 4e1a058a51..ca05da1ae9 100644 --- a/ios/Cartfile.resolved +++ b/ios/Cartfile.resolved @@ -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" diff --git a/oem/firstvoices/ios/Cartfile b/oem/firstvoices/ios/Cartfile index 0dae92f36b..9ffc07d330 100644 --- a/oem/firstvoices/ios/Cartfile +++ b/oem/firstvoices/ios/Cartfile @@ -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 diff --git a/oem/firstvoices/ios/Cartfile.resolved b/oem/firstvoices/ios/Cartfile.resolved index 95e608b932..ca05da1ae9 100644 --- a/oem/firstvoices/ios/Cartfile.resolved +++ b/oem/firstvoices/ios/Cartfile.resolved @@ -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"