Merge remote-tracking branch 'origin/trunk' into adam/gravatar_quicke…

…ditor
wordpress-mobile · Nov 14, 2024 · 9d32788 · 9d32788
2 parents c704bda + 835f19a
commit 9d32788
Show file tree

Hide file tree

Showing 47 changed files with 342 additions and 354 deletions.
diff --git a/.buildkite/beta-builds.yml b/.buildkite/beta-builds.yml
@@ -13,6 +13,7 @@ steps:
   #################
   - label: "Gradle Wrapper Validation"
     command: |
+      .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"
       validate_gradle_wrapper
     plugins: [$CI_TOOLKIT]
 
@@ -27,14 +28,18 @@ steps:
 
       - label: "🕵️ Lint WordPress"
         key: wplint
-        command: ".buildkite/commands/lint.sh wordpress"
+        command: |
+          .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"
+          .buildkite/commands/lint.sh wordpress
         plugins: [$CI_TOOLKIT]
         artifact_paths:
           - "**/build/reports/lint-results*.*"
 
       - label: "🕵️ Lint Jetpack"
         key: jplint
-        command: ".buildkite/commands/lint.sh jetpack"
+        command: |
+          .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"
+          .buildkite/commands/lint.sh jetpack
         plugins: [$CI_TOOLKIT]
         artifact_paths:
           - "**/build/reports/lint-results*.*"
@@ -47,7 +52,9 @@ steps:
 
       - label: ":wordpress: :android: Beta Build"
         key: wpbuild
-        command: ".buildkite/commands/beta-build.sh wordpress"
+        command: |
+          .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"
+          .buildkite/commands/beta-build.sh wordpress
         depends_on: wplint
         plugins: [$CI_TOOLKIT]
         notify:
@@ -59,7 +66,9 @@ steps:
 
       - label: ":jetpack: :android: Beta Build"
         key: jpbuild
-        command: ".buildkite/commands/beta-build.sh jetpack"
+        command: |
+          .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"
+          .buildkite/commands/beta-build.sh jetpack
         depends_on: jplint
         plugins: [$CI_TOOLKIT]
         notify:
@@ -76,5 +85,7 @@ steps:
     depends_on:
       - wpbuild
       - jpbuild
-    command: ".buildkite/commands/create-github-release.sh"
+    command: |
+      .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"
+      .buildkite/commands/create-github-release.sh
     plugins: [$CI_TOOLKIT]
diff --git a/.buildkite/commands/checkout-editorial-branch.sh b/.buildkite/commands/checkout-editorial-branch.sh
@@ -1,5 +1,7 @@
 #!/bin/bash -eu
 
+echo '--- :git: Checkout Editorial Branch'
+
 # EDITORIAL_BRANCH is passed as an environment variable from fastlane to Buildkite
 #
 if [[ -z "${EDITORIAL_BRANCH}" ]]; then

diff --git a/.buildkite/commands/checkout-release-branch.sh b/.buildkite/commands/checkout-release-branch.sh
@@ -1,10 +1,8 @@
 #!/bin/bash -eu
 
-# RELEASE_VERSION is passed as an environment variable passed to Buildkite by ReleasesV2.
-if [[ -z "${RELEASE_VERSION}" ]]; then
-    echo "RELEASE_VERSION is not set."
-    exit 1
-fi
+echo "--- :git: Checkout Release Branch"
+
+RELEASE_VERSION="${1?Please provide a release version as an argument.}"
 
 # Buildkite, by default, checks out a specific commit. For many release actions, we need to be
 # on a release branch instead.

diff --git a/.buildkite/commands/lint.sh b/.buildkite/commands/lint.sh
@@ -3,9 +3,6 @@
 echo "--- :rubygems: Setting up Gems"
 install_gems
 
-echo "--- :clipboard: Copying gradle.properties"
-cp gradle.properties-example gradle.properties
-
 echo "--- :globe_with_meridians: Check Locales Declaration Consistency"
 bundle exec fastlane check_declared_locales_consistency app:"$1"
 

diff --git a/.buildkite/commands/run-unit-tests.sh b/.buildkite/commands/run-unit-tests.sh
@@ -32,7 +32,6 @@ else
     exit 1
 fi
 
