From ae7d31bd3097353efba769204468d167d8ba6d48 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Sun, 21 Jul 2019 18:17:40 +0300
Subject: [PATCH] Fixed single platform plugins

---
 .../kotlin/scientifik/ScientifikJSPlugin.kt   | 52 +++++++++----------
 .../kotlin/scientifik/ScientifikJVMPlugin.kt  | 42 +++++++--------
 2 files changed, 44 insertions(+), 50 deletions(-)

diff --git a/src/main/kotlin/scientifik/ScientifikJSPlugin.kt b/src/main/kotlin/scientifik/ScientifikJSPlugin.kt
index ad3e559..12f6b34 100644
--- a/src/main/kotlin/scientifik/ScientifikJSPlugin.kt
+++ b/src/main/kotlin/scientifik/ScientifikJSPlugin.kt
@@ -1,13 +1,13 @@
 package scientifik
 
 import Scientifik
-import kotlinx.atomicfu.plugin.gradle.sourceSets
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.*
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.get
+import org.gradle.kotlin.dsl.maven
+import org.gradle.kotlin.dsl.repositories
 import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension
-import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
-import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
 
 open class ScientifikJSPlugin : Plugin<Project> {
     override fun apply(project: Project) {
@@ -27,35 +27,31 @@ open class ScientifikJSPlugin : Plugin<Project> {
                 maven("https://dl.bintray.com/mipt-npm/dev")
             }
 
-            configure<KotlinJsProjectExtension>{
-                target{
+            configure<KotlinJsProjectExtension> {
+                target {
                     browser()
                 }
-            }
+                sourceSets["main"].apply {
+                    languageSettings.apply {
+                        progressiveMode = true
+                        enableLanguageFeature("InlineClasses")
+                        useExperimentalAnnotation("ExperimentalUnsignedType")
+                    }
 
-            sourceSets["main"].apply {
-                this as KotlinSourceSet
-                languageSettings.apply {
-                    progressiveMode = true
-                    enableLanguageFeature("InlineClasses")
-                    useExperimentalAnnotation("ExperimentalUnsignedType")
+                    dependencies {
+                        api(kotlin("stdlib-jdk8"))
+                        if (extension.serialization) {
+                            implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:${Scientifik.serializationVersion}")
+                        }
+                        if (extension.atomicfu) {
+                            implementation("org.jetbrains.kotlinx:atomicfu-js:${Scientifik.atomicfuVersion}")
+                        }
+                        if (extension.io) {
+                            api("org.jetbrains.kotlinx:kotlinx-io-js:${Scientifik.ioVersion}")
+                        }
+                    }
                 }
             }
-
-            dependencies {
-                this as KotlinDependencyHandler
-                api(kotlin("stdlib-jdk8"))
-                if (extension.serialization) {
-                    implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:${Scientifik.serializationVersion}")
-                }
-                if (extension.atomicfu) {
-                    implementation("org.jetbrains.kotlinx:atomicfu-js:${Scientifik.atomicfuVersion}")
-                }
-                if (extension.io) {
-                    api("org.jetbrains.kotlinx:kotlinx-io-js:${Scientifik.ioVersion}")
-                }
-            }
-
         }
 
     }
diff --git a/src/main/kotlin/scientifik/ScientifikJVMPlugin.kt b/src/main/kotlin/scientifik/ScientifikJVMPlugin.kt
index 6a6aa8b..52ccd93 100644
--- a/src/main/kotlin/scientifik/ScientifikJVMPlugin.kt
+++ b/src/main/kotlin/scientifik/ScientifikJVMPlugin.kt
@@ -1,12 +1,10 @@
 package scientifik
 
 import Scientifik
-import kotlinx.atomicfu.plugin.gradle.sourceSets
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.*
-import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
-import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 open class ScientifikJVMPlugin : Plugin<Project> {
@@ -32,26 +30,26 @@ open class ScientifikJVMPlugin : Plugin<Project> {
                 }
             }
 
-            sourceSets["main"].apply {
-                this as KotlinSourceSet
-                languageSettings.apply {
-                    progressiveMode = true
-                    enableLanguageFeature("InlineClasses")
-                    useExperimentalAnnotation("ExperimentalUnsignedType")
-                }
-            }
+            configure<KotlinJvmProjectExtension> {
+                sourceSets["main"].apply {
+                    languageSettings.apply {
+                        progressiveMode = true
+                        enableLanguageFeature("InlineClasses")
+                        useExperimentalAnnotation("ExperimentalUnsignedType")
+                    }
 
-            dependencies {
-                this as KotlinDependencyHandler
-                api(kotlin("stdlib-jdk8"))
-                if (extension.serialization) {
-                    implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:${Scientifik.serializationVersion}")
-                }
-                if (extension.atomicfu) {
-                    implementation("org.jetbrains.kotlinx:atomicfu:${Scientifik.atomicfuVersion}")
-                }
-                if (extension.io) {
-                    api("org.jetbrains.kotlinx:kotlinx-io-jvm:${Scientifik.ioVersion}")
+                    dependencies {
+                        api(kotlin("stdlib-jdk8"))
+                        if (extension.serialization) {
+                            implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:${Scientifik.serializationVersion}")
+                        }
+                        if (extension.atomicfu) {
+                            implementation("org.jetbrains.kotlinx:atomicfu:${Scientifik.atomicfuVersion}")
+                        }
+                        if (extension.io) {
+                            api("org.jetbrains.kotlinx:kotlinx-io-jvm:${Scientifik.ioVersion}")
+                        }
+                    }
                 }
             }