Merge release/2.35 into trunk (#1703)

Author: mokagio

Gemfile.lock

@@ -5,7 +5,7 @@ GEM
       base64
       nkf
       rexml
-    activesupport (7.2.1)
+    activesupport (7.2.1.1)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -22,25 +22,25 @@ GEM
     ast (2.4.2)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.969.0)
-    aws-sdk-core (3.202.1)
+    aws-partitions (1.992.0)
+    aws-sdk-core (3.211.0)
       aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.651.0)
+      aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.88.0)
-      aws-sdk-core (~> 3, >= 3.201.0)
+    aws-sdk-kms (1.95.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.159.0)
-      aws-sdk-core (~> 3, >= 3.201.0)
+    aws-sdk-s3 (1.169.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.9.1)
+    aws-sigv4 (1.10.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
     bigdecimal (3.1.8)
-    buildkit (1.6.0)
+    buildkit (1.6.1)
       sawyer (>= 0.6)
     chroma (0.2.0)
     claide (1.1.0)
@@ -56,7 +56,8 @@ GEM
     connection_pool (2.4.1)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (9.5.0)
+    danger (9.5.1)
+      base64 (~> 0.2)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -67,6 +68,7 @@ GEM
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.0)
       octokit (>= 4.0)
+      pstore (~> 0.1)
       terminal-table (>= 1, < 4)
     danger-dangermattic (1.1.2)
       danger (~> 9.4)
@@ -79,15 +81,15 @@ GEM
       danger
       rubocop (~> 1.0)
     declarative (0.0.20)
-    diffy (3.4.2)
+    diffy (3.4.3)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.6.20240107)
     dotenv (2.8.1)
     drb (2.2.1)
     emoji_regex (3.2.3)
-    excon (0.111.0)
-    faraday (1.10.3)
+    excon (0.112.0)
+    faraday (1.10.4)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -115,10 +117,10 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
+    faraday_middleware (1.2.1)
       faraday (~> 1.0)
     fastimage (2.3.1)
-    fastlane (2.222.0)
+    fastlane (2.225.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -134,6 +136,7 @@ GEM
       faraday-cookie_jar (~> 0.0.6)
       faraday_middleware (~> 1.0)
       fastimage (>= 2.1.0, < 3.0.0)
+      fastlane-sirp (>= 1.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-apis-androidpublisher_v3 (~> 0.3)
       google-apis-playcustomapp_v1 (~> 0.1)
@@ -159,7 +162,7 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
-    fastlane-plugin-wpmreleasetoolkit (12.0.0)
+    fastlane-plugin-wpmreleasetoolkit (12.2.1)
       activesupport (>= 6.1.7.1)
       buildkit (~> 1.5)
       chroma (= 0.2.0)
@@ -176,6 +179,8 @@ GEM
       rake (>= 12.3, < 14.0)
       rake-compiler (~> 1.0)
       xcodeproj (~> 1.22)
+    fastlane-sirp (1.0.0)
+      sysrandom (~> 1.0)
     gh_inspector (1.1.3)
     git (1.19.1)
       addressable (~> 2.8)
@@ -220,12 +225,12 @@ GEM
     http-cookie (1.0.7)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.14.5)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     java-properties (0.3.0)
     jmespath (1.6.2)
     json (2.7.2)
-    jwt (2.8.2)
+    jwt (2.9.3)
       base64
     kramdown (2.4.0)
       rexml
@@ -254,18 +259,19 @@ GEM
     optparse (0.5.0)
     os (1.1.4)
     parallel (1.26.3)
-    parser (3.3.4.2)
+    parser (3.3.5.0)
       ast (~> 2.4.1)
       racc
     plist (3.7.1)
     progress_bar (1.3.4)
       highline (>= 1.6)
       options (~> 2.3.0)
+    pstore (0.1.3)
     public_suffix (6.0.1)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
-    rake-compiler (1.2.7)
+    rake-compiler (1.2.8)
       rake
     rchardet (1.8.0)
     regexp_parser (2.9.2)
@@ -274,21 +280,19 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.3.6)
-      strscan
+    rexml (3.3.8)
     rouge (2.0.7)
-    rubocop (1.65.1)
+    rubocop (1.67.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.4, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.0)
+    rubocop-ast (1.32.3)
       parser (>= 3.3.1.0)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
@@ -306,7 +310,7 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
-    strscan (3.1.0)
+    sysrandom (1.0.5)
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -318,15 +322,15 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
     word_wrap (1.0.0)
-    xcodeproj (1.25.0)
+    xcodeproj (1.25.1)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
-      rexml (>= 3.3.2, < 4.0)
+      rexml (>= 3.3.6, < 4.0)
     xcpretty (0.3.0)
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.1)

RELEASE-NOTES.txt

@@ -1,3 +1,7 @@
+2.36
+-----
+
+
 2.35
 -----
 * Updated link to the privacy policy for California users.

Simplenote/metadata/PlayStoreStrings.pot

