From aa3cdc09fc296721e112bb90c7e8eae5436e978c Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Fri, 10 Apr 2020 13:03:17 +0300 Subject: [PATCH] Wizard: update libraries versions #KT-38124 fixed --- .../android/expected/android/build.gradle | 2 +- .../android/expected/android/build.gradle.kts | 2 +- .../frontendApplication/build.gradle | 14 +++++++------- .../frontendApplication/build.gradle.kts | 14 +++++++------- .../fullStackWebApplication/build.gradle | 16 ++++++++-------- .../fullStackWebApplication/build.gradle.kts | 16 ++++++++-------- .../expected/androidApp/build.gradle | 2 +- .../expected/androidApp/build.gradle.kts | 2 +- .../expected/shared/build.gradle | 2 +- .../expected/shared/build.gradle.kts | 2 +- .../expected/build.gradle | 2 +- .../expected/build.gradle.kts | 2 +- .../kotlin/tools/projectWizard/Versions.kt | 10 +++++----- .../templates/SimpleJsClientTemplate.kt | 2 +- 14 files changed, 44 insertions(+), 44 deletions(-) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle index 838812c88e0..aa7f000e3b3 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle @@ -16,7 +16,7 @@ repositories { } } dependencies { - implementation 'androidx.core:core-ktx:1.1.0' + implementation 'androidx.core:core-ktx:1.2.0' implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle.kts index 2c57f4d674a..84580461f68 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle.kts @@ -16,7 +16,7 @@ repositories { } } dependencies { - implementation("androidx.core:core-ktx:1.1.0") + implementation("androidx.core:core-ktx:1.2.0") implementation("androidx.appcompat:appcompat:1.1.0") implementation("androidx.constraintlayout:constraintlayout:1.1.3") implementation(kotlin("stdlib-jdk7")) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle index 626036d7e31..a00daa0a36d 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle @@ -17,13 +17,13 @@ repositories { dependencies { testImplementation 'org.jetbrains.kotlin:kotlin-test-js' implementation 'org.jetbrains.kotlin:kotlin-stdlib-js' - implementation 'org.jetbrains.kotlinx:kotlinx-html-js:0.6.12' - implementation 'org.jetbrains:kotlin-react:16.9.0-pre.89-kotlin-1.3.60' - implementation 'org.jetbrains:kotlin-react-dom:16.9.0-pre.89-kotlin-1.3.60' - implementation npm('react','16.12.0') - implementation npm('react-dom','16.12.0') - implementation npm('react-is','16.12.0') - implementation 'org.jetbrains:kotlin-styled:1.0.0-pre.89-kotlin-1.3.60' + implementation 'org.jetbrains.kotlinx:kotlinx-html-js:0.7.1' + implementation 'org.jetbrains:kotlin-react:16.13.0-pre.93-kotlin-1.4-M1' + implementation 'org.jetbrains:kotlin-react-dom:16.13.0-pre.93-kotlin-1.4-M1' + implementation npm('react','16.13.0') + implementation npm('react-dom','16.13.0') + implementation npm('react-is','16.13.0') + implementation 'org.jetbrains:kotlin-styled:1.0.0-pre.93-kotlin-1.4-M1' implementation npm('styled-components','5.0.0') implementation npm('inline-style-prefixer','5.1.0') } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts index ffa3ca9f3b0..88b9be8d5ef 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts @@ -17,13 +17,13 @@ repositories { dependencies { testImplementation(kotlin("test-js")) implementation(kotlin("stdlib-js")) - implementation("org.jetbrains.kotlinx:kotlinx-html-js:0.6.12") - implementation("org.jetbrains:kotlin-react:16.9.0-pre.89-kotlin-1.3.60") - implementation("org.jetbrains:kotlin-react-dom:16.9.0-pre.89-kotlin-1.3.60") - implementation(npm("react","16.12.0")) - implementation(npm("react-dom","16.12.0")) - implementation(npm("react-is","16.12.0")) - implementation("org.jetbrains:kotlin-styled:1.0.0-pre.89-kotlin-1.3.60") + implementation("org.jetbrains.kotlinx:kotlinx-html-js:0.7.1") + implementation("org.jetbrains:kotlin-react:16.13.0-pre.93-kotlin-1.4-M1") + implementation("org.jetbrains:kotlin-react-dom:16.13.0-pre.93-kotlin-1.4-M1") + implementation(npm("react","16.13.0")) + implementation(npm("react-dom","16.13.0")) + implementation(npm("react-is","16.13.0")) + implementation("org.jetbrains:kotlin-styled:1.0.0-pre.93-kotlin-1.4-M1") implementation(npm("styled-components","5.0.0")) implementation(npm("inline-style-prefixer","5.1.0")) } 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 28801a8db71..0423a93f650 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 @@ -38,7 +38,7 @@ kotlin { implementation kotlin('stdlib-jdk8') implementation 'io.ktor:ktor-server-netty:1.2.6' implementation 'io.ktor:ktor-html-builder:1.2.6' - implementation 'org.jetbrains.kotlinx:kotlinx-html-jvm:0.6.12' + implementation 'org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.1' } } jvmTest { @@ -49,13 +49,13 @@ kotlin { jsMain { dependencies { implementation kotlin('stdlib-js') - implementation 'org.jetbrains.kotlinx:kotlinx-html-js:0.6.12' - implementation 'org.jetbrains:kotlin-react:16.9.0-pre.89-kotlin-1.3.60' - implementation 'org.jetbrains:kotlin-react-dom:16.9.0-pre.89-kotlin-1.3.60' - implementation npm('react','16.12.0') - implementation npm('react-dom','16.12.0') - implementation npm('react-is','16.12.0') - implementation 'org.jetbrains:kotlin-styled:1.0.0-pre.89-kotlin-1.3.60' + implementation 'org.jetbrains.kotlinx:kotlinx-html-js:0.7.1' + implementation 'org.jetbrains:kotlin-react:16.13.0-pre.93-kotlin-1.4-M1' + implementation 'org.jetbrains:kotlin-react-dom:16.13.0-pre.93-kotlin-1.4-M1' + implementation npm('react','16.13.0') + implementation npm('react-dom','16.13.0') + implementation npm('react-is','16.13.0') + implementation 'org.jetbrains:kotlin-styled:1.0.0-pre.93-kotlin-1.4-M1' implementation npm('styled-components','5.0.0') implementation npm('inline-style-prefixer','5.1.0') } 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 18a2b479610..bb4b53f3ff7 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 @@ -38,7 +38,7 @@ kotlin { implementation(kotlin("stdlib-jdk8")) implementation("io.ktor:ktor-server-netty:1.2.6") implementation("io.ktor:ktor-html-builder:1.2.6") - implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.6.12") + implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.1") } } val jvmTest by getting { @@ -49,13 +49,13 @@ kotlin { val jsMain by getting { dependencies { implementation(kotlin("stdlib-js")) - implementation("org.jetbrains.kotlinx:kotlinx-html-js:0.6.12") - implementation("org.jetbrains:kotlin-react:16.9.0-pre.89-kotlin-1.3.60") - implementation("org.jetbrains:kotlin-react-dom:16.9.0-pre.89-kotlin-1.3.60") - implementation(npm("react","16.12.0")) - implementation(npm("react-dom","16.12.0")) - implementation(npm("react-is","16.12.0")) - implementation("org.jetbrains:kotlin-styled:1.0.0-pre.89-kotlin-1.3.60") + implementation("org.jetbrains.kotlinx:kotlinx-html-js:0.7.1") + implementation("org.jetbrains:kotlin-react:16.13.0-pre.93-kotlin-1.4-M1") + implementation("org.jetbrains:kotlin-react-dom:16.13.0-pre.93-kotlin-1.4-M1") + implementation(npm("react","16.13.0")) + implementation(npm("react-dom","16.13.0")) + implementation(npm("react-is","16.13.0")) + implementation("org.jetbrains:kotlin-styled:1.0.0-pre.93-kotlin-1.4-M1") implementation(npm("styled-components","5.0.0")) implementation(npm("inline-style-prefixer","5.1.0")) } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle index f7f0c84a94b..dd3a71c0dff 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle @@ -17,7 +17,7 @@ repositories { } dependencies { implementation project(':shared') - implementation 'androidx.core:core-ktx:1.1.0' + implementation 'androidx.core:core-ktx:1.2.0' implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle.kts index cb375affc15..de67ad56f9f 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle.kts @@ -17,7 +17,7 @@ repositories { } dependencies { implementation(project(":shared")) - implementation("androidx.core:core-ktx:1.1.0") + implementation("androidx.core:core-ktx:1.2.0") implementation("androidx.appcompat:appcompat:1.1.0") implementation("androidx.constraintlayout:constraintlayout:1.1.3") implementation(kotlin("stdlib-jdk7")) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle index ad44543745b..76d71bcd54d 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle @@ -41,7 +41,7 @@ kotlin { androidMain { dependencies { implementation kotlin('stdlib-jdk7') - implementation 'androidx.core:core-ktx:1.1.0' + implementation 'androidx.core:core-ktx:1.2.0' } } androidTest { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle.kts index 5000e53a56f..05c4a719830 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle.kts @@ -41,7 +41,7 @@ kotlin { val androidMain by getting { dependencies { implementation(kotlin("stdlib-jdk7")) - implementation("androidx.core:core-ktx:1.1.0") + implementation("androidx.core:core-ktx:1.2.0") } } val androidTest by getting diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle index dd0afceb1e6..1bb2c1ea691 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle @@ -39,7 +39,7 @@ kotlin { androidMain { dependencies { implementation kotlin('stdlib-jdk7') - implementation 'androidx.core:core-ktx:1.1.0' + implementation 'androidx.core:core-ktx:1.2.0' } } androidTest { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts index 1fe6bb0bd4e..ba6c9b1c810 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts @@ -39,7 +39,7 @@ kotlin { val androidMain by getting { dependencies { implementation(kotlin("stdlib-jdk7")) - implementation("androidx.core:core-ktx:1.1.0") + implementation("androidx.core:core-ktx:1.2.0") } } val androidTest by getting diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt index 5fb171f7fdf..44e5cab16aa 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt @@ -14,23 +14,23 @@ object Versions { val KTOR = version("1.2.6") object ANDROID { - val ANDROIDX_CORE_KTX = version("1.1.0") + val ANDROIDX_CORE_KTX = version("1.2.0") val ANDROIDX_APPCOMPAT = version("1.1.0") val ANDROIDX_CONSTRAINTLAYOUT = version("1.1.3") } object KOTLINX { - val KOTLINX_HTML = version("0.6.12") + val KOTLINX_HTML = version("0.7.1") } object JS_WRAPPERS { - val KOTLIN_REACT = version("16.9.0-pre.89-kotlin-1.3.60") + val KOTLIN_REACT = version("16.13.0-pre.93-kotlin-1.4-M1") val KOTLIN_REACT_DOM = KOTLIN_REACT - val KOTLIN_STYLED = KOTLIN_REACT + val KOTLIN_STYLED = version("1.0.0-pre.93-kotlin-1.4-M1") } object NPM { - val REACT = version("16.12.0") + val REACT = version("16.13.0") val REACT_DOM = REACT val REACT_IS = REACT diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt index d9153ff4a67..ecca5b04854 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt @@ -71,7 +71,7 @@ class SimpleJsClientTemplate : Template() { buildList { +ArtifactBasedLibraryDependencyIR( MavenArtifact(DefaultRepository.JCENTER, "org.jetbrains.kotlinx", "kotlinx-html-js"), - Version.fromString("0.6.12"), + Versions.KOTLINX.KOTLINX_HTML, DependencyType.MAIN )