Fix configuration cache (#934)

Author: CedNaru

kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/projectExt/setupTasks.kt

@@ -158,29 +158,30 @@ private fun Project.registerUserFacingBuildTasks() {
 private fun Project.setupEntryGenerationTasks(
     classesTask: TaskProvider<out Task>,
 ): EntryGenerationTasks {
+    val fastBuildRequested = isFastBuildRequested()
     val packageUserJarTask = packageUserJarTask(
         userClassesTask = classesTask,
     )
     val generateEntryFilesTask = entryGenerationGenerateFilesTask(
         packageUserJarTask = packageUserJarTask,
     )
     generateEntryFilesTask.configure { task ->
-        task.onlyIf { !isFastBuildRequested() }
+        task.onlyIf { !fastBuildRequested }
     }
 
     val updateRegistrationFilesTask = if (godotJvmExtension.disableGdj.get()) {
         generateEntryFilesTask
     } else {
         val indexExistingRegistrationFilesTask = entryGenerationIndexExistingRegistrationFilesTask()
         indexExistingRegistrationFilesTask.configure { task ->
-            task.onlyIf { !isFastBuildRequested() }
+            task.onlyIf { !fastBuildRequested }
         }
         entryGenerationSyncRegistrationFilesTask(
             generateEntryFilesTask = generateEntryFilesTask,
             indexExistingRegistrationFilesTask = indexExistingRegistrationFilesTask,
         ).also { taskProvider ->
             taskProvider.configure { task ->
-                task.onlyIf { !isFastBuildRequested() }
+                task.onlyIf { !fastBuildRequested }
             }
         }
     }
@@ -189,7 +190,7 @@ private fun Project.setupEntryGenerationTasks(
         generateEntryFilesTask = generateEntryFilesTask,
     )
     generatedEntryJarTask.configure { task ->
-        task.onlyIf { !isFastBuildRequested() }
+        task.onlyIf { !fastBuildRequested }
     }
 
     return EntryGenerationTasks(

kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/entry_generation/ClassGraphIndexExistingRegistrationFilesTask.kt

@@ -150,14 +150,17 @@ internal fun readGeneratedRegistrationFiles(generatedRoot: File, logger: org.gra
 }
 
 fun Project.entryGenerationIndexExistingRegistrationFilesTask(): TaskProvider<ClassGraphIndexExistingRegistrationFilesTask> {
+    val godotProjectDir = requireConfiguredGodotProjectDirectory()
+    val registrationFileTree = godotRegistrationFileTree(godotProjectDir)
+
     return tasks.register(
         "entryGenerationIndexExistingRegistrationFiles",
         ClassGraphIndexExistingRegistrationFilesTask::class.java
     ) { task ->
         task.group = "godot-kotlin-jvm-internal"
         task.description = "Indexes existing .gdj files across the Godot project."
-        task.godotProjectDirPath.convention(providers.provider { requireConfiguredGodotProjectDirectory().absolutePath })
-        task.existingRegistrationFiles.from(providers.provider { godotRegistrationFileTree(requireConfiguredGodotProjectDirectory()) })
+        task.godotProjectDirPath.convention(godotProjectDir.absolutePath)
+        task.existingRegistrationFiles.from(registrationFileTree)
         task.existingRegistrationFilesIndexFile.convention(
             layout.buildDirectory.file("intermediates/entry-generation/existing-registration-files.idx")
         )

kt/plugins/godot-gradle-plugin/src/main/kotlin/godot/gradle/tasks/entry_generation/ClassGraphUpdateRegistrationFilesTask.kt

@@ -98,22 +98,20 @@ fun Project.entryGenerationSyncRegistrationFilesTask(
     generateEntryFilesTask: TaskProvider<ClassGraphGenerateEntryFilesTask>,
     indexExistingRegistrationFilesTask: TaskProvider<ClassGraphIndexExistingRegistrationFilesTask>,
 ): TaskProvider<ClassGraphUpdateRegistrationFilesTask> {
-    val registrationFilesOutputDir = providers.provider {
-        (
-            godotJvmExtension
-                .registrationFilesDirectory
-                .orNull
-                ?.asFile
-                ?: projectDir
-                    .resolve("gdj")
-                    .apply { mkdirs() }
-            )
-            .relativeTo(projectDir)
-            .path
-            .replace(File.separator, "/")
-            .removePrefix("/")
-            .removeSuffix("/")
-    }
+    val godotProjectDir = requireConfiguredGodotProjectDirectory()
+    val registrationFilesOutputDirPath = (
+        godotJvmExtension
+            .registrationFilesDirectory
+            .orNull
+            ?.asFile
+            ?: projectDir.resolve("gdj")
+        )
+        .relativeTo(projectDir)
+        .path
+        .replace(File.separator, "/")
+        .removePrefix("/")
+        .removeSuffix("/")
+    val registrationFilesOutputDir = layout.projectDirectory.dir(registrationFilesOutputDirPath)
 
     return tasks.register(
         "entryGenerationSyncRegistrationFiles",
@@ -126,25 +124,25 @@ fun Project.entryGenerationSyncRegistrationFilesTask(
         task.generatedRegistrationFilesRootDir.convention(
             generateEntryFilesTask.flatMap { it.generatedRegistrationFilesRootDir }
         )
-        task.godotProjectDirPath.convention(providers.provider { requireConfiguredGodotProjectDirectory().absolutePath })
+        task.godotProjectDirPath.convention(godotProjectDir.absolutePath)
         task.existingRegistrationFilesIndexFile.convention(
             indexExistingRegistrationFilesTask.flatMap { it.existingRegistrationFilesIndexFile }
         )
-        task.registrationFilesOutputDir.convention(
-            project.layout.projectDirectory.dir(registrationFilesOutputDir)
-        )
+        task.registrationFilesOutputDir.convention(registrationFilesOutputDir)
         task.synchronizedRegistrationFiles.from(providers.provider {
-            val generatedRoot = task.generatedRegistrationFilesRootDir.get().asFile
+            val generatedRoot = generateEntryFilesTask.get().generatedRegistrationFilesRootDir.get().asFile
             val generatedFilesByFileName = readGeneratedRegistrationFiles(generatedRoot, logger)
-            val existingRegistrationFileIndex = readExistingRegistrationFileIndex(task.existingRegistrationFilesIndexFile.get().asFile)
+            val existingRegistrationFileIndex = readExistingRegistrationFileIndex(
+                indexExistingRegistrationFilesTask.get().existingRegistrationFilesIndexFile.get().asFile
+            )
             val matchedFileNames = mutableSetOf<String>()
             val synchronizedFiles = mutableListOf<File>()
-            val targetRoot = task.registrationFilesOutputDir.get().asFile
+            val targetRoot = registrationFilesOutputDir.asFile
 
             existingRegistrationFileIndex.forEach { indexEntry ->
                 if (generatedFilesByFileName.containsKey(indexEntry.registrationFileName)) {
                     matchedFileNames.add(indexEntry.registrationFileName)
-                    synchronizedFiles.add(File(task.godotProjectDirPath.get()).resolve(indexEntry.relativePath))
+                    synchronizedFiles.add(godotProjectDir.resolve(indexEntry.relativePath))
                 }
             }