diff --git a/ios/Cartfile.resolved b/ios/Cartfile.resolved index 4e1a058a515..ca05da1ae94 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/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 bd323b970b4..ac073623910 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 6211f265734..a8b4f8624b4 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 */ = { diff --git a/mac/build.sh b/mac/build.sh index 8f17ba868d2..00e577a45da 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 diff --git a/oem/firstvoices/ios/Cartfile b/oem/firstvoices/ios/Cartfile index 0dae92f36b5..9ffc07d3305 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 95e608b9323..ca05da1ae94 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"