From ce9afeaccf9c1576602b9bcace950a65cdcfd4c0 Mon Sep 17 00:00:00 2001
From: Aurimas Liutikas <aurimas@google.com>
Date: Tue, 1 Oct 2024 07:18:07 -0700
Subject: [PATCH 1/2] Add a new gradle property to control develocity
 integration

Configuring develocity build scan additional detail publishing breaks
Gradle project isolation https://github.com/GradleUp/shadow/issues/907

This change adds a new property com.gradleup.shadow.enableDevelocityIntegration
that defaults to true, however it allows folks to set it to false and
make shadow plugin usage project isolation safe.
---
 .../gradle/plugins/shadow/ShadowPlugin.groovy   | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowPlugin.groovy b/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowPlugin.groovy
index 4b2262f97..dbac650b4 100644
--- a/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowPlugin.groovy
+++ b/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowPlugin.groovy
@@ -21,12 +21,17 @@ class ShadowPlugin implements Plugin<Project> {
                 plugins.apply(ShadowApplicationPlugin)
             }
 
-            // Legacy build scan support for Gradle Enterprise, users should migrate to develocity plugin.
-            rootProject.plugins.withId('com.gradle.enterprise') {
-                configureBuildScan(rootProject)
-            }
-            rootProject.plugins.withId('com.gradle.develocity') {
-                configureBuildScan(rootProject)
+            boolean enableDevelocityIntegration = providers.gradleProperty(
+                "com.gradleup.shadow.enableDevelocityIntegration"
+            ).map { it.toBoolean() }.getOrElse(true)
+            if (enableDevelocityIntegration) {
+                // Legacy build scan support for Gradle Enterprise, users should migrate to develocity plugin.
+                rootProject.plugins.withId('com.gradle.enterprise') {
+                    configureBuildScan(rootProject)
+                }
+                rootProject.plugins.withId('com.gradle.develocity') {
+                    configureBuildScan(rootProject)
+                }
             }
         }
     }

From 032ed0d6484eb3570503200d1807d07ffe2a94b8 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 2 Oct 2024 12:13:14 +0800
Subject: [PATCH 2/2] Disable Develocity integration by default

---
 src/docs/changes/README.md                                    | 4 ++++
 .../jengelman/gradle/plugins/shadow/ShadowPlugin.groovy       | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/docs/changes/README.md b/src/docs/changes/README.md
index 2bb2152c9..b02a01a0c 100644
--- a/src/docs/changes/README.md
+++ b/src/docs/changes/README.md
@@ -3,6 +3,10 @@
 
 ## [Unreleased]
 
+**Changed**
+
+- Disable Develocity integration by default. ([#993](https://github.com/GradleUp/shadow/pull/993))
+
 
 ## [v8.3.2]
 
diff --git a/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowPlugin.groovy b/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowPlugin.groovy
index dbac650b4..3e9bbbc37 100644
--- a/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowPlugin.groovy
+++ b/src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowPlugin.groovy
@@ -23,7 +23,7 @@ class ShadowPlugin implements Plugin<Project> {
 
             boolean enableDevelocityIntegration = providers.gradleProperty(
                 "com.gradleup.shadow.enableDevelocityIntegration"
-            ).map { it.toBoolean() }.getOrElse(true)
+            ).map { it.toBoolean() }.getOrElse(false)
             if (enableDevelocityIntegration) {
                 // Legacy build scan support for Gradle Enterprise, users should migrate to develocity plugin.
                 rootProject.plugins.withId('com.gradle.enterprise') {