From 84b9dadd1d965dec8bd1cf72cf905eb60b0f5147 Mon Sep 17 00:00:00 2001 From: JFronny Date: Tue, 18 Jul 2023 17:04:29 +0200 Subject: [PATCH] Try to fix dev launch --- .../main/kotlin/io/gitlab/jfronny/scripts/JfModExtension.kt | 1 - jfmod/src/main/kotlin/jfmod.module.gradle.kts | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/jfmod/src/main/kotlin/io/gitlab/jfronny/scripts/JfModExtension.kt b/jfmod/src/main/kotlin/io/gitlab/jfronny/scripts/JfModExtension.kt index eba43fa..57e517d 100644 --- a/jfmod/src/main/kotlin/io/gitlab/jfronny/scripts/JfModExtension.kt +++ b/jfmod/src/main/kotlin/io/gitlab/jfronny/scripts/JfModExtension.kt @@ -16,7 +16,6 @@ interface JfModExtension: LomExtension { override fun check(proj: Project) { super.check(proj) libJfVersion.finalizeValue() - val p = proj.allprojects modrinth.check(proj) curseforge.check(proj) } diff --git a/jfmod/src/main/kotlin/jfmod.module.gradle.kts b/jfmod/src/main/kotlin/jfmod.module.gradle.kts index 5ea32e6..58392b8 100644 --- a/jfmod/src/main/kotlin/jfmod.module.gradle.kts +++ b/jfmod/src/main/kotlin/jfmod.module.gradle.kts @@ -1,4 +1,5 @@ import io.gitlab.jfronny.scripts.* +import org.gradle.api.internal.project.ProjectStateInternal import org.gradle.api.tasks.compile.JavaCompile import org.gradle.kotlin.dsl.dependencies import org.gradle.kotlin.dsl.withType @@ -33,7 +34,9 @@ insertEarlyAfterEvaluate { } } -fun Project.pAfterEvaluate(action: (Project) -> Unit) = afterEvaluate { action(this) } +fun Project.pAfterEvaluate(action: (Project) -> Unit) = + if ((this.state as ProjectStateInternal).hasCompleted()) action(this) + else afterEvaluate { action(this) } afterEvaluate { rootProject.allprojects.forEach {