Don't run in afterEvaluate for min os configuration if not needed.

touchlab · May 9, 2024 · 0404120 · 0404120
1 parent 81ccd8d
commit 0404120
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 9 deletions.
diff --git a/...lugin-impl/src/common/kotlin/co/touchlab/skie/plugin/coroutines/ConfigureMinOsVersions.kt b/...lugin-impl/src/common/kotlin/co/touchlab/skie/plugin/coroutines/ConfigureMinOsVersions.kt
@@ -9,9 +9,9 @@ import org.gradle.api.Project
 import java.util.Properties
 
 fun SkieTarget.configureMinOsVersionIfNeeded() {
-    project.kgpShim.launchScheduler.afterEvaluateOrAfterFinaliseRefinesEdges(project) {
+    project.kgpShim.launchScheduler.whenMinOsVersionCanBeSafelyChanged(project) {
         if (!project.isCoroutinesInteropEnabled) {
-            return@afterEvaluateOrAfterFinaliseRefinesEdges
+            return@whenMinOsVersionCanBeSafelyChanged
         }
 
         val distributionProperties = getDistributionProperties()

diff --git a/...-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/shim/LaunchScheduler.kt b/...-gradle/plugin-shim-api/src/common/kotlin/co/touchlab/skie/plugin/shim/LaunchScheduler.kt
@@ -5,8 +5,18 @@ import org.gradle.api.Project
 interface LaunchScheduler {
 
     /**
-     * KGP 1.8.0..1.8.20: behaves as `afterEvaluate`
-     * KGP >=1.9.0: behaves as `launchInRequiredStage(KotlinPluginLifecycle.Stage.AfterFinaliseRefinesEdges)`
+     * Used to safely configure `osVersionMin` and `osVersionMinSinceXcode15` properties.
+     * "Safely" here means "as late as possible",
+     * making sure we can pick up overrides defined by users (or possibly other plugins).
+     *
+     * - KGP 1.8.0..1.8.20: Checks if `project` is already evaluated,
+     *                      if so it runs `block` right away.
+     *                      Otherwise, it schedules it with `project.afterEvaluate`.
+     *                      ConfigureMinOsVersions at the time of this change already runs in `afterEvaluate`,
+     *                      so there's no need to use it again.
+     *                      It also runs inside a `configureEach` which disallows `afterEvaluate` calls.
+     * - KGP >=1.9.0: Always schedules it using `launchInRequiredStage(KotlinPluginLifecycle.Stage.AfterFinaliseRefinesEdges)`.
      */
-    fun afterEvaluateOrAfterFinaliseRefinesEdges(project: Project, block: () -> Unit)
+    fun whenMinOsVersionCanBeSafelyChanged(project: Project, block: () -> Unit)
+
 }
diff --git a/...gp_1.8.0..1.8.20/gradle_common/kotlin/co/touchlab/skie/plugin/shim/LaunchSchedulerImpl.kt b/...gp_1.8.0..1.8.20/gradle_common/kotlin/co/touchlab/skie/plugin/shim/LaunchSchedulerImpl.kt
@@ -4,9 +4,13 @@ import org.gradle.api.Project
 
 class LaunchSchedulerImpl : LaunchScheduler {
 
-    override fun afterEvaluateOrAfterFinaliseRefinesEdges(project: Project, block: () -> Unit) {
-        project.afterEvaluate {
+    override fun whenMinOsVersionCanBeSafelyChanged(project: Project, block: () -> Unit) {
+        if (project.state.executed) {
             block()
+        } else {
+            project.afterEvaluate {
+                block()
+            }
         }
     }
 }

diff --git a/...kgp_1.9.0..2.0.0/gradle_common/kotlin/co/touchlab/skie/plugin/shim/LaunchSchedulerImpl.kt b/...kgp_1.9.0..2.0.0/gradle_common/kotlin/co/touchlab/skie/plugin/shim/LaunchSchedulerImpl.kt
@@ -8,7 +8,7 @@ import org.jetbrains.kotlin.gradle.plugin.launchInRequiredStage
 
 class LaunchSchedulerImpl : LaunchScheduler {
 
-    override fun afterEvaluateOrAfterFinaliseRefinesEdges(project: Project, block: () -> Unit) {
+    override fun whenMinOsVersionCanBeSafelyChanged(project: Project, block: () -> Unit) {
         project.launchInRequiredStage(KotlinPluginLifecycle.Stage.AfterFinaliseRefinesEdges) {
             block()
         }

diff --git a/test-runner/build.gradle.kts b/test-runner/build.gradle.kts
@@ -35,7 +35,7 @@ testing {
                     maxHeapSize = "4024m"
                     maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).coerceAtLeast(1)
 
-                    dependsOn(publishSkieToTempMaven)
+                    inputs.files(publishSkieToTempMaven)
 
                     systemProperty("smokeTestRepository", smokeTestRepository.get().asFile.absolutePath)
                     systemProperty("junit.platform.reporting.open.xml.enabled", "true")