1.5.2

dhakehurst · Apr 9, 2020 · 400ea7c · 400ea7c
1 parent b44878b
commit 400ea7c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/net.akehurst.kotlin.kt2ts/build.gradle.kts b/net.akehurst.kotlin.kt2ts/build.gradle.kts
@@ -24,7 +24,7 @@ import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 
 plugins {
-    kotlin("jvm") version ("1.3.50") apply false
+    kotlin("jvm") version ("1.3.70") apply false
     id("com.jfrog.bintray") version ("1.8.4") apply false
 }
 

diff --git a/net.akehurst.kotlin.kt2ts/gradle/wrapper/gradle-wrapper.properties b/net.akehurst.kotlin.kt2ts/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/net.akehurst.kotlin.kt2ts/kt2ts-plugin/build.gradle.kts b/net.akehurst.kotlin.kt2ts/kt2ts-plugin/build.gradle.kts
@@ -3,15 +3,15 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
 plugins {
     `java-gradle-plugin`
     `maven-publish`
-    id("com.gradle.plugin-publish") version "0.10.1"
+    id("com.gradle.plugin-publish") version "0.11.0"
 }
 
 
 dependencies {
     implementation(gradleApi())
     implementation(localGroovy())
 
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.70")
     implementation("io.github.classgraph:classgraph:4.8.47")
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.13.0")
 }

diff --git a/net.akehurst.kotlin.kt2ts/kt2ts-plugin/src/main/kotlin/GeneratorPlugin.kt b/net.akehurst.kotlin.kt2ts/kt2ts-plugin/src/main/kotlin/GeneratorPlugin.kt
@@ -35,6 +35,7 @@ class GeneratorPlugin : Plugin<ProjectInternal> {
 
     override fun apply(project: ProjectInternal) {
         project.pluginManager.apply(BasePlugin::class.java)
+        YarnSimple.setup(project.rootProject)
         val ext = project.extensions.create<GeneratorPluginExtension>(GeneratorPluginExtension.NAME, GeneratorPluginExtension::class.java, project)
 
         val nodeKotlinConfig = project.configurations.create(ext.nodeConfigurationName.get()) {
@@ -59,15 +60,15 @@ class GeneratorPlugin : Plugin<ProjectInternal> {
                     }
                 }
                 // use yarn to install the node_modules required by the node code
-                project.tasks.create("yarnInstall") {
+                project.tasks.create("yarnInstallAll") {
                     it.group = "nodejs"
                     it.dependsOn(NodeJsSetupTask.NAME, YarnSetupTask.NAME)
                     it.doLast {
-                        YarnSimple.yarnExec(project.rootProject, nodeSrcDir, "yarn install/add", "add", "--cwd", "--no-bin-links")
+                        YarnSimple.yarnExec(project.rootProject, nodeSrcDir, "yarn install all", "--no-bin-links" )
                     }
                 }
                 project.tasks.create(UnpackJsModulesTask.NAME, UnpackJsModulesTask::class.java) { tsk ->
-                    tsk.dependsOn(nodeKotlinConfig, "yarnInstall")
+                    tsk.dependsOn(nodeKotlinConfig, "yarnInstallAll")
                     tsk.moduleNameMap.set(ext.moduleNameMap)
                     tsk.nodeModulesDirectory.set(ext.nodeModulesDirectory)
                     tsk.unpackConfigurationName.set(ext.nodeConfigurationName)