chore(ios,mac): support build on Apple Silicon using Xcode 15.3 #11302
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mcdurdin marked this conversation as resolved.
Show resolved
Hide resolved
|
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,24 @@ | ||
| PODS: | ||
| - Sentry (8.24.0): | ||
| - Sentry/Core (= 8.24.0) | ||
| - Sentry/Core (8.24.0) | ||
|
|
||
| DEPENDENCIES: | ||
| - Sentry (from `https://github.com/getsentry/sentry-cocoa.git`, tag `8.24.0`) | ||
|
|
||
| EXTERNAL SOURCES: | ||
| Sentry: | ||
| :git: https://github.com/getsentry/sentry-cocoa.git | ||
| :tag: 8.24.0 | ||
|
|
||
| CHECKOUT OPTIONS: | ||
| Sentry: | ||
| :git: https://github.com/getsentry/sentry-cocoa.git | ||
| :tag: 8.24.0 | ||
|
|
||
| SPEC CHECKSUMS: | ||
| Sentry: 2f6baed15a3f8056b875fc903dc3dcb2903117f4 | ||
|
|
||
| PODFILE CHECKSUM: 483593d0b294fc5751c2490061e01211db3f9ecc | ||
|
|
||
| COCOAPODS: 1.15.2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -6,19 +6,17 @@ title: System Requirements | |||||
|
|
||||||
| Keyman supports the following Mac operating systems: | ||||||
|
|
||||||
| * macOS High Sierra (10.13) | ||||||
| * macOS Mojave (10.14) | ||||||
| * macOS Catalina (10.15) | ||||||
| * macOS Big Sur (11.0) | ||||||
| * macOS Monterey (12.0) | ||||||
| * macOS Ventura (13.0) | ||||||
| * macOS Sonoma (14.0) | ||||||
|
|
||||||
| Keyman should also work on future releases of macOS, even if they are not yet listed here. | ||||||
|
|
||||||
| ## Resource Requirements | ||||||
|
|
||||||
| Keyman for macOS has minimal resource requirements. Any computer running | ||||||
| Mac OS X 10.13 or later should be able to run Keyman for macOS without trouble. | ||||||
|
There was a problem hiding this comment.
Suggested change
There was a problem hiding this comment. keymanapp/keyman.com@486df1b updates the minimum version listed on keyman.com |
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -301,9 +301,9 @@ | |
| 9889E8B31BFA9CEC00019560 /* Frameworks */, | ||
| 9889E8B41BFA9CEC00019560 /* Resources */, | ||
| 98C9A8C81BFBF23C009E9A4F /* Embed App Extensions */, | ||
| 371C855D2288F3A50076612A /* Embed Frameworks */, | ||
| 37DF007C24595F6F00C73128 /* Run Script */, | ||
| 9800EC5D1C029FCD00BF0FB5 /* ShellScript */, | ||
| ); | ||
| buildRules = ( | ||
| ); | ||
|
|
@@ -439,11 +439,11 @@ | |
| outputPaths = ( | ||
| ); | ||
| runOnlyForDeploymentPostprocessing = 0; | ||
| shellPath = "/usr/bin/env bash"; | ||
| shellScript = "\"$KEYMAN_ROOT/resources/build/xcode-wrap.sh\" \"$KEYMAN_ROOT/resources/build/set-bundle-versions-untagged.sh\"\n"; | ||
| showEnvVarsInLog = 0; | ||
| }; | ||
| 37DF007C24595F6F00C73128 /* Run Script */ = { | ||
| isa = PBXShellScriptBuildPhase; | ||
| buildActionMask = 2147483647; | ||
| files = ( | ||
|
|
@@ -452,13 +452,14 @@ | |
| ); | ||
| inputPaths = ( | ||
| ); | ||
| name = "Run Script"; | ||
| outputFileListPaths = ( | ||
| ); | ||
| outputPaths = ( | ||
| ); | ||
| runOnlyForDeploymentPostprocessing = 0; | ||
| shellPath = "/usr/bin/env bash"; | ||
| shellScript = "\"$KEYMAN_ROOT/resources/build/xcode-wrap.sh\" \"$KEYMAN_ROOT/resources/build/set-bundle-versions-and-settings-untagged.sh\"\n"; | ||
| showEnvVarsInLog = 0; | ||
| }; | ||
| 9800EC5D1C029FCD00BF0FB5 /* ShellScript */ = { | ||
|
|
@@ -471,8 +472,8 @@ | |
| outputPaths = ( | ||
| ); | ||
| runOnlyForDeploymentPostprocessing = 0; | ||
| shellPath = "/usr/bin/env bash"; | ||
| shellScript = "#verstr1=$(/usr/libexec/PlistBuddy -c \"Print CFBundleShortVersionString\" \"$SRCROOT/FirstVoices/Info.plist\")\n#verstr2=$(/usr/libexec/PlistBuddy -c \"Print CFBundleVersion\" \"$SRCROOT/FirstVoices/Info.plist\")\n#/usr/libexec/PlistBuddy \"$SRCROOT/Settings.bundle/Root.plist\" -c \"set PreferenceSpecifiers:0:DefaultValue $verstr1 (build $verstr2)\"\n"; | ||
|
Comment on lines
+475
to
+476
There was a problem hiding this comment. This script should be removed in 18.0 cycle (A18S1). |
||
| showEnvVarsInLog = 0; | ||
| }; | ||
| /* End PBXShellScriptBuildPhase section */ | ||
|
|
||
|
There was a problem hiding this comment. All these scripts should be in resources/build/mac in 18.0 (A18S1) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| # Calls resource script to perform the dSYM upload | ||
|
|
||
| source "$KEYMAN_ROOT/resources/build/xcode-utils.sh" | ||
| phaseSentryDsymUpload "keyman-ios" |
|
There was a problem hiding this comment. It would be good to combine all the set-bundle-versions-... scripts and parameterise, given they are so similar. A18S1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| # Calls script in xcode-utils to update the version | ||
| # true: applies VERSION_WITH_TAG to custom KeymanVersionWithTag plist member used for in-app display | ||
| # updates the version string for Settings | ||
|
|
||
| source "$KEYMAN_ROOT/resources/build/xcode-utils.sh" | ||
|
|
||
| phaseSetBundleVersions true | ||
|
|
||
| setSettingsBundleVersion |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| # Calls script in xcode-utils to update the version | ||
| # true: applies VERSION_WITH_TAG to custom KeymanVersionWithTag plist member used for in-app display | ||
| # updates the version string for Settings | ||
|
|
||
| source "$KEYMAN_ROOT/resources/build/xcode-utils.sh" | ||
|
|
||
| phaseSetBundleVersions | ||
|
|
||
| setSettingsBundleVersion |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This call to swiftlint should be cleaned up into a wrapped script as well in 18.0 (A18S1), and commented lines should be removed.