@@ -11,17 +11,16 @@ msgstr ""
 "Project-Id-Version: Release Notes & Play Store Descriptions\n"
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
-msgctxt "release_note_0234"
+msgctxt "release_note_0235"
 msgid ""
-"2.34:\n"
-"Under the hood improvements\n"
+"2.35:\n"
+"Updated privacy policy link for California users.\n"
 msgstr ""
 
-msgctxt "release_note_0233"
+msgctxt "release_note_0234"
 msgid ""
-"2.33:\n"
-"* Added support for logging in with magic links for a passwordless experience.\n"
-"\n"
+"2.34:\n"
+"Under the hood improvements\n"
 msgstr ""
 
 #. translators: Short description of the app to be displayed in the Play Store. Limit to 80 characters including spaces and commas!

fastlane/Fastfile

@@ -72,45 +72,6 @@ platform :android do
   ENV['validate_translations'] = 'buildRelease'
   ENV['FL_RELEASE_TOOLKIT_DEFAULT_BRANCH'] = 'trunk'
 
-  desc 'Updates a release branch for a new beta release'
-  lane :new_beta_release do |skip_confirm: false|
-    ensure_git_status_clean
-    ensure_git_branch_is_release_branch!
-
-    message = <<~MESSAGE
-      New beta release:
-      - Current beta version: #{release_version_current}
-      - New beta version: #{release_version_next_beta}
-
-      - Current build code: #{build_code_current}
-      - New build code: #{build_code_next}
-    MESSAGE
-    UI.important(message)
-
-    UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") unless skip_confirm || UI.confirm('Do you want to continue?')
-
-    UI.message 'Bumping beta version and build code...'
-    VERSION_FILE.write_version(
-      version_name: release_version_next_beta,
-      version_code: build_code_next
-    )
-    commit_version_bump
-    # Print computed version and build to let user double-check outcome in logs
-    UI.success("Done! New beta version: #{release_version_current}. New build code: #{build_code_current}")
-
-    download_translations
-    download_metadata_strings
-
-    UI.important('Pushing changes to remote and triggering the beta build...')
-    UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") unless skip_confirm || UI.confirm('Do you want to continue?')
-
-    push_to_git_remote(tags: false)
-
-    trigger_release_build(branch_to_build: release_branch_name)
-
-    # TODO: Switch to working branch and open back-merge PR
-  end
-
   desc 'Creates a new hotfix branch from the given tag'
   lane :new_hotfix_release do |version_name:, version_code:, skip_confirm: false|
     ensure_git_status_clean

fastlane/lanes/release.rb

@@ -111,6 +111,45 @@
     create_backmerge_prs!
   end
 
+  desc 'Updates a release branch for a new beta release'
+  lane :new_beta_release do |skip_confirm: false|
+    ensure_git_status_clean
+    ensure_git_branch_is_release_branch!
+
+    message = <<~MESSAGE
+      New beta release:
+      - Current beta version: #{release_version_current}
+      - New beta version: #{release_version_next_beta}
+
+      - Current build code: #{build_code_current}
+      - New build code: #{build_code_next}
+    MESSAGE
+    UI.important(message)
+
+    UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") unless skip_confirm || UI.confirm('Do you want to continue?')
+
+    UI.message 'Bumping beta version and build code...'
+    VERSION_FILE.write_version(
+      version_name: release_version_next_beta,
+      version_code: build_code_next
+    )
+    commit_version_bump
+    # Print computed version and build to let user double-check outcome in logs
+    UI.success("Done! New beta version: #{release_version_current}. New build code: #{build_code_current}")
+
+    download_translations
+    download_metadata_strings
+
+    UI.important('Pushing changes to remote and triggering the beta build...')
+    UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") unless skip_confirm || UI.confirm('Do you want to continue?')
+
+    push_to_git_remote(tags: false)
+
+    trigger_release_build(branch_to_build: release_branch_name)
+
+    create_backmerge_prs!
+  end
+
   desc 'Updates store metadata and runs the release checks'
   lane :finalize_release do |skip_confirm: false|
     UI.user_error!('Please use `finalize_hotfix_release` lane for hotfixes') if android_current_branch_is_hotfix(version_properties_path: VERSION_PROPERTIES_PATH)

fastlane/metadata/android/ar/changelogs/default.txt

@@ -1 +1 @@
-Under the hood improvements
+Updated privacy policy link for California users.

fastlane/metadata/android/de-DE/changelogs/default.txt

@@ -451,4 +451,6 @@
     <string name="magic_link_confirm_code_enter_pass_label">Enter password</string>
     <string name="magic_link_confirm_code_message">We\'ve sent a code to \n%1$s. The code will be valid for a few minutes.</string>
     <string name="login_with_password_message">Enter the password for the account %1$s</string>
+
+    <string name="signin_login_with_email_manually">We\'ll email you a code to log in, or you can %1$s%2$s%3$slog in manually%4$s.</string>
 </resources>

fastlane/metadata/android/en-US/changelogs/default.txt

@@ -1,2 +1,2 @@
-versionName=2.34
-versionCode=174
+versionName=2.35-rc-1
+versionCode=175