From 5c8fcec38042dc41f5153aac9fa7e2a2d5efa384 Mon Sep 17 00:00:00 2001
From: Wojtek Zieba <wojtek.zieba@automattic.com>
Date: Fri, 22 Nov 2024 12:36:01 +0100
Subject: [PATCH 1/5] Enable configuration cache

---
 gradle.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gradle.properties b/gradle.properties
index b5559839f0d7..a9cdcd14e303 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,6 +3,7 @@ ksp.allow.all.target.configuration=false
 
 # Enables Gradle Build Cache - https://docs.gradle.org/current/userguide/build_cache.html
 org.gradle.caching=true
+org.gradle.configuration-cache=true
 
 android.useAndroidX=true
 android.enableJetifier=false

From b0e2ac244940310f2af53355192ad6a828f2ffed Mon Sep 17 00:00:00 2001
From: Wojtek Zieba <wojtek.zieba@automattic.com>
Date: Fri, 22 Nov 2024 12:36:15 +0100
Subject: [PATCH 2/5] Remove unused `printVersionName` task

---
 WooCommerce/build.gradle | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle
index 90aa0fbff666..373f5128796d 100644
--- a/WooCommerce/build.gradle
+++ b/WooCommerce/build.gradle
@@ -552,12 +552,6 @@ android.buildTypes.all { buildType ->
     }
 }
 
-task printVersionName {
-    doLast {
-        println android.defaultConfig.versionName
-    }
-}
-
 static def loadPropertiesFromFile(inputFile) {
     def properties = new Properties()
     inputFile.withInputStream { stream ->

From ba218f30be19c5936808e316d89fd888bdd97f85 Mon Sep 17 00:00:00 2001
From: Wojtek Zieba <wojtek.zieba@automattic.com>
Date: Fri, 22 Nov 2024 12:37:10 +0100
Subject: [PATCH 3/5] Address deprecation of `String flavorDimensions`

---
 WooCommerce/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle
index 373f5128796d..8959fc8e1020 100644
--- a/WooCommerce/build.gradle
+++ b/WooCommerce/build.gradle
@@ -151,7 +151,7 @@ android {
         coreLibraryDesugaringEnabled true
     }
 
-    flavorDimensions "buildType"
+    flavorDimensions = ["buildType"]
 
     productFlavors {
         // Used for release/beta builds. Usually shouldn't be build locally.

From 37afcec75f5a1cf110cf30cd452d1e743b7ab94e Mon Sep 17 00:00:00 2001
From: Wojtek Zieba <wojtek.zieba@automattic.com>
Date: Fri, 22 Nov 2024 12:46:03 +0100
Subject: [PATCH 4/5] Remove `detektAutoCorrectPrompt` task

It was added to raise awareness of `--auto-correct` feature and I think it already fulfilled its purpose.

I remove this task because it's not configuration-cache compatible and I don't think it's worth to spend time on making it compatible
---
 build.gradle | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/build.gradle b/build.gradle
index c1cb2a246663..158e753228d2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -83,7 +83,7 @@ subprojects {
     }
 }
 
-def detektAll = tasks.register("detektAll", Detekt) {
+tasks.register("detektAll", Detekt) {
     description = "Custom DETEKT build for all modules"
     parallel = true
     ignoreFailures = false
@@ -101,21 +101,6 @@ def detektAll = tasks.register("detektAll", Detekt) {
     }
 }
 
-def detektAutoCorrectPrompt = tasks.register("detektAutoCorrectPrompt") {
-    doLast {
-        def detektTask = detektAll.get()
-        if (detektTask.state.failure != null && !detektTask.autoCorrect) {
-            println ".-----------------------------------------------------------------------------------------------------------------------------------.\n" +
-                    "| 🛠  Did you know: you can ask Detekt to automatically resolve some of the issues by running `./gradlew detektAll --auto-correct` |\n" +
-                    "'-----------------------------------------------------------------------------------------------------------------------------------'"
-        }
-    }
-}
-
-detektAll.configure {
-    finalizedBy detektAutoCorrectPrompt
-}
-
 dependencies {
     detektPlugins(libs.detekt.formatting)
 }

From b27a044c83ae740874aa39e2f171b66c0f366405 Mon Sep 17 00:00:00 2001
From: Wojtek Zieba <wojtek.zieba@automattic.com>
Date: Fri, 22 Nov 2024 12:49:37 +0100
Subject: [PATCH 5/5] Address `buildDir` deprecation, make `clean` task lazy

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 158e753228d2..6fa70f15ae0f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -105,8 +105,8 @@ dependencies {
     detektPlugins(libs.detekt.formatting)
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
+tasks.register('clean', Delete) {
+    delete rootProject.layout.buildDirectory
 }
 
 /**