Fix some IP problems in the build

build-logic-commons/basics/build.gradle.kts

@@ -14,6 +14,7 @@ java {
 }
 
 dependencies {
+    api("gradlebuild:environment")
     api(platform(project(":build-platform")))
 
     implementation("com.google.guava:guava") {

build-logic-commons/basics/src/main/kotlin/gradlebuild/basics/BuildEnvironment.kt

@@ -27,15 +27,8 @@ import org.gradle.internal.os.OperatingSystem
 import org.gradle.kotlin.dsl.*
 
 
-abstract class BuildEnvironmentExtension {
-    abstract val gitCommitId: Property<String>
-    abstract val gitBranch: Property<String>
-    abstract val repoRoot: DirectoryProperty
-}
-
-
 // `generatePrecompiledScriptPluginAccessors` task invokes this method without `gradle.build-environment` applied
-fun Project.getBuildEnvironmentExtension(): BuildEnvironmentExtension? = rootProject.extensions.findByType(BuildEnvironmentExtension::class.java)
+fun Project.getBuildEnvironmentExtension(): BuildEnvironmentExtension? = extensions.findByType(BuildEnvironmentExtension::class.java)
 
 
 fun Project.repoRoot(): Directory = getBuildEnvironmentExtension()?.repoRoot?.get() ?: layout.projectDirectory.parentOrRoot()
@@ -65,24 +58,6 @@ fun Project.currentGitBranchViaFileSystemQuery(): Provider<String> = getBuildEnv
 fun Project.currentGitCommitViaFileSystemQuery(): Provider<String> = getBuildEnvironmentExtension()?.gitCommitId ?: objects.property(String::class.java)
 
 
-@Suppress("UnstableApiUsage")
-fun Project.git(vararg args: String): Provider<String> {
-    val projectDir = layout.projectDirectory.asFile
-    val execOutput = providers.exec {
-        workingDir = projectDir
-        isIgnoreExitValue = true
-        commandLine = listOf("git", *args)
-        if (OperatingSystem.current().isWindows) {
-            commandLine = listOf("cmd", "/c") + commandLine
-        }
-    }
-    return execOutput.result.zip(execOutput.standardOutput.asText) { result, outputText ->
-        if (result.exitValue == 0) outputText.trim()
-        else "<unknown>" // It's a source distribution, we don't know.
-    }
-}
-
-
 // pre-test/master/queue/alice/feature -> master
 // pre-test/release/current/bob/bugfix -> release
 // gh-readonly-queue/master/pr-1234-5678abcdef -> master

build-logic-commons/settings.gradle.kts

@@ -24,6 +24,8 @@ plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
 }
 
+includeBuild("../build-logic-settings")
+
 // Shared basics for all
 include("basics")
 

build-logic-settings/build.gradle.kts

@@ -0,0 +1,17 @@
+/*
+ * Copyright 2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+description = "Provides settings plugins for configuring global build configuration"

build-logic-settings/environment/build.gradle.kts

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    `kotlin-dsl`
+}
+
+description = "Provides plugins for configuring global settings"
+
+group = "gradlebuild"
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(11)
+        vendor = JvmVendorSpec.ADOPTIUM
+    }
+}

build-logic/root-build/src/main/kotlin/gradlebuild.build-environment.gradle.kts → build-logic-settings/environment/src/main/kotlin/gradlebuild.build-environment.settings.gradle.kts

@@ -1,9 +1,5 @@
-import gradlebuild.basics.BuildEnvironmentExtension
-import gradlebuild.basics.git
-import gradlebuild.basics.parentOrRoot
-
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +14,13 @@ import gradlebuild.basics.parentOrRoot
  * limitations under the License.
  */
 
+import gradlebuild.basics.BuildEnvironmentExtension
+import gradlebuild.basics.git
 
-val buildEnvironmentExtension = extensions.create("buildEnvironment", BuildEnvironmentExtension::class)
-buildEnvironmentExtension.gitCommitId = git("rev-parse", "HEAD")
-buildEnvironmentExtension.gitBranch = git("rev-parse", "--abbrev-ref", "HEAD")
-buildEnvironmentExtension.repoRoot = layout.projectDirectory.parentOrRoot()
+val buildLayout = layout
+gradle.lifecycle.beforeProject {
+    val buildEnvironmentExtension = extensions.create("buildEnvironment", BuildEnvironmentExtension::class)
+    buildEnvironmentExtension.gitCommitId = git("rev-parse", "HEAD")
+    buildEnvironmentExtension.gitBranch = git("rev-parse", "--abbrev-ref", "HEAD")
+    buildEnvironmentExtension.repoRoot = buildLayout.rootDirectory
+}

build-logic-settings/environment/src/main/kotlin/gradlebuild/basics/BuildEnvironmentExtension.kt

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package gradlebuild.basics
+
+import org.gradle.api.Project
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.provider.Provider
+import org.gradle.internal.os.OperatingSystem
+
+abstract class BuildEnvironmentExtension {
+    abstract val gitCommitId: Property<String>
+    abstract val gitBranch: Property<String>
+    abstract val repoRoot: DirectoryProperty
+}
+
+@Suppress("UnstableApiUsage")
+fun Project.git(vararg args: String): Provider<String> {
+    val projectDir = layout.projectDirectory.asFile
+    val execOutput = providers.exec {
+        workingDir = projectDir
+        isIgnoreExitValue = true
+        commandLine = listOf("git", *args)
+        if (OperatingSystem.current().isWindows) {
+            commandLine = listOf("cmd", "/c") + commandLine
+        }
+    }
+    return execOutput.result.zip(execOutput.standardOutput.asText) { result, outputText ->
+        if (result.exitValue == 0) outputText.trim()
+        else "<unknown>" // It's a source distribution, we don't know.
+    }
+}

build-logic-settings/settings.gradle.kts

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+dependencyResolutionManagement {
+    repositories {
+        gradlePluginPortal()
+    }
+}
+
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
+}
+
+include("environment")
+
+rootProject.name = "build-logic-settings"

build.gradle.kts

@@ -1,5 +1,4 @@
 plugins {
-    id("gradlebuild.build-environment")
     id("gradlebuild.root-build")
 
     id("gradlebuild.teamcity-import-test-data")  // CI: Import Test tasks' JUnit XML if they're UP-TO-DATE or FROM-CACHE

gradle/shared-with-buildSrc/mirrors.settings.gradle.kts

@@ -65,7 +65,7 @@ fun normalizeUrl(url: String): String {
     return if (result.endsWith("/")) result else "$result/"
 }
 
-gradle.allprojects {
+gradle.lifecycle.beforeProject {
     buildscript.configurations["classpath"].incoming.beforeResolve {
         withMirrors(buildscript.repositories)
     }

settings.gradle.kts

@@ -23,9 +23,11 @@ pluginManagement {
         }
         gradlePluginPortal()
     }
+    includeBuild("build-logic-settings")
 }
 
 plugins {
+    id("gradlebuild.build-environment")
     id("com.gradle.develocity").version("3.17.1") // Sync with `build-logic-commons/build-platform/build.gradle.kts`
     id("io.github.gradle.gradle-enterprise-conventions-plugin").version("0.9.1")
     id("org.gradle.toolchains.foojay-resolver-convention") version ("0.8.0")