From cd23498cc4ac5dc4ac5da6b0062b4728b52b3ac6 Mon Sep 17 00:00:00 2001 From: "anastasiia.spaseeva" Date: Mon, 1 Mar 2021 10:17:58 +0100 Subject: [PATCH] Fix tests after libraries and wrappers versions updating --- .../composeDesktopApplication/build.gradle.kts | 4 ++-- .../expected/android/build.gradle.kts | 2 +- .../expected/build.gradle.kts | 2 +- .../expected/common/build.gradle.kts | 2 +- .../expected/desktop/build.gradle.kts | 2 +- .../fullStackWebApplication/build.gradle | 8 ++++---- .../fullStackWebApplication/build.gradle.kts | 8 ++++---- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/build.gradle.kts index cbfb8cf572f..d7ca1d57fe0 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/build.gradle.kts @@ -2,8 +2,8 @@ import org.jetbrains.compose.compose import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.4.0" - id("org.jetbrains.compose") version "0.1.0-dev106" + kotlin("jvm") version "1.4.30" + id("org.jetbrains.compose") version "0.3.0-build149" application } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/android/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/android/build.gradle.kts index de5d976f7c5..4ed5301e312 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/android/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/android/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("org.jetbrains.compose") version "0.1.0-dev106" + id("org.jetbrains.compose") version "0.3.0-build149" id("com.android.application") kotlin("android") } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/build.gradle.kts index ef47d588ac1..6fdc2ef685e 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/build.gradle.kts @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30") classpath("com.android.tools.build:gradle:4.0.1") } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/common/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/common/build.gradle.kts index a0f12fc64e9..977fcd529d7 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/common/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/common/build.gradle.kts @@ -2,7 +2,7 @@ import org.jetbrains.compose.compose plugins { kotlin("multiplatform") - id("org.jetbrains.compose") version "0.1.0-dev106" + id("org.jetbrains.compose") version "0.3.0-build149" id("com.android.library") id("kotlin-android-extensions") } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/desktop/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/desktop/build.gradle.kts index 2adf05c2f3a..231f8405dab 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/desktop/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/desktop/build.gradle.kts @@ -2,7 +2,7 @@ import org.jetbrains.compose.compose plugins { kotlin("multiplatform") - id("org.jetbrains.compose") version "0.1.0-dev106" + id("org.jetbrains.compose") version "0.3.0-build149" application } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle index a7d25070ee6..d5427cb7c56 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle @@ -54,8 +54,8 @@ kotlin { } jvmMain { dependencies { - implementation 'io.ktor:ktor-server-netty:1.4.0' - implementation 'io.ktor:ktor-html-builder:1.4.0' + implementation 'io.ktor:ktor-server-netty:1.5.2' + implementation 'io.ktor:ktor-html-builder:1.5.2' implementation 'org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.2' } } @@ -66,8 +66,8 @@ kotlin { } jsMain { dependencies { - implementation 'org.jetbrains:kotlin-react:16.13.1-pre.113-kotlin-1.4.0' - implementation 'org.jetbrains:kotlin-react-dom:16.13.1-pre.113-kotlin-1.4.0' + implementation 'org.jetbrains:kotlin-react:17.0.1-pre.148-kotlin-1.4.30' + implementation 'org.jetbrains:kotlin-react-dom:17.0.1-pre.148-kotlin-1.4.30' } } jsTest { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts index 32db0a3edab..582a26fc742 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts @@ -52,8 +52,8 @@ kotlin { } val jvmMain by getting { dependencies { - implementation("io.ktor:ktor-server-netty:1.4.0") - implementation("io.ktor:ktor-html-builder:1.4.0") + implementation("io.ktor:ktor-server-netty:1.5.2") + implementation("io.ktor:ktor-html-builder:1.5.2") implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.2") } } @@ -64,8 +64,8 @@ kotlin { } val jsMain by getting { dependencies { - implementation("org.jetbrains:kotlin-react:16.13.1-pre.113-kotlin-1.4.0") - implementation("org.jetbrains:kotlin-react-dom:16.13.1-pre.113-kotlin-1.4.0") + implementation("org.jetbrains:kotlin-react:17.0.1-pre.148-kotlin-1.4.30") + implementation("org.jetbrains:kotlin-react-dom:17.0.1-pre.148-kotlin-1.4.30") } } val jsTest by getting {