Upgrade to KVision 0.0.39

rjaros · Sep 24, 2019 · a295d32 · a295d32
1 parent 7eaf5b7
commit a295d32
Show file tree

Hide file tree

Showing 85 changed files with 252 additions and 222 deletions.
diff --git a/addressbook-fullstack-jooby/build.gradle.kts b/addressbook-fullstack-jooby/build.gradle.kts
@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.frontend.KotlinFrontendExtension
 import org.jetbrains.kotlin.gradle.frontend.npm.NpmExtension
 import org.jetbrains.kotlin.gradle.frontend.webpack.WebPackExtension
 import org.jetbrains.kotlin.gradle.frontend.webpack.WebPackRunTask
-import org.jetbrains.kotlin.gradle.targets.js.nodejs.nodeJs
+import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
 import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
 import org.jetbrains.kotlin.gradle.tasks.KotlinJsDce
 
@@ -22,6 +22,7 @@ version = "1.0.0-SNAPSHOT"
 group = "com.example"
 
 repositories {
+    mavenCentral()
     jcenter()
     maven { url = uri("https://dl.bintray.com/kotlin/kotlin-eap") }
     maven { url = uri("https://kotlin.bintray.com/kotlinx") }
@@ -207,7 +208,7 @@ tasks {
     create("generatePotFile", Exec::class) {
         dependsOn("npm-install", "generateGruntfile")
         workingDir = file("$buildDir")
-        executable = project.nodeJs.root.nodeCommand
+        executable = NodeJsRootPlugin.apply(project).nodeCommand
         args("$buildDir/node_modules/grunt/bin/grunt", "pot")
         inputs.files(kotlin.sourceSets["frontendMain"].kotlin.files)
         outputs.file("$projectDir/src/frontendMain/resources/i18n/messages.pot")
@@ -223,7 +224,7 @@ afterEvaluate {
                     it.isFile && it.extension == "po"
                 }.forEach {
                     exec {
-                        executable = project.nodeJs.root.nodeCommand
+                        executable = NodeJsRootPlugin.apply(project).nodeCommand
                         args("$buildDir/node_modules/po2json/bin/po2json",
                                 it.absolutePath,
                                 "${it.parent}/${it.nameWithoutExtension}.json",

diff --git a/addressbook-fullstack-jooby/gradle.properties b/addressbook-fullstack-jooby/gradle.properties
@@ -1,12 +1,12 @@
 javaVersion=1.8
 kotlin.incremental.js=false
 #Plugins
-systemProp.kotlinVersion=1.3.41
+systemProp.kotlinVersion=1.3.50
 systemProp.frontendPluginVersion=0.0.45
-serializationVersion=0.11.1
+serializationVersion=0.13.0
 #Dependencies
-kvisionVersion=0.0.38
-joobyVersion=1.6.0
+kvisionVersion=0.0.39
+joobyVersion=1.6.4
 pac4jVersion=2.3.1
 springSecurityCryptoVersion=5.1.0.RELEASE
 commonsLoggingVersion=1.2

diff --git a/addressbook-fullstack-jooby/settings.gradle.kts b/addressbook-fullstack-jooby/settings.gradle.kts
@@ -1,6 +1,6 @@
 pluginManagement {
     repositories {
-        //        mavenCentral()
+        mavenCentral()
         jcenter()
         maven { url = uri("https://plugins.gradle.org/m2/") }
         maven { url = uri("https://dl.bintray.com/kotlin/kotlin-eap") }

diff --git a/addressbook-fullstack-ktor/build.gradle.kts b/addressbook-fullstack-ktor/build.gradle.kts
@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.frontend.KotlinFrontendExtension
 import org.jetbrains.kotlin.gradle.frontend.npm.NpmExtension
 import org.jetbrains.kotlin.gradle.frontend.webpack.WebPackExtension
 import org.jetbrains.kotlin.gradle.frontend.webpack.WebPackRunTask
-import org.jetbrains.kotlin.gradle.targets.js.nodejs.nodeJs
+import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
 import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
 import org.jetbrains.kotlin.gradle.tasks.KotlinJsDce
 
@@ -22,6 +22,7 @@ version = "1.0.0-SNAPSHOT"
 group = "com.example"
 
 repositories {
+    mavenCentral()
     jcenter()
     maven { url = uri("https://dl.bintray.com/kotlin/kotlin-eap") }
     maven { url = uri("https://kotlin.bintray.com/kotlinx") }
@@ -218,7 +219,7 @@ tasks {
     create("generatePotFile", Exec::class) {
         dependsOn("npm-install", "generateGruntfile")
         workingDir = file("$buildDir")
-        executable = project.nodeJs.root.nodeCommand
+        executable = NodeJsRootPlugin.apply(project).nodeCommand
         args("$buildDir/node_modules/grunt/bin/grunt", "pot")
         inputs.files(kotlin.sourceSets["frontendMain"].kotlin.files)
         outputs.file("$projectDir/src/frontendMain/resources/i18n/messages.pot")
@@ -234,7 +235,7 @@ afterEvaluate {
                     it.isFile && it.extension == "po"
                 }.forEach {
                     exec {
-                        executable = project.nodeJs.root.nodeCommand
+                        executable = NodeJsRootPlugin.apply(project).nodeCommand
                         args(
                             "$buildDir/node_modules/po2json/bin/po2json",
                             it.absolutePath,

diff --git a/addressbook-fullstack-ktor/gradle.properties b/addressbook-fullstack-ktor/gradle.properties
@@ -1,12 +1,12 @@
 javaVersion=1.8
 kotlin.incremental.js=false
 #Plugins
-systemProp.kotlinVersion=1.3.41
+systemProp.kotlinVersion=1.3.50
 systemProp.frontendPluginVersion=0.0.45
-serializationVersion=0.11.1
+serializationVersion=0.13.0
 #Dependencies
-kvisionVersion=0.0.38
-ktorVersion=1.2.2
+kvisionVersion=0.0.39
+ktorVersion=1.2.4
 hikariVersion=3.2.0
 commonsCodecVersion=1.10
 jdbcNamedParametersVersion=1.1

diff --git a/addressbook-fullstack-ktor/settings.gradle.kts b/addressbook-fullstack-ktor/settings.gradle.kts
@@ -1,6 +1,6 @@
 pluginManagement {
     repositories {
-        //        mavenCentral()
+        mavenCentral()
         jcenter()
         maven { url = uri("https://plugins.gradle.org/m2/") }
         maven { url = uri("https://dl.bintray.com/kotlin/kotlin-eap") }

diff --git a/addressbook-fullstack-spring-boot/build.gradle.kts b/addressbook-fullstack-spring-boot/build.gradle.kts
@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.frontend.KotlinFrontendExtension
 import org.jetbrains.kotlin.gradle.frontend.npm.NpmExtension
 import org.jetbrains.kotlin.gradle.frontend.webpack.WebPackExtension
 import org.jetbrains.kotlin.gradle.frontend.webpack.WebPackRunTask
-import org.jetbrains.kotlin.gradle.targets.js.nodejs.nodeJs
+import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
 import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jetbrains.kotlin.gradle.tasks.KotlinJsDce
@@ -30,6 +30,7 @@ version = "1.0.0-SNAPSHOT"
 group = "com.example"
 
 repositories {
+    mavenCentral()
     jcenter()
     mavenCentral()
     maven { url = uri("https://dl.bintray.com/kotlin/kotlin-eap") }
@@ -227,7 +228,7 @@ tasks {
     create("generatePotFile", Exec::class) {
         dependsOn("npm-install", "generateGruntfile")
         workingDir = file("$buildDir")
-        executable = project.nodeJs.root.nodeCommand
+        executable = NodeJsRootPlugin.apply(project).nodeCommand
         args("$buildDir/node_modules/grunt/bin/grunt", "pot")
         inputs.files(kotlin.sourceSets["frontendMain"].kotlin.files)
         outputs.file("$projectDir/src/frontendMain/resources/i18n/messages.pot")
@@ -243,7 +244,7 @@ afterEvaluate {
                     it.isFile && it.extension == "po"
                 }.forEach {
                     exec {
-                        executable = project.nodeJs.root.nodeCommand
+                        executable = NodeJsRootPlugin.apply(project).nodeCommand
                         args("$buildDir/node_modules/po2json/bin/po2json",
                                 it.absolutePath,
                                 "${it.parent}/${it.nameWithoutExtension}.json",

diff --git a/addressbook-fullstack-spring-boot/gradle.properties b/addressbook-fullstack-spring-boot/gradle.properties
@@ -1,13 +1,13 @@
 javaVersion=1.8
 kotlin.incremental.js=false
 #Plugins
-systemProp.kotlinVersion=1.3.41
+systemProp.kotlinVersion=1.3.50
 systemProp.frontendPluginVersion=0.0.45
-serializationVersion=0.11.1
+serializationVersion=0.13.0
 systemProp.dependencyManagementPluginVersion=1.0.4.RELEASE
-systemProp.springBootVersion=2.1.6.RELEASE
+systemProp.springBootVersion=2.1.8.RELEASE
 #Dependencies
-kvisionVersion=0.0.38
+kvisionVersion=0.0.39
 springMvcPac4jVersion=4.0.0-SNAPSHOT
 pac4jVersion=3.3.0
 springSecurityCryptoVersion=5.1.0.RELEASE

diff --git a/addressbook-fullstack-spring-boot/settings.gradle.kts b/addressbook-fullstack-spring-boot/settings.gradle.kts
@@ -1,5 +1,6 @@
 pluginManagement {
     repositories {
+        mavenCentral()
         jcenter()
         gradlePluginPortal()
         maven { url = uri("https://plugins.gradle.org/m2/") }

diff --git a/addressbook-tabulator/build.gradle.kts b/addressbook-tabulator/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.frontend.KotlinFrontendExtension
 import org.jetbrains.kotlin.gradle.frontend.npm.NpmExtension
 import org.jetbrains.kotlin.gradle.frontend.webpack.WebPackExtension
-import org.jetbrains.kotlin.gradle.targets.js.nodejs.nodeJs
+import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
 import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
 import org.jetbrains.kotlin.gradle.tasks.KotlinJsDce
 
@@ -21,6 +21,7 @@ version = "1.0.0-SNAPSHOT"
 group = "com.example"
 
 repositories {
+    mavenCentral()
     jcenter()
     maven { url = uri("https://dl.bintray.com/kotlin/kotlin-eap") }
     maven { url = uri("https://kotlin.bintray.com/kotlinx") }
@@ -132,7 +133,7 @@ tasks {
     create("generatePotFile", Exec::class) {
         dependsOn("npm-install", "generateGruntfile")
         workingDir = file("$buildDir")
-        executable = project.nodeJs.root.nodeCommand
+        executable = NodeJsRootPlugin.apply(project).nodeCommand
         args("$buildDir/node_modules/grunt/bin/grunt", "pot")
         inputs.files(sourceSets["main"].allSource)
         outputs.file("$projectDir/src/main/resources/i18n/messages.pot")
@@ -148,7 +149,7 @@ afterEvaluate {
                     it.isFile && it.extension == "po"
                 }.forEach {
                     exec {
-                        executable = project.nodeJs.root.nodeCommand
+                        executable = NodeJsRootPlugin.apply(project).nodeCommand
                         args(
                             "$buildDir/node_modules/po2json/bin/po2json",
                             it.absolutePath,

diff --git a/addressbook-tabulator/gradle.properties b/addressbook-tabulator/gradle.properties
@@ -1,8 +1,8 @@
 javaVersion=1.8
 kotlin.incremental.js=false
 #Plugins
-systemProp.kotlinVersion=1.3.41
+systemProp.kotlinVersion=1.3.50
 systemProp.frontendPluginVersion=0.0.45
-serializationVersion=0.11.1
+serializationVersion=0.13.0
 #Dependencies
-kvisionVersion=0.0.38
+kvisionVersion=0.0.39
diff --git a/addressbook-tabulator/settings.gradle.kts b/addressbook-tabulator/settings.gradle.kts
@@ -1,6 +1,6 @@
 pluginManagement {
     repositories {
-        //        mavenCentral()
+        mavenCentral()
         jcenter()
         maven { url = uri("https://plugins.gradle.org/m2/") }
         maven { url = uri("https://dl.bintray.com/kotlin/kotlin-eap") }

diff --git a/addressbook/build.gradle.kts b/addressbook/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.frontend.KotlinFrontendExtension
 import org.jetbrains.kotlin.gradle.frontend.npm.NpmExtension
 import org.jetbrains.kotlin.gradle.frontend.webpack.WebPackExtension
-import org.jetbrains.kotlin.gradle.targets.js.nodejs.nodeJs
+import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
 import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
 import org.jetbrains.kotlin.gradle.tasks.KotlinJsDce
 
@@ -21,6 +21,7 @@ version = "1.0.0-SNAPSHOT"
 group = "com.example"
 
 repositories {
+    mavenCentral()
     jcenter()
     maven { url = uri("https://dl.bintray.com/kotlin/kotlin-eap") }
     maven { url = uri("https://kotlin.bintray.com/kotlinx") }
@@ -132,7 +133,7 @@ tasks {
     create("generatePotFile", Exec::class) {
         dependsOn("npm-install", "generateGruntfile")
         workingDir = file("$buildDir")
-        executable = project.nodeJs.root.nodeCommand
+        executable = NodeJsRootPlugin.apply(project).nodeCommand
         args("$buildDir/node_modules/grunt/bin/grunt", "pot")
         inputs.files(sourceSets["main"].allSource)
         outputs.file("$projectDir/src/main/resources/i18n/messages.pot")
@@ -148,7 +149,7 @@ afterEvaluate {
                     it.isFile && it.extension == "po"
                 }.forEach {
                     exec {
-                        executable = project.nodeJs.root.nodeCommand
+                        executable = NodeJsRootPlugin.apply(project).nodeCommand
                         args(
                             "$buildDir/node_modules/po2json/bin/po2json",
                             it.absolutePath,

diff --git a/addressbook/gradle.properties b/addressbook/gradle.properties
@@ -1,8 +1,8 @@
 javaVersion=1.8
 kotlin.incremental.js=false
 #Plugins
-systemProp.kotlinVersion=1.3.41
+systemProp.kotlinVersion=1.3.50
 systemProp.frontendPluginVersion=0.0.45
-serializationVersion=0.11.1
+serializationVersion=0.13.0
 #Dependencies
-kvisionVersion=0.0.38
+kvisionVersion=0.0.39
diff --git a/addressbook/settings.gradle.kts b/addressbook/settings.gradle.kts
@@ -1,6 +1,6 @@
 pluginManagement {
     repositories {
-        //        mavenCentral()
+        mavenCentral()
         jcenter()
         maven { url = uri("https://plugins.gradle.org/m2/") }
         maven { url = uri("https://dl.bintray.com/kotlin/kotlin-eap") }

diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.frontend.KotlinFrontendExtension
 import org.jetbrains.kotlin.gradle.frontend.npm.NpmExtension
 import org.jetbrains.kotlin.gradle.frontend.webpack.WebPackExtension
-import org.jetbrains.kotlin.gradle.targets.js.nodejs.nodeJs
+import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
 import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
 import org.jetbrains.kotlin.gradle.tasks.KotlinJsDce
 
@@ -21,6 +21,7 @@ version = "1.0.0-SNAPSHOT"
 group = "com.example"
 
 repositories {
+    mavenCentral()
     jcenter()
     maven { url = uri("https://dl.bintray.com/kotlin/kotlin-eap") }
     maven { url = uri("https://kotlin.bintray.com/kotlinx") }
@@ -131,7 +132,7 @@ tasks {
     create("generatePotFile", Exec::class) {
         dependsOn("npm-install", "generateGruntfile")
         workingDir = file("$buildDir")
-        executable = project.nodeJs.root.nodeCommand
+        executable = NodeJsRootPlugin.apply(project).nodeCommand
         args("$buildDir/node_modules/grunt/bin/grunt", "pot")
         inputs.files(sourceSets["main"].allSource)
         outputs.file("$projectDir/src/main/resources/i18n/messages.pot")
@@ -147,7 +148,7 @@ afterEvaluate {
                     it.isFile && it.extension == "po"
                 }.forEach {
                     exec {
-                        executable = project.nodeJs.root.nodeCommand
+                        executable = NodeJsRootPlugin.apply(project).nodeCommand
                         args(
                             "$buildDir/node_modules/po2json/bin/po2json",
                             it.absolutePath,

diff --git a/desktop/gradle.properties b/desktop/gradle.properties
@@ -1,8 +1,8 @@
 javaVersion=1.8
 kotlin.incremental.js=false
 #Plugins
-systemProp.kotlinVersion=1.3.41
+systemProp.kotlinVersion=1.3.50
 systemProp.frontendPluginVersion=0.0.45
-serializationVersion=0.11.1
+serializationVersion=0.13.0
 #Dependencies
-kvisionVersion=0.0.38
+kvisionVersion=0.0.39
diff --git a/desktop/settings.gradle.kts b/desktop/settings.gradle.kts
@@ -1,6 +1,6 @@
 pluginManagement {
     repositories {
-        //        mavenCentral()
+        mavenCentral()
         jcenter()
         maven { url = uri("https://plugins.gradle.org/m2/") }
         maven { url = uri("https://dl.bintray.com/kotlin/kotlin-eap") }