From 08e92a5374b1e27ddab9d1f3ebb2e67091938d37 Mon Sep 17 00:00:00 2001
From: Nikita Salnikov-Tarnovski <gnikem@gmail.com>
Date: Wed, 1 Dec 2021 19:27:45 +0200
Subject: [PATCH] Rework build scan configuration (#4763)

---
 settings.gradle.kts | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 7598ec22b5..de4e75406a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -33,23 +33,32 @@ val geAccessKey = System.getenv("GRADLE_ENTERPRISE_ACCESS_KEY") ?: ""
 // if GE access key is not given and we are in CI, then we publish to scans.gradle.com
 val useScansGradleCom = isCI && geAccessKey.isEmpty()
 
-gradleEnterprise {
-  if (!useScansGradleCom) {
-    server = gradleEnterpriseServer
-  }
-  buildScan {
-    if (useScansGradleCom) {
+if (useScansGradleCom) {
+  gradleEnterprise {
+    buildScan {
       termsOfServiceUrl = "https://gradle.com/terms-of-service"
       termsOfServiceAgree = "yes"
+      isUploadInBackground = !isCI
+      publishAlways()
+
+      capture {
+        isTaskInputFiles = true
+      }
     }
-    publishAlways()
-    this as com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionWithHiddenFeatures
-    publishIfAuthenticated()
+  }
+} else {
+  gradleEnterprise {
+    server = gradleEnterpriseServer
+    buildScan {
+      isUploadInBackground = !isCI
 
-    isUploadInBackground = !isCI
+      this as com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionWithHiddenFeatures
+      publishIfAuthenticated()
+      publishAlways()
 
-    capture {
-      isTaskInputFiles = true
+      capture {
+        isTaskInputFiles = true
+      }
     }
   }
 }