Make build work with Gradle config-cache and project isolation (#891)

* Make test build configuration-cache compatible

* Adopt NMCP and migrate to included build-logic

* Misc config-cache compatibiltiy changes

* Fix config-cache reuse issue

* Make publishing config-cache safe

* Remove Gradle wrapper jar from source tree

* Add safeguard for config-cache in CI

* Fix some Gradle deprecations

* Prevent/fix `Calculating task graph as configuration cache cannot be reused because an input to unknown location has changed.`

Author: snazy

.gitignore

@@ -4,6 +4,10 @@ build/
 .gradle/
 buildSrc/.kotlin/
 
+# Ignore Gradle wrapper jar file
+gradle/wrapper/gradle-wrapper.jar
+gradle/wrapper/gradle-wrapper-*.sha256
+
 # Maven
 **/.mvn/wrapper/maven-wrapper.jar
 target/
@@ -13,3 +17,5 @@ target/
 out/
 
 conformance/conformance-server.pid
+
+/.env

bom/build.gradle.kts

@@ -18,7 +18,7 @@ plugins {
   `java-platform`
   `maven-publish`
   signing
-  `cel-conventions`
+  id("cel-conventions")
 }
 
 dependencies {

buildSrc/build.gradle.kts build-logic/build.gradle.ktsbuildSrc/build.gradle.kts renamed to build-logic/build.gradle.kts

@@ -31,11 +31,10 @@ import org.jetbrains.gradle.ext.settings
 fun Project.nessieIde() {
   apply<EclipsePlugin>()
 
-  if (this == rootProject) {
+  if (path == ":") {
 
-    val projectName = rootProject.file("ide-name.txt").readText().trim()
-    val ideName =
-      "$projectName ${rootProject.version.toString().replace(Regex("^([0-9.]+).*"), "$1")}"
+    val projectName = layout.settingsDirectory.file("ide-name.txt").asFile.readText().trim()
+    val ideName = "$projectName ${version.toString().replace(Regex("^([0-9.]+).*"), "$1")}"
 
     apply<IdeaExtPlugin>()
     configure<IdeaModel> {
@@ -51,7 +50,11 @@ fun Project.nessieIde() {
           profiles.create("Nessie-ASF") {
             // strip trailing LF
             val copyrightText =
-              rootProject.file("codestyle/copyright-header.txt").readLines().joinToString("\n")
+              layout.settingsDirectory
+                .file("codestyle/copyright-header.txt")
+                .asFile
+                .readLines()
+                .joinToString("\n")
             notice = copyrightText
           }
         }
@@ -63,8 +66,9 @@ fun Project.nessieIde() {
           defaults = true
 
           jvmArgs =
-            rootProject.projectDir
-              .resolve("gradle.properties")
+            layout.settingsDirectory
+              .file("gradle.properties")
+              .asFile
               .reader()
               .use {
                 val rules = java.util.Properties()
@@ -81,10 +85,13 @@ fun Project.nessieIde() {
 
     // There's no proper way to set the name of the IDEA project (when "just importing" or syncing
     // the Gradle project)
-    val ideaDir = projectDir.resolve(".idea")
+    val ideaDir = layout.projectDirectory.dir(".idea").asFile
 
-    if (ideaDir.isDirectory) {
-      ideaDir.resolve(".name").writeText(ideName)
+    if (java.lang.Boolean.getBoolean("idea.sync.active") && ideaDir.isDirectory) {
+      val ideaNameFile = ideaDir.resolve(".name")
+      if (!ideaNameFile.isFile || ideaNameFile.readText() != ideName) {
+        ideaNameFile.writeText(ideName)
+      }
     }
 
     configure<EclipseModel> { project { name = ideName } }

buildSrc/settings.gradle.kts build-logic/settings.gradle.ktsbuildSrc/settings.gradle.kts renamed to build-logic/settings.gradle.kts

@@ -65,7 +65,7 @@ fun Project.nessieConfigureJava() {
     }
   }
 
-  if (project != rootProject) {
+  if (path != ":") {
     tasks.withType<Jar>().configureEach { duplicatesStrategy = DuplicatesStrategy.WARN }
   }
 }