From cfd6e58ebe11059e6057c5031cb74b3260ffdbf9 Mon Sep 17 00:00:00 2001
From: Petros Paraskevopoulos <petros.paraskevopoulos@automattic.com>
Date: Fri, 28 Jun 2024 12:32:34 +0300
Subject: [PATCH 1/3] Build: Add dependency analysis plugin

FYI: This commit adds a previous version of the plugin (1.28.0) and not
the latest version (1.32.0). This is because the latest version gets
stuck during the 'computeActualUsage' phase and increases the build time
of the 'buildHealth' task by as much as five times (5x).

For more info see: Stuck in computeActualUsageDebug for many minutes
#1186 (https://github.com/autonomousapps/
dependency-analysis-gradle-plugin/issues/1186)
---
 build.gradle    | 1 +
 settings.gradle | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/build.gradle b/build.gradle
index 35cbeef403dd..4e6632668e9c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,6 +5,7 @@ plugins {
     id "io.gitlab.arturbosch.detekt"
     id 'com.automattic.android.measure-builds'
     id "org.jetbrains.kotlinx.kover"
+    id "com.autonomousapps.dependency-analysis"
     id "androidx.navigation.safeargs.kotlin" apply false
     id "com.android.library" apply false
     id 'com.google.gms.google-services' apply false
diff --git a/settings.gradle b/settings.gradle
index 0d1018fd702f..ce16fc371913 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -10,6 +10,7 @@ pluginManagement {
     gradle.ext.violationCommentsVersion = '1.70.0'
     gradle.ext.measureBuildsVersion = '2.1.2'
     gradle.ext.koverVersion = '0.7.5'
+    gradle.ext.dependencyAnalysisVersion = '1.28.0'
 
     plugins {
         id "org.jetbrains.kotlin.android" version gradle.ext.kotlinVersion
@@ -28,6 +29,7 @@ pluginManagement {
         id "org.jetbrains.kotlinx.kover" version gradle.ext.koverVersion
         id "com.google.dagger.hilt.android" version gradle.ext.daggerVersion
         id "com.google.devtools.ksp" version gradle.ext.kspVersion
+        id "com.autonomousapps.dependency-analysis" version gradle.ext.dependencyAnalysisVersion
     }
     repositories {
         maven {

From 639790545ecf085afd91fb3355e93a4ced4ff985 Mon Sep 17 00:00:00 2001
From: Petros Paraskevopoulos <petros.paraskevopoulos@automattic.com>
Date: Fri, 28 Jun 2024 13:08:28 +0300
Subject: [PATCH 2/3] Build: Ignored variants configuration for dependency
 analysis plugin

This commit updates the encrypted 'gradle.properties.enc' file to point
to that pinned hash which has the
'dependency.analysis.android.ignored.variants'
property added into the 'gradle.properties' file for the WPAndroid
project.

FYI: With this configuration only the 'debug' variant (build type) for
the lib modules and 'wordpressJalapenoDebug' + 'jetpackJalapenoDebug'
variants (product flavor + build type) for the app module is going to
be included, with the rest of the variants ignored.
---
 .configure                             |   2 +-
 .configure-files/gradle.properties.enc | Bin 3424 -> 3744 bytes
 gradle.properties-example              |   3 +++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.configure b/.configure
index d6e9f159bcec..9abd2a6ba5c6 100644
--- a/.configure
+++ b/.configure
@@ -1,7 +1,7 @@
 {
   "project_name": "WordPress-Android",
   "branch": "trunk",
-  "pinned_hash": "715a5a119a334ec1ef16b5a6bd77c52094144813",
+  "pinned_hash": "4b536af182cc61c263b07262e41c141f06fd5de6",
   "files_to_copy": [
     {
       "file": "android/WPAndroid/gradle.properties",
diff --git a/.configure-files/gradle.properties.enc b/.configure-files/gradle.properties.enc
index c2c83c9d107128cd59d3a559451e8fec1ba7678d..cfe19b47de6be594229fb660683145deae33d893 100644
GIT binary patch
delta 2265
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

delta 1943
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

diff --git a/gradle.properties-example b/gradle.properties-example
index 8e52efd546b9..4fef2c46ec7b 100644
--- a/gradle.properties-example
+++ b/gradle.properties-example
@@ -48,3 +48,6 @@ wp.e2e.signup_email=e2eflowsignuptestingmobile@example.com
 wp.e2e.signup_username=e2eflowsignuptestingmobile
 wp.e2e.signup_display_name=e2eflowsignuptestingmobile
 wp.e2e.signup_password=mocked_password
+
+# Dependency Analysis Plugin
+dependency.analysis.android.ignored.variants=release,wordpressVanillaDebug,wordpressVanillaRelease,wordpressWasabiDebug,wordpressWasabiRelease,wordpressJalapenoRelease,jetpackVanillaDebug,jetpackVanillaRelease,jetpackWasabiDebug,jetpackWasabiRelease,jetpackJalapenoRelease

From 65e421a9e7dcf0c9625850a01eae45a5debea80e Mon Sep 17 00:00:00 2001
From: Petros Paraskevopoulos <petros.paraskevopoulos@automattic.com>
Date: Fri, 28 Jun 2024 13:18:39 +0300
Subject: [PATCH 3/3] CI: Add a scheduled dependency analysis job

FYI:
1. This job will be then used by 'buildkite-ci' and configured as a
'buildkite_pipeline_schedule' with a weekly frequently.
2. This job will also notify on the android-core-notifs slack channel
on a build failure.
3. This job has added custom meta-data for dependency analysis purposes.
This is done in order for it to be queried and easily identifiable
amongst other builds when working with the Buildkite's REST API.
---
 .buildkite/schedules/dependency-analysis.yml | 23 ++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 .buildkite/schedules/dependency-analysis.yml

diff --git a/.buildkite/schedules/dependency-analysis.yml b/.buildkite/schedules/dependency-analysis.yml
new file mode 100644
index 000000000000..fb6cd3b469f7
--- /dev/null
+++ b/.buildkite/schedules/dependency-analysis.yml
@@ -0,0 +1,23 @@
+# Nodes with values to reuse in the pipeline.
+common_params:
+  # Common plugin settings to use with the `plugins` key.
+  - &ci_toolkit
+      automattic/a8c-ci-toolkit#3.4.2
+
+agents:
+  queue: "android"
+
+steps:
+  - label: "dependency analysis"
+    # The meta-data added is used by Apps Metrics Prometheus collector to find the build.
+    command: |
+      buildkite-agent meta-data set "scheduled-build" "dependency-analysis"
+      echo "--- 📊 Analyzing"
+      cp gradle.properties-example gradle.properties
+      ./gradlew buildHealth
+    plugins: [*ci_toolkit]
+    artifact_paths:
+      - "build/reports/dependency-analysis/build-health-report.*"
+    notify:
+      - slack: "#android-core-notifs"
+        if: build.state == "failed"