Conditionally remove targets that are removed after 1.9.20. (#320)

Author: mvicsokolova

atomicfu-gradle-plugin/build.gradle

@@ -93,7 +93,7 @@ dependencies {
 }
 
 // Skip these tests if Kotlin version >= 1.9.0, as JS Legacy is no longer supported there
-if (isKotlinVersionAtLeast(ext.kotlin_version, 1, 9)) {
+if (isKotlinVersionAtLeast(ext.kotlin_version, 1, 9, 0)) {
     test {
         exclude "**/JsLegacyTransformationTest*", "**/MppLegacyTransformationTest*"
     }

atomicfu/build.gradle

@@ -21,8 +21,12 @@ ext {
 }
 
 // TODO: this block should be removed when Kotlin version is updated to 1.9.0
-// (right now it implements a toggle between IR and BOTH JS compiler types for testing of Kotlin dev builds)
-def isJsLegacyCompilerEnabled = !isKotlinVersionAtLeast(ext.kotlin_version, 1, 9)
+// Right now it implements a toggle between IR and BOTH JS compiler types for testing of Kotlin dev builds
+def isJsLegacyCompilerEnabled = !isKotlinVersionAtLeast(ext.kotlin_version, 1, 9, 0)
+// TODO: this block should be removed when Kotlin version is updated to 1.9.20
+// Right now it is used for conditional removal of native targets that will be removed in 1.9.20 (iosArm32, watchosX86)
+// and is necessary for testing of Kotlin dev builds.
+def enableDeprecatedNativeTargets = !isKotlinVersionAtLeast(ext.kotlin_version, 1, 9, 20)
 
 kotlin {
     targets {
@@ -119,9 +123,11 @@ if (rootProject.ext.native_targets_enabled) {
                 addTarget(presets.mingwX64)
                 addTarget(presets.watchosDeviceArm64)
 
-                // Deprecated, remove after 1.9.0
-                addTarget(presets.iosArm32)
-                addTarget(presets.watchosX86)
+                // These targets will be removed in 1.9.20, remove them conditionally for the train builds
+                if (enableDeprecatedNativeTargets) {
+                    addTarget(presets.iosArm32)
+                    addTarget(presets.watchosX86)
+                }
             }
         }
 

buildSrc/src/main/kotlin/KotlinVersion.kt

@@ -1,13 +1,14 @@
 @file:JvmName("KotlinVersion")
 
-fun isKotlinVersionAtLeast(kotlinVersion: String, atLeastMajor: Int, atLeastMinor: Int): Boolean {
+fun isKotlinVersionAtLeast(kotlinVersion: String, atLeastMajor: Int, atLeastMinor: Int, atLeastPatch: Int): Boolean {
     val (major, minor) = kotlinVersion
         .split('.')
         .take(2)
         .map { it.toInt() }
+    val patch = kotlinVersion.substringAfterLast('.').substringBefore('-').toInt()
     return when {
         major > atLeastMajor -> true
         major < atLeastMajor -> false
-        else -> minor >= atLeastMinor
+        else -> (minor == atLeastMinor && patch >= atLeastPatch) || minor > atLeastMinor
     }
 }