Delay GE server URL check for Gradle >=6

Now that we check in the shell scripts for the presence of the GE server url when instrumenting the build with GE, we should rarely get to the scenario where there is no server GE URL specified by the time the Gradle init script is invoked. In the case it happens, a buildFinished warning caused by the CCUD plugin will be shown on the cmd line but has no negative effect.

This change makes it easier to reason about the code flow for different Gradle versions.

Author: etiennestuder

components/scripts/gradle/gradle-init-scripts/configure-gradle-enterprise.gradle

@@ -203,8 +203,6 @@ if (GradleVersion.current() < GradleVersion.version('6.0')) {
                 if (geUrl) buildScan.server = geUrl
                 if (geAllowUntrustedServer) buildScan.allowUntrustedServer = geAllowUntrustedServer
 
-                // abort in afterEvaluate since any exceptions thrown in afterResolve are caught and not propagated,
-                // which means the build would try to publish a build scan to scans.gradle.com
                 if (!buildScan.server && !omitServerUrlValidation) {
                     logErrorMissingGradleEnterpriseServerURL()
                     throw new IllegalStateException("The Gradle Enterprise server URL is not configured.\n" +
@@ -228,15 +226,6 @@ if (GradleVersion.current() < GradleVersion.version('6.0')) {
                 extensionsWithPublicType(settings, GRADLE_ENTERPRISE_EXTENSION_CLASS).collect { settings[it.name] }.each { ext ->
                     if (geUrl) ext.server = geUrl
                     if (geAllowUntrustedServer) ext.allowUntrustedServer = geAllowUntrustedServer
-
-                    // abort immediately to avoid that the CCUD plugin tries to register a buildFinished listener
-                    // even though, by then, GE has already marked the build as finished (causes warning in the console)
-                    if (!ext.server && !omitServerUrlValidation) {
-                        logErrorMissingGradleEnterpriseServerURL()
-                        throw new IllegalStateException("The Gradle Enterprise server URL is not configured.\n" +
-                                "Either configure it directly (see https://docs.gradle.com/enterprise/gradle-plugin/#gradle_6_x_and_later_2) in the project,\n" +
-                                "or use `--gradle-enterprise-server` when running the build validation script.")
-                    }
                 }
             }
         } else {
@@ -263,6 +252,13 @@ if (GradleVersion.current() < GradleVersion.version('6.0')) {
             if (geUrl) ext.server = geUrl
             if (geAllowUntrustedServer) ext.allowUntrustedServer = geAllowUntrustedServer
 
+            if (!ext.server && !omitServerUrlValidation) {
+                logErrorMissingGradleEnterpriseServerURL()
+                throw new IllegalStateException("The Gradle Enterprise server URL is not configured.\n" +
+                        "Either configure it directly (see https://docs.gradle.com/enterprise/gradle-plugin/#gradle_6_x_and_later_2) in the project,\n" +
+                        "or use `--gradle-enterprise-server` when running the build validation script.")
+            }
+
             registerBuildScanActions(ext.buildScan)
             addBuildScanCustomData(ext.buildScan)
             configureBuildScanPublishing(ext.buildScan)