From 4d7f912fff283da2a7f877034614b94018c12715 Mon Sep 17 00:00:00 2001
From: David Akehurst <david.akehurst@itemis.de>
Date: Mon, 1 Jun 2020 12:18:08 +0200
Subject: [PATCH] upgrade kotlin version

---
 net.akehurst.kotlin.kt2ts/build.gradle.kts                  | 4 ++--
 net.akehurst.kotlin.kt2ts/gradle.properties                 | 2 +-
 .../gradle/wrapper/gradle-wrapper.properties                | 2 +-
 net.akehurst.kotlin.kt2ts/kt2ts-plugin/build.gradle.kts     | 4 ++--
 .../kt2ts-plugin/src/main/kotlin/GeneratorPlugin.kt         | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/net.akehurst.kotlin.kt2ts/build.gradle.kts b/net.akehurst.kotlin.kt2ts/build.gradle.kts
index 6f6169d..3070f62 100644
--- a/net.akehurst.kotlin.kt2ts/build.gradle.kts
+++ b/net.akehurst.kotlin.kt2ts/build.gradle.kts
@@ -24,8 +24,8 @@ import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 
 plugins {
-    kotlin("jvm") version ("1.3.70") apply false
-    id("com.jfrog.bintray") version ("1.8.4") apply false
+    kotlin("jvm") version ("1.3.71") apply false //version must match version used by gradle
+    id("com.jfrog.bintray") version ("1.8.5") apply false
 }
 
 allprojects {
diff --git a/net.akehurst.kotlin.kt2ts/gradle.properties b/net.akehurst.kotlin.kt2ts/gradle.properties
index 34e8b0f..42947c5 100644
--- a/net.akehurst.kotlin.kt2ts/gradle.properties
+++ b/net.akehurst.kotlin.kt2ts/gradle.properties
@@ -1,2 +1,2 @@
-version_project = 1.5.2
+version_project = 1.5.3
 
diff --git a/net.akehurst.kotlin.kt2ts/gradle/wrapper/gradle-wrapper.properties b/net.akehurst.kotlin.kt2ts/gradle/wrapper/gradle-wrapper.properties
index a4b4429..a4f0001 100644
--- 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.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-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
index aa14976..a12fbe1 100644
--- a/net.akehurst.kotlin.kt2ts/kt2ts-plugin/build.gradle.kts
+++ b/net.akehurst.kotlin.kt2ts/kt2ts-plugin/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
 plugins {
     `java-gradle-plugin`
     `maven-publish`
-    id("com.gradle.plugin-publish") version "0.11.0"
+    id("com.gradle.plugin-publish") version "0.12.0"
 }
 
 
@@ -11,7 +11,7 @@ dependencies {
     implementation(gradleApi())
     implementation(localGroovy())
 
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.70")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.71") //version must match version used by gradle
     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
index 73ffa42..2fa0934 100644
--- 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,7 +35,7 @@ class GeneratorPlugin : Plugin<ProjectInternal> {
 
     override fun apply(project: ProjectInternal) {
         project.pluginManager.apply(BasePlugin::class.java)
-        YarnSimple.setup(project.rootProject)
+        YarnSimple().setup(project.rootProject)
         val ext = project.extensions.create<GeneratorPluginExtension>(GeneratorPluginExtension.NAME, GeneratorPluginExtension::class.java, project)
 
         val nodeKotlinConfig = project.configurations.create(ext.nodeConfigurationName.get()) {
@@ -64,7 +64,7 @@ class GeneratorPlugin : Plugin<ProjectInternal> {
                     it.group = "nodejs"
                     it.dependsOn(NodeJsSetupTask.NAME, YarnSetupTask.NAME)
                     it.doLast {
-                        YarnSimple.yarnExec(project.rootProject, nodeSrcDir, "yarn install all", "--no-bin-links" )
+                        YarnSimple().yarnExec(project.rootProject, nodeSrcDir, "yarn install all", "--no-bin-links" )
                     }
                 }
                 project.tasks.create(UnpackJsModulesTask.NAME, UnpackJsModulesTask::class.java) { tsk ->
@@ -89,7 +89,7 @@ class GeneratorPlugin : Plugin<ProjectInternal> {
                     it.dependsOn(GeneratePackageJsonTask.NAME+"-kotlin")
                     it.doLast {
                         val nodeArgs = ext.nodeBuildCommand.get().toTypedArray()
-                        YarnSimple.yarnExec(project.rootProject, project.file(ext.nodeSrcDirectory.get()), "node build command", *nodeArgs)
+                        YarnSimple().yarnExec(project.rootProject, project.file(ext.nodeSrcDirectory.get()), "node build command", *nodeArgs)
                     }
                 }