Fixup

Author: mvicsokolova

atomicfu-gradle-plugin/build.gradle

@@ -2,6 +2,8 @@
  * Copyright 2017-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 
+import static KotlinVersion.*
+
 apply plugin: 'kotlin'
 apply plugin: 'java-gradle-plugin'
 
@@ -91,7 +93,7 @@ dependencies {
 }
 
 // Skip these tests if Kotlin version >= 1.9.0, as JS Legacy is no longer supported there
-if (KotlinAggregateBuild.isKotlinVersionAtLeast(project, 1, 9)) {
+if (isKotlinVersionAtLeast(project, 1, 9)) {
     test {
         exclude "**/JsLegacyTransformationTest*", "**/MppLegacyTransformationTest*"
     }

atomicfu/build.gradle

@@ -1,9 +1,9 @@
-import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
-
 /*
  * Copyright 2016-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 
+import static KotlinVersion.*
+
 apply plugin: 'kotlin-multiplatform'
 apply from: rootProject.file("gradle/targets.gradle")
 
@@ -21,7 +21,7 @@ ext {
 
 // TODO: this block should be removed after the switch to Kotlin language version 1.9
 // (right now it implements a toggle between IR and BOTH JS compiler types for testing of Kotlin dev builds)
-def isJsLegacyCompilerEnabled = !KotlinAggregateBuild.isKotlinVersionAtLeast(project, 1, 9)
+def isJsLegacyCompilerEnabled = !isKotlinVersionAtLeast(project, 1, 9)
 
 kotlin {
     targets {
@@ -31,7 +31,7 @@ kotlin {
     }
 
     // JS -- always
-    // TODO: JS compiler should be switched to IR-only after the switch to Kotlin language version 1.9
+    // TODO: JS compiler should be switched to IR-only after Kotlin version is updated to 1.9
     // (right now compiler type is chosen conditionally for testing of Kotlin dev builds)
     def jsCompiler = isJsLegacyCompilerEnabled ? BOTH : IR
     js(jsCompiler) {
@@ -162,7 +162,7 @@ dependencies {
     transformer project(":atomicfu-transformer")
 }
 
-// TODO: this JS Legacy configuration should be removed after the switch to Kotlin language version 1.9
+// TODO: This JS Legacy configuration should be removed when Kotlin version is updated to 1.9.0,
 // (right now configurations are removed conditionally for testing of Kotlin 1.9.0-dev builds)
 if (isJsLegacyCompilerEnabled) {
 
@@ -172,7 +172,7 @@ if (isJsLegacyCompilerEnabled) {
             ? compileKotlinJsLegacy
             : compileKotlinJs
 
-    tasks.withType(compileJsLegacy).configureEach {
+    tasks.withType(compileJsLegacy.getClass()) {
         kotlinOptions {
             moduleKind = "umd"
             sourceMap = true

buildSrc/src/main/kotlin/KotlinAggregateBuild.kt

@@ -65,12 +65,3 @@ fun addDevRepositoryIfEnabled(rh: RepositoryHandler, project: Project) {
         url = URI.create(devRepoUrl)
     }
 }
-
-internal fun isKotlinVersionAtLeast(project: Project, atLeastMajor: Int, atLeastMinor: Int): Boolean =
-    (project.rootProject.properties["kotlin_version"] as? String)?.let { kotlinVersion ->
-        val (major, minor) = kotlinVersion
-            .split('.')
-            .take(2)
-            .map { it.toInt() }
-        return major == atLeastMajor && minor >= atLeastMinor
-    } ?: false

buildSrc/src/main/kotlin/KotlinVersion.kt

@@ -0,0 +1,11 @@
+@file:JvmName("KotlinVersion")
+import org.gradle.api.*
+
+fun Project.isKotlinVersionAtLeast(atLeastMajor: Int, atLeastMinor: Int): Boolean =
+    (rootProject.properties["kotlin_version"] as? String)?.let { kotlinVersion ->
+        val (major, minor) = kotlinVersion
+            .split('.')
+            .take(2)
+            .map { it.toInt() }
+        return major == atLeastMajor && minor >= atLeastMinor
+    } ?: false