Merge and 18.9.0.1 and 18.9.0.2 into develop
#17695
Merged
Conversation
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
…tton Follow Conversation: Fix cases where the follow button is missing
…storation-crash Reader Comments: Fix crash when the app is backgrounded
…ng is still WIP We are currently working on removing `update-translations.rb` + `fix-translations` + `extract-framework-translations.swift` scripts from the repo and migrating their logic into the release-toolkit, but that work is still in progress. The role of the (misleadingly named) `extract-frameworks-translations.swift` script was to redistribute the keys from the `*.lproj/Localizable.strings` downloaded from GlotPress into the `.strings` files of the Widgets and ShareExtension targets, back when those targets used their own `.strings` file. This is no longer the case since #17630 and #17636 landed – as Widgets and ShareExtension's code now reference the app's `.strings` file directly – which means we don't need to run the logic from `extract-frameworks-translations.swift` anymore, and in fact if we did, it would probably crash now that the `Base.lproj/Localizable.strings` files in the Widgets and ShareExtension subfolders (which that script references) don't exist anymore.
…king Comments: Track comment editor opened.
That's because of the `develop` to `trunk` rename.
Got conflicts in `Gemfile.lock` and `fastlane/Pluginfile` because both branches changed the release-toolkit version. I resolved by using the version on `develop`.
|
You can trigger an installable build for these changes by visiting CircleCI here. |
mokagio
changed the title
developdevelop
mokagio
commented
Dec 21, 2021
|
You can trigger optional UI/connected tests for these changes by visiting CircleCI here. |
oguzkocer
approved these changes
Dec 21, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Includes:
From 18.9.0.1
From 18.9.0.2
Got conflicts in
Gemfile.lockandfastlane/Pluginfilebecause both branches changed the release toolkit version. I resolved by using the version ondevelop.