Remove JS Legacy configurations (updated) (#296)

* JS Legacy build configurations as well as JS Legacy test projects were conditionally removed for KGP version >= 1.9.0 

Co-authored-by: Stanislav Ruban <[email protected]>

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'
 
@@ -89,3 +91,10 @@ task createClasspathManifest {
 dependencies {
     testRuntime files(createClasspathManifest)
 }
+
+// Skip these tests if Kotlin version >= 1.9.0, as JS Legacy is no longer supported there
+if (isKotlinVersionAtLeast(ext.kotlin_version, 1, 9)) {
+    test {
+        exclude "**/JsLegacyTransformationTest*", "**/MppLegacyTransformationTest*"
+    }
+}

atomicfu-transformer/src/main/kotlin/kotlinx/atomicfu/transformer/MetadataTransformer.kt

@@ -24,13 +24,13 @@ class MetadataTransformer(
     fun transformMetadata(metadataAnnotation: AnnotationNode): Boolean {
         val map = metadataAnnotation.asMap()
         val hdr = KotlinClassHeader(
-            kind = map["k"] as Int?,
-            metadataVersion = (map["mv"] as? List<Int>)?.toIntArray(),
-            data1 = (map["d1"] as? List<String>)?.toTypedArray(),
-            data2 = (map["d2"] as? List<String>)?.toTypedArray(),
-            extraString = map["xs"] as String?,
-            packageName = map["pn"] as String?,
-            extraInt = map["xi"] as Int?
+            map["k"] as Int?,
+            (map["mv"] as? List<Int>)?.toIntArray(),
+            (map["d1"] as? List<String>)?.toTypedArray(),
+            (map["d2"] as? List<String>)?.toTypedArray(),
+            map["xs"] as String?,
+            map["pn"] as String?,
+            map["xi"] as Int?
         )
         val result = when (val metadata = KotlinClassMetadata.read(hdr)) {
             is KotlinClassMetadata.Class -> {
@@ -54,8 +54,8 @@ class MetadataTransformer(
         result.apply {
             with (metadataAnnotation) {
                 // read resulting header & update annotation data
-                setKey("d1", header.data1.toList())
-                setKey("d2", header.data2.toList())
+                setKey("d1", annotationData.data1.toList())
+                setKey("d2", annotationData.data2.toList())
             }
         }
         return true // transformed

atomicfu/build.gradle

@@ -2,6 +2,8 @@
  * 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")
 
@@ -17,6 +19,10 @@ 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)
+
 kotlin {
     targets {
         delegate.metaClass.addTarget = { preset ->
@@ -25,7 +31,10 @@ kotlin {
     }
 
     // JS -- always
-    js {
+    // TODO: JS compiler should be switched to IR-only when Kotlin version is updated to 1.9.0
+    // (right now compiler type is chosen conditionally for testing of Kotlin dev builds)
+    def jsCompiler = isJsLegacyCompilerEnabled ? BOTH : IR
+    js(jsCompiler) {
         moduleName = "kotlinx-atomicfu"
         // TODO: Commented out because browser tests do not work on TeamCity
         // browser()
@@ -153,63 +162,68 @@ dependencies {
     transformer project(":atomicfu-transformer")
 }
 
-// ==== CONFIGURE JS =====
-
-def compileJsLegacy = tasks.hasProperty("compileKotlinJsLegacy")
-        ? compileKotlinJsLegacy
-        : compileKotlinJs
+// 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) {
 
-tasks.withType(compileJsLegacy.getClass()) {
-    kotlinOptions {
-        moduleKind = "umd"
-        sourceMap = true
-        metaInfo = true
-    }
-}
+    // ==== CONFIGURE JS =====
 
-apply from: file("$rootProject.projectDir/gradle/node-js.gradle")
-apply from: file("$rootProject.projectDir/gradle/publish-npm-js.gradle")
+    def compileJsLegacy = tasks.hasProperty("compileKotlinJsLegacy")
+            ? compileKotlinJsLegacy.getClass()
+            : compileKotlinJs.getClass()
 
-// Workaround the problem with Node downloading
-repositories.whenObjectAdded {
-    if (it instanceof IvyArtifactRepository) {
-        metadataSources {
-            artifact()
+    tasks.withType(compileJsLegacy).configureEach {
+        kotlinOptions {
+            moduleKind = "umd"
+            sourceMap = true
+            metaInfo = true
         }
     }
-}
 
-def compileTestJsLegacy = tasks.hasProperty("compileTestKotlinJsLegacy")
-        ? compileTestKotlinJsLegacy
-        : compileTestKotlinJs
+    apply from: file("$rootProject.projectDir/gradle/node-js.gradle")
+    apply from: file("$rootProject.projectDir/gradle/publish-npm-js.gradle")
 
-def transformedJsFile = compileTestJsLegacy.kotlinOptions.outputFile
-compileTestJsLegacy.configure {
-    kotlinOptions {
-        // NOTE: Module base-name must be equal to the package name declared in package.json
-        def baseName = "kotlinx-atomicfu"
-        outputFile = new File(new File(outputFile).parent, baseName + ".js")
+    // Workaround the problem with Node downloading
+    repositories.whenObjectAdded {
+        if (it instanceof IvyArtifactRepository) {
+            metadataSources {
+                artifact()
+            }
+        }
     }
-}
-def originalJsFile = compileTestJsLegacy.kotlinOptions.outputFile
 
-task transformJS(type: JavaExec, dependsOn: [compileTestJsLegacy]) {
-    main = "kotlinx.atomicfu.transformer.AtomicFUTransformerJSKt"
-    args = [originalJsFile, transformedJsFile]
-    classpath = configurations.transformer
-    inputs.file(originalJsFile)
-    outputs.file(transformedJsFile)
-}
+    def compileTestJsLegacy = tasks.hasProperty("compileTestKotlinJsLegacy")
+            ? compileTestKotlinJsLegacy
+            : compileTestKotlinJs
 
-if (project.tasks.findByName('jsLegacyNodeTest')) {
-    jsLegacyNodeTest.dependsOn transformJS
-    jsLegacyNodeTest.configure {
-        inputFileProperty.set(new File(transformedJsFile))
+    def transformedJsFile = compileTestJsLegacy.kotlinOptions.outputFile
+    compileTestJsLegacy.configure {
+        kotlinOptions {
+            // NOTE: Module base-name must be equal to the package name declared in package.json
+            def baseName = "kotlinx-atomicfu"
+            outputFile = new File(new File(outputFile).parent, baseName + ".js")
+        }
     }
-} else {
-    jsNodeTest.dependsOn transformJS
-    jsNodeTest.configure {
-        inputFileProperty.set(new File(transformedJsFile))
+    def originalJsFile = compileTestJsLegacy.kotlinOptions.outputFile
+
+    task transformJS(type: JavaExec, dependsOn: [compileTestJsLegacy]) {
+        main = "kotlinx.atomicfu.transformer.AtomicFUTransformerJSKt"
+        args = [originalJsFile, transformedJsFile]
+        classpath = configurations.transformer
+        inputs.file(originalJsFile)
+        outputs.file(transformedJsFile)
+    }
+
+    if (project.tasks.findByName('jsLegacyNodeTest')) {
+        jsLegacyNodeTest.dependsOn transformJS
+        jsLegacyNodeTest.configure {
+            inputFileProperty.set(new File(transformedJsFile))
+        }
+    } else {
+        jsNodeTest.dependsOn transformJS
+        jsNodeTest.configure {
+            inputFileProperty.set(new File(transformedJsFile))
+        }
     }
 }
 
@@ -276,19 +290,11 @@ transformedTestVH.onlyIf {
     JavaVersion.current().ordinal() >= JavaVersion.VERSION_1_9.ordinal()
 }
 
-task testAtomicfuReferenceJs(type: Test, dependsOn: [compileTestKotlinJvm, transformJS]) {
-    environment "transformedJsFile", transformedJsFile
-    classpath = files(configurations.jvmTestRuntimeClasspath, classesPreAtomicFuDir)
-    testClassesDirs = project.files(classesPreAtomicFuDir)
-    include '**/AtomicfuReferenceJsTest.*'
-    filter { setFailOnNoMatchingTests(false) }
-}
-
 task jvmTestAll(dependsOn: [
-        transformedTestFU_current,
-        transformedTestBOTH_current,
-        transformedTestVH,
-        testAtomicfuReferenceJs])
+    transformedTestFU_current,
+    transformedTestBOTH_current,
+    transformedTestVH
+])
 
 tasks.withType(Test) {
     testLogging {

buildSrc/src/main/kotlin/KotlinVersion.kt

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

gradle.properties

@@ -10,7 +10,7 @@ kotlin_version=1.8.10
 asm_version=9.3
 slf4j_version=1.8.0-alpha2
 junit_version=4.12
-kotlinx_metadata_version=0.5.0
+kotlinx_metadata_version=0.6.0
 
 maven_version=3.5.3
 
@@ -25,8 +25,6 @@ source_map_support_version=0.5.3
 kotlin.incremental.multiplatform=true
 kotlin.native.ignoreDisabledTargets=true
 
-kotlin.js.compiler=both
-
 kotlin.mpp.enableCompatibilityMetadataVariant=true
 kotlin.mpp.enableCInteropCommonization=true