Switch to js plugin

JetBrains · Nov 16, 2020 · 7ef3040 · 7ef3040
1 parent 9181933
commit 7ef3040
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 24 deletions.
diff --git a/projector-launcher/electronapp/build.gradle.kts b/projector-launcher/electronapp/build.gradle.kts
@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
 
 plugins {
-    kotlin("multiplatform")
+    kotlin("js")
 }
 
 val electronVersion: String by project
@@ -25,22 +25,17 @@ kotlin {
             }
         }
     }
+}
 
-    sourceSets {
-        val jsMain by getting {
-            kotlin.srcDir("src/main")
-            dependencies {
-                implementation(npm("electron", electronVersion))
-                implementation(npm("open", openVersion))
-                implementation("org.jetbrains.kotlin:kotlin-stdlib-js:$kotlinVersion")
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:$coroutinesVersion")
-                implementation("org.jetbrains:kotlin-extensions:$kotlinExtensionsVersion")
-            }
-        }
-    }
+dependencies {
+    implementation(npm("electron", electronVersion))
+    implementation(npm("open", openVersion))
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-js:$kotlinVersion")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:$coroutinesVersion")
+    implementation("org.jetbrains:kotlin-extensions:$kotlinExtensionsVersion")
 }
 
-tasks.named("jsNodeTest") {
+tasks.named("nodeTest") {
     enabled = false
 }
 

diff --git a/projector-launcher/package.json b/projector-launcher/package.json
@@ -7,7 +7,7 @@
     "start": "npm run build && npm run run",
     "build": "./gradlew build",
     "run": "electron build/js/packages/projector-launcher-electronapp",
-    "gradle-node": "./gradlew -p electronapp jsNodeRun",
+    "gradle-node": "./gradlew -p electronapp nodeRun",
     "packager": "electron-packager --executable-name=projector --out=./out --overwrite --icon=./electronapp/src/main/resources/assets/img/electron-icon.ico --all ./build/js/packages/projector-launcher-electronapp projector"
   },
   "keywords": [

diff --git a/projector-launcher/settings.gradle.kts b/projector-launcher/settings.gradle.kts
@@ -1,16 +1,8 @@
 pluginManagement {
-    resolutionStrategy {
-        eachPlugin {
-            if (requested.id.id == "kotlin2js") {
-                useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${requested.version}")
-            }
-        }
-    }
-
     val kotlinVersion: String by settings
 
     plugins {
-        kotlin("multiplatform") version kotlinVersion apply false
+        kotlin("js") version kotlinVersion apply false
     }
 }