Merge 2.34 code freeze

.buildkite/commands/build-prototype.sh

@@ -5,11 +5,8 @@ set -eu
 echo "--- :rubygems: Setting up Gems"
 install_gems
 
-echo "--- Installing Secrets"
-# This is a hack until our AMI has a newer version of glibc and openSSL
-./gradlew
-chmod +x vendor/configure/configure
-docker run -it --rm --workdir /app --env CONFIGURE_ENCRYPTION_KEY -v $(pwd):/app public.ecr.aws/automattic/android-build-image:4281c9e97b2d821df3de34c046b7c067499b35bb /bin/bash -c 'vendor/configure/configure apply'
+echo "--- :closed_lock_with_key: Installing Secrets"
+bundle exec fastlane run configure_apply
 
 echo "--- :hammer_and_wrench: Build and Test"
 bundle exec fastlane build_and_upload_prototype_build

.buildkite/commands/checkout-release-branch.sh

@@ -1,14 +1,12 @@
 #!/bin/bash -eu
 
-# We expect BUILDKITE_RELEASE_VERSION to be as an environment variable, e.g. by the automation that triggers the build on Buildkite.
-# It must use the `BUILDKITE_` prefix to be passed to the agent due to how `hostmgr` works, in case this runs on a Mac agents.
-if [[ -z "${BUILDKITE_RELEASE_VERSION}" ]]; then
-    echo "BUILDKITE_RELEASE_VERSION is not set."
+if [[ -z "${RELEASE_VERSION}" ]]; then
+    echo "RELEASE_VERSION is not set."
     exit 1
 fi
 
 # Buildkite, by default, checks out a specific commit.
 # For many release actions, we need to be on a release branch instead.
-BRANCH_NAME="release/${BUILDKITE_RELEASE_VERSION}"
+BRANCH_NAME="release/${RELEASE_VERSION}"
 git fetch origin "$BRANCH_NAME"
 git checkout "$BRANCH_NAME"

.buildkite/commands/release-build.sh

@@ -12,12 +12,12 @@ bundle exec fastlane build_for_distribution
 echo "--- :computer: Use deterministic APK name for next steps"
 
 OUTPUT_DIR="build"
-if [ "$(find "$OUTPUT_DIR/*.apk" | wc -l)" -gt 1 ]; then
+if [ "$(find "$OUTPUT_DIR" -maxdepth 1 -name "*.apk" | wc -l)" -gt 1 ]; then
   echo "Found more than one APK in $OUTPUT_DIR."
   exit 1
 fi
 
-ORIGINAL_APK_PATH=$(ls -1 "$OUTPUT_DIR/*.apk")
+ORIGINAL_APK_PATH=$(find "$OUTPUT_DIR" -name "*.apk" -maxdepth 1 | head -1)
 
 set -x
 mv "$ORIGINAL_APK_PATH" $OUTPUT_DIR/simplenote.apk

.buildkite/commands/release-upload.sh

@@ -13,5 +13,5 @@ bundle exec fastlane run configure_apply
 
 echo "--- :android: Upload to Play Store"
 bundle exec fastlane upload_build_to_play_store \
-  apk_path:"$ARTIFACT_PATH/simplenote.apk" \
+  apk_path:"$ARTIFACT_PATH" \
   "beta:${1:-true}" # use first call param, default to true for safety

.configure

@@ -1,27 +1,35 @@
 {
   "project_name": "Simplenote-Android",
   "branch": "trunk",
-  "pinned_hash": "9b6326550a87fe0b6423a9e12f79ca92be8c9cff",
+  "pinned_hash": "2c5509d08ff9b9620381f4dc602fc2e5edcfcb40",
   "files_to_copy": [
     {
       "file": "android/simplenote/Simplenote/gradle.properties",
-      "destination": "Simplenote/gradle.properties"
+      "destination": "Simplenote/gradle.properties",
+      "encrypt": true
     },
     {
       "file": "android/simplenote/sentry.properties",
-      "destination": "sentry.properties"
+      "destination": "sentry.properties",
+      "encrypt": true
     },
     {
       "file": "android/automattic.jks",
-      "destination": ".configure-files/release.jks"
+      "destination": ".configure-files/release.jks",
+      "encrypt": true
     },
     {
       "file": "android/debug.keystore",
-      "destination": ".configure-files/debug_a8c.keystore"
+      "destination": ".configure-files/debug_a8c.keystore",
+      "encrypt": true
     },
     {
       "file": "android/Simplenote/google-upload-credentials.json",
-      "destination": ".configure-files/google-upload-credentials.json"
+      "destination": ".configure-files/google-upload-credentials.json",
+      "encrypt": true
     }
+  ],
+  "file_dependencies": [
+
   ]
-}
+}

RELEASE-NOTES.txt

@@ -1,3 +1,7 @@
+2.35
+-----
+
+
 2.34
 -----
 

Simplenote/metadata/PlayStoreStrings.pot

@@ -11,20 +11,19 @@ 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"
+msgid ""
+"2.34:\n"
+"Under the hood improvements\n"
+msgstr ""
+
 msgctxt "release_note_0233"
 msgid ""
 "2.33:\n"
 "* Added support for logging in with magic links for a passwordless experience.\n"
 "\n"
 msgstr ""
 
-msgctxt "release_note_0232"
-msgid ""
-"2.32:\n"
-"• Added adaptive app icon\n"
-"• Removed Sustainer plan information and upgrade UI\n"
-msgstr ""
-
 #. translators: Short description of the app to be displayed in the Play Store. Limit to 80 characters including spaces and commas!
 msgctxt "play_store_promo"
 msgid "Take notes, create to-do lists, capture ideas, and more."

fastlane/Fastfile

@@ -20,7 +20,7 @@ ORGANIZATION = 'automattic'
 REPO_NAME = 'simplenote-android'
 GITHUB_REPO = "#{ORGANIZATION}/#{REPO_NAME}".freeze
 DEFAULT_BRANCH = 'trunk'
-BUILDKITE_ORG = ORGANIZATION
+BUILDKITE_ORGANIZATION = ORGANIZATION
 BUILDKITE_PIPELINE = REPO_NAME
 APP_PACKAGE_NAME = 'com.automattic.simplenote'
 

fastlane/lanes/build.rb

@@ -2,6 +2,9 @@
 
 platform :android do
   lane :build_for_distribution do
+    version = VERSION_FILE.read_version_name
+    build_code = build_code_current
+
     user_friendly_output_dir = File.join(PROJECT_ROOT_FOLDER, 'build')
     user_friendly_output_apk_name = "simplenote-#{version}.apk"
     user_friendly_output_path = File.join(user_friendly_output_dir, user_friendly_output_apk_name)

fastlane/lanes/release.rb

@@ -130,7 +130,7 @@
     trigger_buildkite_release_build(branch: branch_to_build, beta: false)
   end
 
-  lane :create_release_on_github do |version: release_version_current, beta: true, apk_path: GRADLE_APK_OUTPUT_PATH.to_s|
+  lane :create_release_on_github do |version: VERSION_FILE.read_version_name, beta: true, apk_path: GRADLE_APK_OUTPUT_PATH.to_s|
     create_github_release(
       repository: GITHUB_REPO,
       version: version,

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

@@ -0,0 +1 @@
+Under the hood improvements

fastlane/resources/values/strings.xml

@@ -450,4 +450,5 @@
     <string name="magic_link_login_with_wordpress_or_break">Or</string>
     <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>
 </resources>

version.properties

@@ -1,2 +1,2 @@
-versionName=2.33
-versionCode=169
+versionName=2.34-rc-1
+versionCode=170