From 336cdc27119bcf78fb5e02fea1430c8954a02b76 Mon Sep 17 00:00:00 2001 From: Robert Jaros Date: Sat, 17 Sep 2022 12:25:55 +0200 Subject: [PATCH] Fix tests --- .../test/kotlin/io/kvision/gradle/KVisionExtensionTest.kt | 6 +++--- .../src/test/kotlin/io/kvision/gradle/KVisionPluginTest.kt | 6 +++--- .../resources/template-projects/kotlin-js/gradle.properties | 4 ++-- .../template-fullstack-ktor/gradle.properties | 6 +++--- .../template-fullstack-ktor/system.properties | 1 - 5 files changed, 11 insertions(+), 12 deletions(-) delete mode 100644 kvision-tools/kvision-gradle-plugin/src/test/resources/template-projects/template-fullstack-ktor/system.properties diff --git a/kvision-tools/kvision-gradle-plugin/src/test/kotlin/io/kvision/gradle/KVisionExtensionTest.kt b/kvision-tools/kvision-gradle-plugin/src/test/kotlin/io/kvision/gradle/KVisionExtensionTest.kt index 1c31f13c76d..9768776b997 100644 --- a/kvision-tools/kvision-gradle-plugin/src/test/kotlin/io/kvision/gradle/KVisionExtensionTest.kt +++ b/kvision-tools/kvision-gradle-plugin/src/test/kotlin/io/kvision/gradle/KVisionExtensionTest.kt @@ -180,7 +180,7 @@ tasks.register("printYarnVersions") { context("with applied with alongside Kotlin/MPP plugin") { val projectDir: File = `gradle kts project` { - val kvisionVersion = "5.12.0" + val kvisionVersion = "5.15.2" `build gradle kts`( """ import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig @@ -312,7 +312,7 @@ kotlin { companion object { private val baseKotlinJsBuildGradleKts: String = run { - val kvisionVersion = "5.12.0" + val kvisionVersion = "5.15.2" //language=kotlin """ import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig @@ -327,7 +327,7 @@ repositories { } val kotlinVersion: String = "1.7.10" -val kvisionVersion: String = "5.12.0" +val kvisionVersion: String = "5.15.2" val webDir = file("src/main/web") diff --git a/kvision-tools/kvision-gradle-plugin/src/test/kotlin/io/kvision/gradle/KVisionPluginTest.kt b/kvision-tools/kvision-gradle-plugin/src/test/kotlin/io/kvision/gradle/KVisionPluginTest.kt index 33a752fd632..3d725386adf 100644 --- a/kvision-tools/kvision-gradle-plugin/src/test/kotlin/io/kvision/gradle/KVisionPluginTest.kt +++ b/kvision-tools/kvision-gradle-plugin/src/test/kotlin/io/kvision/gradle/KVisionPluginTest.kt @@ -64,7 +64,7 @@ class KVisionPluginTest : FunSpec({ context("verify KVision plugin creates tasks") { context("applied with alongside Kotlin/JS plugin") { - val kvisionVersion = "5.10.1" + val kvisionVersion = "5.15.2" val projectDir: File = `gradle kts project` { `build gradle kts`( """ @@ -80,7 +80,7 @@ repositories { } val kotlinVersion: String = "1.7.10" -val kvisionVersion: String = "5.12.0" +val kvisionVersion: String = "5.15.2" val webDir = file("src/main/web") @@ -179,7 +179,7 @@ kotlin { test("kotlin script") { val projectDir: File = `gradle kts project` { - val kvisionVersion = "5.12.0" + val kvisionVersion = "5.15.2" `build gradle kts`( """ import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig diff --git a/kvision-tools/kvision-gradle-plugin/src/test/resources/template-projects/kotlin-js/gradle.properties b/kvision-tools/kvision-gradle-plugin/src/test/resources/template-projects/kotlin-js/gradle.properties index c4465f542ec..d620b55d97a 100644 --- a/kvision-tools/kvision-gradle-plugin/src/test/resources/template-projects/kotlin-js/gradle.properties +++ b/kvision-tools/kvision-gradle-plugin/src/test/resources/template-projects/kotlin-js/gradle.properties @@ -1,7 +1,7 @@ javaVersion=1.8 #Plugins systemProp.kotlinVersion=1.7.10 -serializationVersion=1.3.3 +serializationVersion=1.4.0 #Dependencies -systemProp.kvisionVersion=5.12.0 +systemProp.kvisionVersion=5.15.2 kotlin.js.compiler=ir diff --git a/kvision-tools/kvision-gradle-plugin/src/test/resources/template-projects/template-fullstack-ktor/gradle.properties b/kvision-tools/kvision-gradle-plugin/src/test/resources/template-projects/template-fullstack-ktor/gradle.properties index 50a967170d4..b0d2f8fa5e1 100644 --- a/kvision-tools/kvision-gradle-plugin/src/test/resources/template-projects/template-fullstack-ktor/gradle.properties +++ b/kvision-tools/kvision-gradle-plugin/src/test/resources/template-projects/template-fullstack-ktor/gradle.properties @@ -1,10 +1,10 @@ javaVersion=1.8 #Plugins systemProp.kotlinVersion=1.7.10 -serializationVersion=1.3.3 +serializationVersion=1.4.0 #Dependencies -systemProp.kvisionVersion=5.12.0 -ktorVersion=2.0.3 +systemProp.kvisionVersion=5.15.2 +ktorVersion=2.1.1 hikariVersion=3.2.0 commonsCodecVersion=1.10 jdbcNamedParametersVersion=1.1 diff --git a/kvision-tools/kvision-gradle-plugin/src/test/resources/template-projects/template-fullstack-ktor/system.properties b/kvision-tools/kvision-gradle-plugin/src/test/resources/template-projects/template-fullstack-ktor/system.properties deleted file mode 100644 index 5e8606c8919..00000000000 --- a/kvision-tools/kvision-gradle-plugin/src/test/resources/template-projects/template-fullstack-ktor/system.properties +++ /dev/null @@ -1 +0,0 @@ -java.runtime.version=1.8