Version 0.2.7

Upgrade to KVision 4.7.0
JakubNeukirch · May 25, 2021 · 437f07f · 437f07f
1 parent 8788e71
commit 437f07f
Show file tree

Hide file tree

Showing 14 changed files with 36 additions and 30 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,11 +1,11 @@
 plugins {
     id 'org.jetbrains.intellij' version '0.7.2'
-    id 'org.jetbrains.kotlin.jvm' version '1.5.0'
+    id 'org.jetbrains.kotlin.jvm' version '1.5.10'
     id 'idea'
 }
 
 group 'tech.stonks'
-version '0.2.6'
+version '0.2.7'
 
 repositories {
     mavenCentral()

diff --git a/src/main/kotlin/tech/stonks/kvizard/KVisionModuleBuilder.kt b/src/main/kotlin/tech/stonks/kvizard/KVisionModuleBuilder.kt
@@ -91,7 +91,7 @@ class KVisionModuleBuilder : ModuleBuilder() {
     }
 
     private fun installGradleWrapper(project: Project) {
-        project.runGradle("wrapper --gradle-version 6.9 --distribution-type all")
+        project.runGradle("wrapper --gradle-version 7.0.2 --distribution-type all")
     }
 
     private fun createGenerator(): TreeGenerator {
@@ -124,14 +124,14 @@ class KVisionModuleBuilder : ModuleBuilder() {
             VersionApi.create().getVersionData().blockingGet()
         } catch (ex: Exception) {
             VersionData(
-                kVision = "4.5.0",
-                kotlin = "1.5.0",
-                serialization = "1.2.0",
-                coroutines = "1.5.0-RC",
+                kVision = "4.7.0",
+                kotlin = "1.5.10",
+                serialization = "1.2.1",
+                coroutines = "1.5.0",
                 templateJooby = TemplateJooby("2.9.6"),
                 templateKtor = TemplateKtor("1.5.4"),
-                templateMicronaut = TemplateMicronaut("2.5.1"),
-                templateSpring = TemplateSpring(springBoot = "2.4.5"),
+                templateMicronaut = TemplateMicronaut("2.5.4"),
+                templateSpring = TemplateSpring(springBoot = "2.5.0"),
                 templateVertx = TemplateVertx(vertxPlugin = "1.1.3"),
                 modules = emptyList()
             )

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -4,6 +4,12 @@
     <name>KVision Project Wizard</name>
     <vendor email="[email protected]" url="https://stonks.tech">Stonks.tech</vendor>
     <change-notes>
+        &lt;i&gt;Version 0.2.7:&lt;/i&gt;
+        &lt;ul&gt;
+            &lt;li&gt;Upgrade to KVision 4.7.0&lt;/li&gt;
+            &lt;li&gt;Upgrade to Kotlin 1.5.10&lt;/li&gt;
+        &lt;/ul&gt;
+
         &lt;i&gt;Version 0.2.6:&lt;/i&gt;
         &lt;ul&gt;
             &lt;li&gt;Upgrade to KVision 4.5.0&lt;/li&gt;

diff --git a/src/main/resources/fileTemplates/internal/front_build.gradle.kts.ft b/src/main/resources/fileTemplates/internal/front_build.gradle.kts.ft
@@ -32,11 +32,11 @@ kotlin {
                 devServer = KotlinWebpackConfig.DevServer(
                     open = false,
                     port = 3000,
-                    proxy = mapOf(
+                    proxy = mutableMapOf(
                         "/kv/*" to "http://localhost:8080",
                         "/kvws/*" to mapOf("target" to "ws://localhost:8080", "ws" to true)
                     ),
-                    contentBase = listOf("$buildDir/processedResources/js/main")
+                    static = mutableListOf("$buildDir/processedResources/js/main")
                 )
             }
             webpackTask {
@@ -118,4 +118,4 @@ afterEvaluate {
             outputs.file(archiveFile)
         }
     }
-}
+}
diff --git a/src/main/resources/fileTemplates/internal/front_settings.gradle.kts.ft b/src/main/resources/fileTemplates/internal/front_settings.gradle.kts.ft
@@ -6,4 +6,4 @@ pluginManagement {
         mavenLocal()
     }
 }
-rootProject.name = "${ARTIFACT_ID}"
+rootProject.name = "${ARTIFACT_ID}"
diff --git a/src/main/resources/fileTemplates/internal/javalin_build.gradle.kts.ft b/src/main/resources/fileTemplates/internal/javalin_build.gradle.kts.ft
@@ -48,11 +48,11 @@ kotlin {
                 devServer = KotlinWebpackConfig.DevServer(
                     open = false,
                     port = 3000,
-                    proxy = mapOf(
+                    proxy = mutableMapOf(
                         "/kv/*" to "http://localhost:8080",
                         "/kvws/*" to mapOf("target" to "ws://localhost:8080", "ws" to true)
                     ),
-                    contentBase = listOf("$buildDir/processedResources/frontend/main")
+                    static = mutableListOf("$buildDir/processedResources/frontend/main")
                 )
             }
             testTask {

diff --git a/src/main/resources/fileTemplates/internal/jooby_build.gradle.kts.ft b/src/main/resources/fileTemplates/internal/jooby_build.gradle.kts.ft
@@ -48,11 +48,11 @@ kotlin {
                 devServer = KotlinWebpackConfig.DevServer(
                     open = false,
                     port = 3000,
-                    proxy = mapOf(
+                    proxy = mutableMapOf(
                         "/kv/*" to "http://localhost:8080",
                         "/kvws/*" to mapOf("target" to "ws://localhost:8080", "ws" to true)
                     ),
-                    contentBase = listOf("$buildDir/processedResources/frontend/main")
+                    static = mutableListOf("$buildDir/processedResources/frontend/main")
                 )
             }
             webpackTask {

diff --git a/src/main/resources/fileTemplates/internal/ktor_build.gradle.kts.ft b/src/main/resources/fileTemplates/internal/ktor_build.gradle.kts.ft
@@ -45,11 +45,11 @@ kotlin {
                 devServer = KotlinWebpackConfig.DevServer(
                     open = false,
                     port = 3000,
-                    proxy = mapOf(
+                    proxy = mutableMapOf(
                         "/kv/*" to "http://localhost:8080",
                         "/kvws/*" to mapOf("target" to "ws://localhost:8080", "ws" to true)
                     ),
-                    contentBase = listOf("$buildDir/processedResources/frontend/main")
+                    static = mutableListOf("$buildDir/processedResources/frontend/main")
                 )
             }
             webpackTask {

diff --git a/src/main/resources/fileTemplates/internal/micronaut_build.gradle.kts.ft b/src/main/resources/fileTemplates/internal/micronaut_build.gradle.kts.ft
@@ -61,11 +61,11 @@ kotlin {
                 devServer = KotlinWebpackConfig.DevServer(
                     open = false,
                     port = 3000,
-                    proxy = mapOf(
+                    proxy = mutableMapOf(
                         "/kv/*" to "http://localhost:8080",
                         "/kvws/*" to mapOf("target" to "ws://localhost:8080", "ws" to true)
                     ),
-                    contentBase = listOf("$buildDir/processedResources/frontend/main")
+                    static = mutableListOf("$buildDir/processedResources/frontend/main")
                 )
             }
             webpackTask {
@@ -96,7 +96,7 @@ kotlin {
             dependencies {
                 implementation(kotlin("stdlib-jdk8"))
                 implementation(kotlin("reflect"))
-                implementation(project.dependencies.enforcedPlatform("io.micronaut:micronaut-bom:$micronautVersion"))
+                implementation(project.dependencies.platform("io.micronaut:micronaut-bom:$micronautVersion"))
                 implementation("io.micronaut:micronaut-inject")
                 implementation("io.micronaut:micronaut-validation")
                 implementation("io.micronaut.kotlin:micronaut-kotlin-runtime")
@@ -112,7 +112,7 @@ kotlin {
             dependencies {
                 implementation(kotlin("test"))
                 implementation(kotlin("test-junit"))
-                implementation(project.dependencies.enforcedPlatform("io.micronaut:micronaut-bom:$micronautVersion"))
+                implementation(project.dependencies.platform("io.micronaut:micronaut-bom:$micronautVersion"))
                 implementation("org.junit.jupiter:junit-jupiter-api")
                 implementation("io.micronaut.test:micronaut-test-junit5")
                 implementation("org.junit.jupiter:junit-jupiter-engine")

diff --git a/src/main/resources/fileTemplates/internal/spring_backend_resources_application.yml.ft b/src/main/resources/fileTemplates/internal/spring_backend_resources_application.yml.ft
@@ -2,4 +2,4 @@ server:
   compression:
     enabled: true
     mime-types: text/html,text/xml,text/plain,text/css,text/javascript,application/javascript,application/json
-    min-response-size: 1024
+    min-response-size: 1024
diff --git a/src/main/resources/fileTemplates/internal/spring_backend_resources_logback.xml.ft b/src/main/resources/fileTemplates/internal/spring_backend_resources_logback.xml.ft
@@ -13,4 +13,4 @@
     <appender-ref ref="STDOUT" />
   </root>
 
-</configuration>
+</configuration>
diff --git a/src/main/resources/fileTemplates/internal/spring_build.gradle.kts.ft b/src/main/resources/fileTemplates/internal/spring_build.gradle.kts.ft
@@ -51,11 +51,11 @@ kotlin {
                 devServer = KotlinWebpackConfig.DevServer(
                     open = false,
                     port = 3000,
-                    proxy = mapOf(
+                    proxy = mutableMapOf(
                         "/kv/*" to "http://localhost:8080",
                         "/kvws/*" to mapOf("target" to "ws://localhost:8080", "ws" to true)
                     ),
-                    contentBase = listOf("$buildDir/processedResources/frontend/main")
+                    static = mutableListOf("$buildDir/processedResources/frontend/main")
                 )
             }
             webpackTask {

diff --git a/src/main/resources/fileTemplates/internal/vertx_build.gradle.kts.ft b/src/main/resources/fileTemplates/internal/vertx_build.gradle.kts.ft
@@ -47,11 +47,11 @@ kotlin {
                 devServer = KotlinWebpackConfig.DevServer(
                     open = false,
                     port = 3000,
-                    proxy = mapOf(
+                    proxy = mutableMapOf(
                         "/kv/*" to "http://localhost:8080",
                         "/kvws/*" to mapOf("target" to "ws://localhost:8080", "ws" to true)
                     ),
-                    contentBase = listOf("$buildDir/processedResources/frontend/main")
+                    static = mutableListOf("$buildDir/processedResources/frontend/main")
                 )
             }
             webpackTask {

diff --git a/src/main/resources/fileTemplates/internal/webpack_handlebars.js.ft b/src/main/resources/fileTemplates/internal/webpack_handlebars.js.ft
@@ -3,4 +3,4 @@ config.module.rules.push(
         test: /\.hbs$/i,
         loader: 'handlebars-loader'
     }
-);
+);
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,4 +3,4 @@ config.module.rules.push( @@
             test: /\.hbs$/i,
             loader: 'handlebars-loader'
         }
-    );
+    );