From e68c0736c3acebbfda4a236f934bc96e7200498b Mon Sep 17 00:00:00 2001
From: Giuseppe Barbieri <elect86@gmail.com>
Date: Fri, 27 Sep 2024 11:43:54 +0200
Subject: [PATCH] - enabling configuration cache - removing `project` reference
 in Sign.configureEach as this was disrupting the configuration cache -
 removing empty lines - commenting out unused variables - fixing imports

---
 build.gradle.kts                                 | 11 +++++++----
 buildSrc/build.gradle.kts                        |  1 -
 buildSrc/src/main/kotlin/sciview/sign.gradle.kts |  3 ++-
 gradle.properties                                |  2 ++
 settings.gradle.kts                              |  2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index bd7b70892..b5563cd2f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,5 @@
-import org.gradle.kotlin.dsl.implementation
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import java.net.URL
-import sciview.*
+import sciview.lwjglNatives
 
 plugins {
     java
@@ -184,7 +182,7 @@ tasks {
 
     withType<GenerateMavenPom>().configureEach {
         val scijavaParentPomVersion = project.properties["scijavaParentPOMVersion"]
-        val matcher = Regex("""generatePomFileFor(\w+)Publication""").matchEntire(name)
+//        val matcher = Regex("""generatePomFileFor(\w+)Publication""").matchEntire(name)
 //        val publicationName = matcher?.let { it.groupValues[1] }
 
         pom.properties.empty()
@@ -477,3 +475,8 @@ task<Copy>("copyDependencies") {
 }
 
 java.withSourcesJar()
+
+//extensions.findByName("buildScan")?.withGroovyBuilder {
+//    setProperty("termsOfServiceUrl", "https://gradle.com/terms-of-service")
+//    setProperty("termsOfServiceAgree", "yes")
+//}
\ No newline at end of file
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 76a00f7e0..15cd1f51c 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -11,5 +11,4 @@ repositories {
 dependencies {
     implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.9.20")
     implementation("de.undercouch:gradle-download-task:5.6.0")
-
 }
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/sciview/sign.gradle.kts b/buildSrc/src/main/kotlin/sciview/sign.gradle.kts
index aa477afd3..4be9b9caf 100644
--- a/buildSrc/src/main/kotlin/sciview/sign.gradle.kts
+++ b/buildSrc/src/main/kotlin/sciview/sign.gradle.kts
@@ -16,6 +16,7 @@ signing {
 }
 
 tasks.withType<Sign>().configureEach {
-    onlyIf { project.hasProperty("release") }
+    val isRelease = hasProperty("release")
+    onlyIf { isRelease }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 91aaef276..c72879063 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,7 @@
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=2g
 org.gradle.caching=true
+org.gradle.configuration-cache=true
+#org.gradle.caching.debug=true
 jvmTarget=21
 #useLocalScenery=true
 kotlinVersion=1.9.23
diff --git a/settings.gradle.kts b/settings.gradle.kts
index da795aac1..236aca34f 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -31,4 +31,4 @@ if (System.getProperty("CI").toBoolean() != true
     if(File("../scenery/build.gradle.kts").exists()) {
         logger.warn("Including local scenery project instead of version declared in build, set -PuseLocalScenery=false to use declared version instead.")
         includeBuild("../scenery")
-    }
+    }
\ No newline at end of file