Remove JVM ir

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+- Migrate to kotlin 1.4.0
+- Separate Native (current platform) and nodeJs plugins
+
 ## [0.5.2]
 
 ### Added

build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
     `kotlin-dsl`
     `maven-publish`
     id("com.jfrog.bintray") version "1.8.5"
-    id("org.jetbrains.changelog") version "0.3.2"
+    id("org.jetbrains.changelog") version "0.4.0"
 }
 
 group = "ru.mipt.npm"

src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt

@@ -32,8 +32,13 @@ class KScienceExtension(val project: Project) {
         block: SerializationTargets.() -> Unit = {}
     ): Unit = project.run {
         plugins.apply("org.jetbrains.kotlin.plugin.serialization")
+        val artifactName = if(version.startsWith("0")){
+            "kotlinx-serialization-runtime"
+        } else {
+            "kotlinx-serialization-core"
+        }
         useCommonDependency(
-            "org.jetbrains.kotlinx:kotlinx-serialization-core:$version",
+            "org.jetbrains.kotlinx:$artifactName:$version",
             dependencySourceSet = sourceSet,
             dependencyConfiguration = configuration
         )

src/main/kotlin/ru/mipt/npm/gradle/KScienceJVMPlugin.kt

@@ -26,7 +26,7 @@ open class KScienceJVMPlugin : Plugin<Project> {
 
         tasks.withType<KotlinCompile> {
             kotlinOptions {
-                useIR = true
+//                useIR = true
                 jvmTarget = KScienceVersions.JVM_TARGET.toString()
             }
         }

src/main/kotlin/ru/mipt/npm/gradle/KScienceMPPlugin.kt

@@ -22,7 +22,7 @@ open class KScienceMPPlugin : Plugin<Project> {
             jvm {
                 compilations.all {
                     kotlinOptions {
-                        useIR = true
+//                        useIR = true
                         jvmTarget = KScienceVersions.JVM_TARGET.toString()
                     }
                 }
@@ -62,9 +62,11 @@ open class KScienceMPPlugin : Plugin<Project> {
                 }
             }
 
-            targets.all {
+            afterEvaluate {
-                sourceSets.all {
+                targets.all {
-                    languageSettings.applySettings()
+                    sourceSets.all {
+                        languageSettings.applySettings()
+                    }
                 }
             }
 
@@ -73,6 +75,18 @@ open class KScienceMPPlugin : Plugin<Project> {
 
                 val dokkaHtml by tasks.getting(DokkaTask::class) {
                     dokkaSourceSets {
+                        register("commonMain") {
+                            displayName = "common"
+                            platform = "common"
+                        }
+                        register("jvmMain") {
+                            displayName = "jvm"
+                            platform = "jvm"
+                        }
+                        register("jsMain") {
+                            displayName = "js"
+                            platform = "js"
+                        }
                         configureEach {
                             jdkVersion = 11
                         }

src/main/kotlin/ru/mipt/npm/gradle/KScienceNativePlugin.kt

@@ -3,9 +3,7 @@ package ru.mipt.npm.gradle
 import org.gradle.api.GradleException
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.apply
+import org.gradle.kotlin.dsl.*
-import org.gradle.kotlin.dsl.configure
-import org.gradle.kotlin.dsl.findPlugin
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 
 class KScienceNativePlugin : Plugin<Project> {
@@ -23,11 +21,11 @@ class KScienceNativePlugin : Plugin<Project> {
                 isMingwX64 -> mingwX64("native")
                 else -> throw GradleException("Host OS is not supported in Kotlin/Native.")
             }
-//
+
-//                sourceSets  {
+            sourceSets.invoke {
-//                    val nativeMain by getting
+                val nativeMain by getting
-//                    val nativeTest by getting
+                val nativeTest by getting
-//                }
+            }
         }
     }
 }

src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt

@@ -13,7 +13,7 @@ object KScienceVersions {
     val JVM_TARGET = JavaVersion.VERSION_11
 
     object Serialization{
-        const val xmlVersion = "0.20.0.1"
+        const val xmlVersion = "0.20.0.10"//to be fixed
         const val yamlVersion = "0.16.1"
         const val bsonVersion = "0.2.1"
     }

src/main/kotlin/ru/mipt/npm/gradle/common.kt

@@ -16,6 +16,7 @@ internal fun LanguageSettingsBuilder.applySettings(): Unit {
     useExperimentalAnnotation("kotlin.ExperimentalUnsignedTypes")
     useExperimentalAnnotation("kotlin.ExperimentalStdlibApi")
     useExperimentalAnnotation("kotlin.time.ExperimentalTime")
+    useExperimentalAnnotation("kotlin.contracts.ExperimentalContracts")
 }
 
 internal fun RepositoryHandler.applyRepos(): Unit {