-cp gradle.properties-example gradle.properties
 ./gradlew $test_suite
 TESTS_EXIT_STATUS=$?
 set -e

diff --git a/.buildkite/complete-code-freeze.yml b/.buildkite/complete-code-freeze.yml
@@ -8,8 +8,7 @@ steps:
       echo '--- :robot_face: Use bot for git operations'
       source use-bot-for-git
 
-      echo '--- :git: Checkout Release Branch'
-      .buildkite/commands/checkout-release-branch.sh
+      .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"
 
       echo '--- :ruby: Setup Ruby Tools'
       install_gems

diff --git a/.buildkite/finalize-release.yml b/.buildkite/finalize-release.yml
@@ -8,14 +8,11 @@ steps:
       echo '--- :robot_face: Use bot for git operations'
       source use-bot-for-git
 
-      echo '--- :git: Checkout Release Branch'
-      .buildkite/commands/checkout-release-branch.sh
+      .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"
 
       echo '--- :ruby: Setup Ruby Tools'
       install_gems
 
-      cp gradle.properties-example gradle.properties
-
       echo '--- :shipit: Finalize Release'
       bundle exec fastlane finalize_release skip_confirm:true
     agents:

diff --git a/.buildkite/new-beta-release.yml b/.buildkite/new-beta-release.yml
@@ -11,8 +11,6 @@ steps:
       echo '--- :ruby: Setup Ruby Tools'
       install_gems
 
-      cp gradle.properties-example gradle.properties
-
       echo '--- :shipit: New Beta Release'
       bundle exec fastlane new_beta_release skip_confirm:true
     agents:

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -39,15 +39,13 @@ steps:
 
       - label: "🕵️ checkstyle"
         command: |
-          cp gradle.properties-example gradle.properties
           ./gradlew checkstyle
         plugins: [$CI_TOOLKIT]
         artifact_paths:
           - "**/build/reports/checkstyle/checkstyle.*"
 
       - label: "🕵️ detekt"
         command: |
-          cp gradle.properties-example gradle.properties
           ./gradlew detekt
         plugins: [$CI_TOOLKIT]
         artifact_paths:
@@ -67,7 +65,6 @@ steps:
 
   - label: "Dependency Tree Diff"
     command: |
-      cp gradle.properties-example gradle.properties
       comment_with_dependency_diff 'WordPress' 'wordpressVanillaReleaseRuntimeClasspath'
     if: build.pull_request.id != null
     plugins: [$CI_TOOLKIT]

diff --git a/.buildkite/publish-release.yml b/.buildkite/publish-release.yml
@@ -8,8 +8,7 @@ steps:
       echo '--- :robot_face: Use bot for git operations'
       source use-bot-for-git
 
-      echo '--- :git: Checkout Release Branch'
-      .buildkite/commands/checkout-release-branch.sh
+      .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"
 
       echo '--- :ruby: Setup Ruby tools'
       install_gems

diff --git a/.buildkite/release-builds.yml b/.buildkite/release-builds.yml
@@ -13,6 +13,7 @@ steps:
   #################
   - label: "Gradle Wrapper Validation"
     command: |
+      .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"
       validate_gradle_wrapper
     priority: 1
     plugins: [$CI_TOOLKIT]
@@ -28,15 +29,19 @@ steps:
 
       - label: "🕵️ Lint WordPress"
         key: wplint
-        command: ".buildkite/commands/lint.sh wordpress"
+        command: |
+          .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"
+          .buildkite/commands/lint.sh wordpress
         priority: 1
         plugins: [$CI_TOOLKIT]
         artifact_paths:
           - "**/build/reports/lint-results*.*"
 
       - label: "🕵️ Lint Jetpack"
         key: jplint
-        command: ".buildkite/commands/lint.sh jetpack"
+        command: |
+          .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"
+          .buildkite/commands/lint.sh jetpack
         priority: 1
         plugins: [$CI_TOOLKIT]
         artifact_paths:
@@ -50,7 +55,9 @@ steps:
 
       - label: ":wordpress: :android: Release Build"
         key: wpbuild
