From 3939758fa497bd7664a59072376743610798f0e2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 17 Apr 2024 11:14:23 +0000
Subject: [PATCH 1/5] chore(deps): update plugin com.gradle.enterprise to
 v3.17.2

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index e0b91d6a7..39d9e11ec 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gradle.enterprise' version '3.17'
+    id 'com.gradle.enterprise' version '3.17.2'
 }
 
 dependencyResolutionManagement {

From 8b69a592c064cd308e7312f5c2fb4aa1af8f6eba Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 24 Apr 2024 15:26:26 +0800
Subject: [PATCH 2/5] Migrate to develocity plugin

---
 settings.gradle | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index 39d9e11ec..8f8ff695d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gradle.enterprise' version '3.17.2'
+    id 'com.gradle.develocity' version '3.17.2'
 }
 
 dependencyResolutionManagement {
@@ -15,11 +15,13 @@ dependencyResolutionManagement {
     }
 }
 
-gradleEnterprise {
+def isCI = providers.systemProperty('CI').present
+
+develocity {
     buildScan {
-        termsOfServiceUrl = 'https://gradle.com/terms-of-service'
-        termsOfServiceAgree = 'yes'
-        publishAlways()
+        termsOfUseUrl = 'https://gradle.com/terms-of-service'
+        termsOfUseAgree = 'yes'
+        publishing.onlyIf { isCI }
         if (System.env.CI == 'true') {
             tag 'CI'
             if (System.env.CIRCLE_TAG) {

From 4b4f15ab65b4ef41283f5db6f14338a663db1823 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 24 Apr 2024 15:29:20 +0800
Subject: [PATCH 3/5] Reuse

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 8f8ff695d..809349666 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -22,7 +22,7 @@ develocity {
         termsOfUseUrl = 'https://gradle.com/terms-of-service'
         termsOfUseAgree = 'yes'
         publishing.onlyIf { isCI }
-        if (System.env.CI == 'true') {
+        if (isCI) {
             tag 'CI'
             if (System.env.CIRCLE_TAG) {
                 link 'VCS', "https://github.com/johnrengelman/shadow/tree/${System.env.CIRCLE_TAG}"

From 1fb939a7e4fe6115e87c5f003bc726f42c46caef Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 24 Apr 2024 15:33:57 +0800
Subject: [PATCH 4/5] Fix

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index 809349666..cc8ef0e08 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -15,7 +15,7 @@ dependencyResolutionManagement {
     }
 }
 
-def isCI = providers.systemProperty('CI').present
+def isCI = providers.environmentVariable('CI').present
 
 develocity {
     buildScan {

From 278abc4e7825184c03a0b5d8000adfbeb8933939 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 24 Apr 2024 15:40:26 +0800
Subject: [PATCH 5/5] Migrate more

---
 .../gradle/plugins/shadow/ShadowPlugin.groovy | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 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 1191afc94..36ced5f5d 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
@@ -6,8 +6,6 @@ import org.gradle.api.Project
 import org.gradle.api.plugins.ApplicationPlugin
 import org.gradle.api.plugins.JavaPlugin
 
-import static java.util.Objects.nonNull
-
 class ShadowPlugin implements Plugin<Project> {
 
     @Override
@@ -21,17 +19,25 @@ 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') {
-                rootProject.buildScan.buildFinished {
-                    def shadowTasks = tasks.withType(ShadowJar)
-                    shadowTasks.each { task ->
-                        if (task.didWork) {
-                            task.stats.buildScanData.each { k, v ->
-                                rootProject.buildScan.value "shadow.${task.path}.${k}", v.toString()
-                            }
-                            rootProject.buildScan.value "shadow.${task.path}.configurations", task.configurations*.name.join(", ")
-                        }
+                configureBuildScan(rootProject)
+            }
+            rootProject.plugins.withId('com.gradle.develocity') {
+                configureBuildScan(rootProject)
+            }
+        }
+    }
+
+    private void configureBuildScan(Project rootProject) {
+        rootProject.buildScan.buildFinished {
+            def shadowTasks = tasks.withType(ShadowJar)
+            shadowTasks.each { task ->
+                if (task.didWork) {
+                    task.stats.buildScanData.each { k, v ->
+                        rootProject.buildScan.value "shadow.${task.path}.${k}", v.toString()
                     }
+                    rootProject.buildScan.value "shadow.${task.path}.configurations", task.configurations*.name.join(", ")
                 }
             }
         }