Use Kotlin multiplatform plugin rather than JS (#14)

.github/workflows/check.yml

@@ -15,16 +15,16 @@ jobs:
  cancel-in-progress: true
  steps:
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  - name: Setup Java
- uses: actions/setup-java@v2
+ uses: actions/setup-java@v3
  with:
  distribution: 'zulu'
  java-version: ${{ env.JAVA_VERSION }}
  - name: Gradle cache
  uses: gradle/gradle-build-action@v2
  - name: KMP cache
- uses: actions/cache@v2
+ uses: actions/cache@v3
  id: konan-js-build
  with:
  path: '~/.konan/**'
@@ -48,22 +48,22 @@ jobs:
  cancel-in-progress: true
  steps:
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  - name: Setup Java
- uses: actions/setup-java@v2
+ uses: actions/setup-java@v3
  with:
  distribution: 'zulu'
  java-version: ${{ env.JAVA_VERSION }}
  - name: Gradle cache
  uses: gradle/gradle-build-action@v2
  - name: KMP cache
- uses: actions/cache@v2
+ uses: actions/cache@v3
  id: konan-js-test
  with:
  path: '~/.konan/**'
  key: konan-js-test
  - name: Javascript tests
- run: set -o pipefail && ./gradlew --continue nodeTest
+ run: set -o pipefail && ./gradlew --continue jsNodeTest
  # Always run this job even if the previous steps fail to collect all test reports
  - name: Generate Javascript test report
  uses: mikepenz/action-junit-report@v3

.github/workflows/deploy.yml

@@ -15,16 +15,16 @@ jobs:
  cancel-in-progress: true
  steps:
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  - name: Setup Java
- uses: actions/setup-java@v2
+ uses: actions/setup-java@v3
  with:
  distribution: 'zulu'
  java-version: ${{ env.JAVA_VERSION }}
  - name: Gradle cache
  uses: gradle/gradle-build-action@v2
  - name: KMP cache
- uses: actions/cache@v2
+ uses: actions/cache@v3
  id: konan-js-deploy
  with:
  path: '~/.konan/**'
@@ -56,22 +56,22 @@ jobs:
  cancel-in-progress: true
  steps:
  - name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  - name: Setup Java
- uses: actions/setup-java@v2
+ uses: actions/setup-java@v3
  with:
  distribution: 'zulu'
  java-version: ${{ env.JAVA_VERSION }}
  - name: Gradle cache
  uses: gradle/gradle-build-action@v2
  - name: KMP cache
- uses: actions/cache@v2
+ uses: actions/cache@v3
  id: konan-js-test
  with:
  path: '~/.konan/**'
  key: konan-js-test
  - name: Javascript tests
- run: set -o pipefail && ./gradlew --continue nodeTest
+ run: set -o pipefail && ./gradlew --continue jsNodeTest
  # Always run this job even if the previous steps fail to collect all test reports
  - name: Generate Javascript test report
  uses: mikepenz/action-junit-report@v3

appJs/appJs/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 
 kotlin {
  sourceSets {
- val main by getting {
+ val commonMain by getting {
  dependencies {
  implementation(npm("firebase", "9.10.0"))
  implementation(npm("firebase-admin", "11.0.1"))

appJs/module-a/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 
 kotlin {
  sourceSets {
- val main by getting {
+ val commonMain by getting {
  dependencies {
  implementation(projects.kmpModuleB)
  }

gradle-plugins/src/main/kotlin/com/gchristov/thecodinglove/gradleplugins/JavascriptPlatformPlugin.kt

@@ -2,9 +2,7 @@ package com.gchristov.thecodinglove.gradleplugins
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.dependencies
-import org.gradle.kotlin.dsl.kotlin
-import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 
 @Suppress("unused")
 class JavascriptApplicationPlugin : JavascriptPlatformPlugin() {
@@ -25,8 +23,8 @@ abstract class JavascriptPlatformPlugin : Plugin<Project> {
 }
 
 private fun Project.configureJavascript() {
- plugins.apply("org.jetbrains.kotlin.js")
- extensions.configure(KotlinJsProjectExtension::class.java) {
+ plugins.apply("org.jetbrains.kotlin.multiplatform")
+ extensions.configure(KotlinMultiplatformExtension::class.java) {
  js(IR) {
  nodejs()
  }
@@ -35,18 +33,17 @@ private fun Project.configureJavascript() {
 
 private fun Project.configureJavascriptApplication() {
  plugins.apply("dev.petuska.npm.publish")
- extensions.configure(KotlinJsProjectExtension::class.java) {
+ extensions.configure(KotlinMultiplatformExtension::class.java) {
  js(IR) {
  binaries.library()
  }
  }
 }
 
 private fun Project.configureTests() {
- // Add dependencies after plugins are set to avoid missing "implementation" errors
- afterEvaluate {
- dependencies {
- add("testImplementation", kotlin("test"))
+ extensions.configure(KotlinMultiplatformExtension::class.java) {
+ sourceSets.maybeCreate("commonMain").dependencies {
+ implementation(kotlin("test"))
  }
  }
 }