GradleVersion is comparable (#415)

cdsap · Nov 10, 2024 · 1a2d1f1 · 1a2d1f1
1 parent dcdfcff
commit 1a2d1f1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 26 deletions.
diff --git a/library/core/talaiot/src/main/kotlin/io/github/cdsap/talaiot/Talaiot.kt b/library/core/talaiot/src/main/kotlin/io/github/cdsap/talaiot/Talaiot.kt
@@ -3,7 +3,7 @@ package io.github.cdsap.talaiot
 import io.github.cdsap.talaiot.configuration.BuildFilterConfiguration
 import io.github.cdsap.talaiot.configuration.MetricsConfiguration
 import io.github.cdsap.talaiot.entities.ExecutionReport
-import io.github.cdsap.talaiot.extensions.gradleVersionCompatibleWithIsolatedProjects
+import io.github.cdsap.talaiot.extensions.isCompatibleWithIsolatedProjects
 import io.github.cdsap.talaiot.filter.BuildFilterProcessor
 import io.github.cdsap.talaiot.filter.TaskFilterProcessor
 import io.github.cdsap.talaiot.logger.LogTracker
@@ -51,7 +51,7 @@ class Talaiot<T : TalaiotExtension>(
         val executionReport = ExecutionReport()
         val startTime = System.currentTimeMillis()
         target.gradle.taskGraph.whenReady {
-            val dictionary = if (GradleVersion.current().version.gradleVersionCompatibleWithIsolatedProjects() && target.serviceOf<BuildFeatures>().isolatedProjects.active.getOrElse(false)) emptyMap<String, String>() else it.allTasks.associate { it.path to it.javaClass.toString().replace("class ", "").replace("_Decorated", "") }
+            val dictionary = if (GradleVersion.current().isCompatibleWithIsolatedProjects() && target.serviceOf<BuildFeatures>().isolatedProjects.active.getOrElse(false)) emptyMap<String, String>() else it.allTasks.associate { it.path to it.javaClass.toString().replace("class ", "").replace("_Decorated", "") }
 
             val parameters = target.gradle.startParameter.taskRequests.flatMap {
                 it.args.flatMap { task ->

diff --git a/library/core/talaiot/src/main/kotlin/io/github/cdsap/talaiot/extensions/GradleVersion.kt b/library/core/talaiot/src/main/kotlin/io/github/cdsap/talaiot/extensions/GradleVersion.kt
@@ -0,0 +1,5 @@
+package io.github.cdsap.talaiot.extensions
+
+import org.gradle.util.GradleVersion
+
+fun GradleVersion.isCompatibleWithIsolatedProjects(): Boolean = GradleVersion.version("8.5") <= this.baseVersion
diff --git a/library/core/talaiot/src/main/kotlin/io/github/cdsap/talaiot/extensions/String.kt b/library/core/talaiot/src/main/kotlin/io/github/cdsap/talaiot/extensions/String.kt
@@ -22,25 +22,3 @@ fun String.toBytes(): String? {
     }
     return null
 }
-
-fun String.gradleVersionCompatibleWithIsolatedProjects(): Boolean {
-    fun parseVersion(version: String): List<Int> {
-        return version.split(Regex("[^\\d]+")).filter { it.isNotEmpty() }.map { it.toInt() }
-    }
-
-    val versionParts = parseVersion(this)
-    val targetVersionParts = parseVersion("8.5")
-    val maxLength = maxOf(versionParts.size, targetVersionParts.size)
-    for (i in 0 until maxLength) {
-        val vPart = versionParts.getOrElse(i) { 0 }
-
-        val tPart = targetVersionParts.getOrElse(i) { 0 }
-        if (vPart > tPart) {
-            return true
-        }
-        if (vPart < tPart) {
-            return false
-        }
-    }
-    return true
-}
diff --git a/library/core/talaiot/src/main/kotlin/io/github/cdsap/talaiot/metrics/GradleMetrics.kt b/library/core/talaiot/src/main/kotlin/io/github/cdsap/talaiot/metrics/GradleMetrics.kt
@@ -1,6 +1,6 @@
 package io.github.cdsap.talaiot.metrics
 
-import io.github.cdsap.talaiot.extensions.gradleVersionCompatibleWithIsolatedProjects
+import io.github.cdsap.talaiot.extensions.isCompatibleWithIsolatedProjects
 import io.github.cdsap.talaiot.extensions.toBytes
 import io.github.cdsap.talaiot.metrics.base.GradleMetric
 import io.github.cdsap.talaiot.metrics.base.JvmArgsMetric
@@ -129,7 +129,7 @@ class LocaleMetric : GradleMetric<String>(
 
 private fun Gradle.findRequestedTasks(): List<String> {
     val taskNames = startParameter.taskNames
-    return if (GradleVersion.current().version.gradleVersionCompatibleWithIsolatedProjects() && rootProject.serviceOf<BuildFeatures>().isolatedProjects.active.getOrElse(false)) {
+    return if (GradleVersion.current().isCompatibleWithIsolatedProjects() && rootProject.serviceOf<BuildFeatures>().isolatedProjects.active.getOrElse(false)) {
         taskNames
     } else {
         val executedTasks = taskGraph.allTasks.map { TaskName(name = it.name, path = it.path) }