Merge release/2.34 final into trunk (#1697)

Automattic · Sep 24, 2024 · 0d67638 · 0d67638
2 parents f0c98fa + 0f9d97c
commit 0d67638
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 9 deletions.
diff --git a/.buildkite/release-pipelines/publish-release.yml b/.buildkite/release-pipelines/publish-release.yml
@@ -3,7 +3,7 @@
 
 steps:
   - label: Publish Release
-    plugins: [$CI_TOOLKIT_plugin]
+    plugins: [$CI_TOOLKIT_PLUGIN]
     command: |
       echo '--- :robot_face: Use bot for git operations'
       source use-bot-for-git wpmobilebot

diff --git a/.configure b/.configure
@@ -1,7 +1,7 @@
 {
   "project_name": "Simplenote-Android",
   "branch": "trunk",
-  "pinned_hash": "2c5509d08ff9b9620381f4dc602fc2e5edcfcb40",
+  "pinned_hash": "1761b0a77a5371f9127c5d0575c90f938d864537",
   "files_to_copy": [
     {
       "file": "android/simplenote/Simplenote/gradle.properties",
@@ -25,7 +25,7 @@
     },
     {
       "file": "android/Simplenote/google-upload-credentials.json",
-      "destination": ".configure-files/google-upload-credentials.json",
+      "destination": "~/.configure/simplenote-android/secrets/google-upload-credentials.json",
       "encrypt": true
     }
   ],

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -46,7 +46,7 @@ STORE_METADATA_SOURCE_DEFAULT_FOLDER = File.join(STORE_METADATA_SOURCE_FOLDER, S
 RELEASE_NOTES_PATH = File.join(STORE_METADATA_SOURCE_DEFAULT_FOLDER, 'changelogs', 'default.txt')
 RELEASE_NOTES_SOURCE_PATH = File.join(PROJECT_ROOT_FOLDER, 'RELEASE-NOTES.txt')
 
-UPLOAD_TO_PLAY_STORE_JSON_KEY = File.join(PROJECT_ROOT_FOLDER, '.configure-files', 'google-upload-credentials.json')
+UPLOAD_TO_PLAY_STORE_JSON_KEY = File.join(Dir.home, '.configure', 'simplenote-android', 'secrets', 'google-upload-credentials.json')
 
 GRADLE_APK_OUTPUT_PATH = File.join(BUILD_FOLDER, 'outputs', 'apk', 'release', 'Simplenote-release.apk')
 

diff --git a/fastlane/lanes/build.rb b/fastlane/lanes/build.rb
@@ -34,6 +34,10 @@
     # While transitioning between the current approach and the new one where the upload is a dedicated lane (this) support both beta flag and explicit track name.
     if track.nil?
       track = beta ? 'beta' : 'production'
+      UI.important("No track was given. Track has been computed to '#{track}' based on the beta flag value being '#{beta}'.")
+    elsif track == 'production' && beta == true
+      UI.important("Inconstistent input track = '#{track}' and beta = '#{beta}'. Will change beta to 'false'.")
+      beta = false
     end
 
     upload_to_play_store(

diff --git a/fastlane/metadata/android/ar/changelogs/default.txt b/fastlane/metadata/android/ar/changelogs/default.txt
@@ -0,0 +1,2 @@
+2.34:
+التحسينات جارية
diff --git a/fastlane/metadata/android/de-DE/changelogs/default.txt b/fastlane/metadata/android/de-DE/changelogs/default.txt
@@ -0,0 +1,2 @@
+2.34:
+Verbesserungen hinter den Kulissen
diff --git a/fastlane/metadata/android/es-ES/changelogs/default.txt b/fastlane/metadata/android/es-ES/changelogs/default.txt
@@ -0,0 +1,2 @@
+2.34:
+Mejoras en los detalles técnicos
diff --git a/fastlane/metadata/android/fr-FR/changelogs/default.txt b/fastlane/metadata/android/fr-FR/changelogs/default.txt
@@ -1,2 +1,2 @@
 2.34 :
-Des améliorations sous le capot
+Des améliorations en préparation
diff --git a/fastlane/metadata/android/iw-IL/changelogs/default.txt b/fastlane/metadata/android/iw-IL/changelogs/default.txt
@@ -0,0 +1,2 @@
+2.34:
+שיפורים מתחת למכסה המנוע
diff --git a/fastlane/metadata/android/ru-RU/changelogs/default.txt b/fastlane/metadata/android/ru-RU/changelogs/default.txt
@@ -1,2 +1,2 @@
 2.34:
-Целый мешок усовершенствований.
+Целый мешок усовершенствований
diff --git a/fastlane/metadata/android/tr-TR/changelogs/default.txt b/fastlane/metadata/android/tr-TR/changelogs/default.txt
@@ -1,2 +1,2 @@
 2.34:
-Arka planda yapılan iyileştirmeler.
+Arka planda yapılan iyileştirmeler
diff --git a/fastlane/metadata/android/zh-CN/changelogs/default.txt b/fastlane/metadata/android/zh-CN/changelogs/default.txt
@@ -1,2 +1,2 @@
 2.34：
-后台进行的改进。
+后台改进
diff --git a/version.properties b/version.properties
@@ -1,2 +1,2 @@
 versionName=2.34
-versionCode=171
+versionCode=174