Fix project services has been closed crash with Gradle 8.10.1

JavierSegoviaCordoba · Sep 9, 2024 · 3abe9a7 · 3abe9a7
1 parent 3269cc8
commit 3abe9a7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,8 @@
 
 ### Fixed
 
+- `project services has been closed` crash with Gradle 8.10.1
+
 ### Removed
 
 ### Updated

diff --git a/hubdle-gradle-plugin/main/kotlin/com/javiersc/hubdle/project/HubdleProjectPlugin.kt b/hubdle-gradle-plugin/main/kotlin/com/javiersc/hubdle/project/HubdleProjectPlugin.kt
@@ -1,6 +1,7 @@
 package com.javiersc.hubdle.project
 
 import com.javiersc.hubdle.project.extensions.HubdleExtension
+import com.javiersc.hubdle.project.extensions._internal.HubdleState
 import com.javiersc.hubdle.project.extensions._internal.hubdleState
 import com.javiersc.hubdle.project.extensions.config._internal.createHubdleConfigExtensions
 import com.javiersc.hubdle.project.extensions.java._internal.createHubdleJavaExtensions
@@ -11,10 +12,12 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.plugins.BasePlugin
 import org.gradle.kotlin.dsl.apply
+import org.gradle.kotlin.dsl.create
 
 public abstract class HubdleProjectPlugin : Plugin<Project> {
 
     override fun apply(target: Project) {
+        target.extensions.create<HubdleState>("_InternalHubdleState", target)
         target.pluginManager.apply(BasePlugin::class)
         target.registerHubdleLifecycleTasks()
 

diff --git a/...gradle-plugin/main/kotlin/com/javiersc/hubdle/project/extensions/_internal/HubdleState.kt b/...gradle-plugin/main/kotlin/com/javiersc/hubdle/project/extensions/_internal/HubdleState.kt
@@ -14,18 +14,12 @@ import org.gradle.api.Project
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import org.gradle.kotlin.dsl.create
-
-internal val hubdleStateCache: MutableMap<Project, HubdleState> = mutableMapOf()
+import org.gradle.kotlin.dsl.findByType
 
 internal val Project.hubdleState: HubdleState
-    get() {
-        if (hubdleStateCache[this] == null) hubdleStateCache[this] = HubdleState(this)
-        return checkNotNull(hubdleStateCache[this]) {
-            "HubdleState for `$displayName` doesn't exist"
-        }
-    }
+    get() = extensions.findByType<HubdleState>()!!
 
-internal class HubdleState(private val project: Project) {
+internal open class HubdleState(private val project: Project) {
 
     val name: String = project.displayName