-        command: ".buildkite/commands/release-build.sh wordpress"
+        command: |
+          .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"
+          .buildkite/commands/release-build.sh wordpress
         priority: 1
         depends_on: wplint
         plugins: [$CI_TOOLKIT]
@@ -63,7 +70,9 @@ steps:
 
       - label: ":jetpack: :android: Release Build"
         key: jpbuild
-        command: ".buildkite/commands/release-build.sh jetpack"
+        command: |
+          .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"
+          .buildkite/commands/release-build.sh jetpack
         priority: 1
         depends_on: jplint
         plugins: [$CI_TOOLKIT]
@@ -81,6 +90,8 @@ steps:
     depends_on:
       - wpbuild
       - jpbuild
-    command: ".buildkite/commands/create-github-release.sh"
+    command: |
+      .buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"
+      .buildkite/commands/create-github-release.sh
     priority: 1
     plugins: [$CI_TOOLKIT]
diff --git a/.buildkite/schedules/dependency-analysis.yml b/.buildkite/schedules/dependency-analysis.yml
@@ -8,7 +8,6 @@ steps:
   - label: "dependency analysis"
     command: |
       echo "--- 📊 Analyzing"
-      cp gradle.properties-example gradle.properties
       ./gradlew buildHealth
     plugins: [$CI_TOOLKIT]
     artifact_paths:

diff --git a/.buildkite/update-release-notes.yml b/.buildkite/update-release-notes.yml
@@ -9,7 +9,6 @@ steps:
       echo '--- :robot_face: Use bot for git operations'
       source use-bot-for-git
 
-      echo '--- :git: Checkout Editorial Branch'
       .buildkite/commands/checkout-editorial-branch.sh
 
       echo '--- :ruby: Setup Ruby Tools'

diff --git a/.configure b/.configure
@@ -1,11 +1,11 @@
 {
   "project_name": "WordPress-Android",
   "branch": "trunk",
-  "pinned_hash": "04a650613d9f0bb3fde8f0961e2494343f0df26d",
+  "pinned_hash": "11fa9c59619ba8d31d0bce2b7ba4412074c00d69",
   "files_to_copy": [
     {
-      "file": "android/WPAndroid/gradle.properties",
-      "destination": "gradle.properties",
+      "file": "android/WPAndroid/secrets.properties",
+      "destination": "~/.configure/wordpress-android/secrets/secrets.properties",
       "encrypt": true
     },
     {
@@ -52,4 +52,4 @@
   "file_dependencies": [
 
   ]
-}
+}
diff --git a/.configure-files/secrets.properties.enc b/.configure-files/secrets.properties.enc
diff --git a/.github/workflows/submit-gradle-dependencies.yml b/.github/workflows/submit-gradle-dependencies.yml
@@ -15,6 +15,5 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '17'
-      - run: cp gradle.properties-example gradle.properties
       - name: Setup Gradle to generate and submit dependency graphs
         uses: gradle/actions/dependency-submission@v3
diff --git a/.gitignore b/.gitignore
@@ -50,7 +50,8 @@ captures/
 
 # Gradle
 .gradle/
-gradle.properties
+libs/fluxc/developer.properties
+libs/login/developer.properties
 
 # Generated by gradle
 crashlytics.properties

diff --git a/README.md b/README.md
@@ -8,7 +8,6 @@ If you're a developer wanting to contribute, read on.
 1. Make sure you've installed [Android Studio](https://developer.android.com/studio).
 1. Install npm using [Node Version Manager](https://github.com/nvm-sh/nvm)(nvm), as described in step one from the [Block Editor Quickstart guide](https://developer.wordpress.org/block-editor/getting-started/devenv/#quickstart)
 1. `cd WordPress-Android` to enter the working directory.
-1. `cp gradle.properties-example gradle.properties` to set up the sample app credentials file.
 1. In Android Studio, open the project from the local repository. This will auto-generate `local.properties` with the SDK location.
 1. Recommended: The CI uses JDK11 to build the app and run the tests. Some tests won't pass on the JDK embedded in Android Studio (JDK8). You might want to set JAVA_HOME and JDK location in Android Studio to JDK11.
 1. Go to Tools → AVD Manager and create an emulated device.