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 ef62c5ae05b..dc4a3e10ebd 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.7.1' - implementation 'org.jetbrains:kotlin-react:16.13.0-pre.93-kotlin-KOTLIN_VERSION' - implementation 'org.jetbrains:kotlin-react-dom:16.13.0-pre.93-kotlin-KOTLIN_VERSION' - 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-KOTLIN_VERSION' + implementation 'org.jetbrains.kotlinx:kotlinx-html-js:0.7.1-KOTLIN_VERSION' + implementation 'org.jetbrains:kotlin-react:16.13.1-pre.109-kotlin-KOTLIN_VERSION' + implementation 'org.jetbrains:kotlin-react-dom:16.13.1-pre.109-kotlin-KOTLIN_VERSION' + implementation npm('react','16.13.1') + implementation npm('react-dom','16.13.1') + implementation npm('react-is','16.13.1') + implementation 'org.jetbrains:kotlin-styled:1.0.0-pre.109-kotlin-KOTLIN_VERSION' 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 b5de3d906ec..822f74c2a9d 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.7.1") - implementation("org.jetbrains:kotlin-react:16.13.0-pre.93-kotlin-KOTLIN_VERSION") - implementation("org.jetbrains:kotlin-react-dom:16.13.0-pre.93-kotlin-KOTLIN_VERSION") - 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-KOTLIN_VERSION") + implementation("org.jetbrains.kotlinx:kotlinx-html-js:0.7.1-KOTLIN_VERSION") + implementation("org.jetbrains:kotlin-react:16.13.1-pre.109-kotlin-KOTLIN_VERSION") + implementation("org.jetbrains:kotlin-react-dom:16.13.1-pre.109-kotlin-KOTLIN_VERSION") + implementation(npm("react","16.13.1")) + implementation(npm("react-dom","16.13.1")) + implementation(npm("react-is","16.13.1")) + implementation("org.jetbrains:kotlin-styled:1.0.0-pre.109-kotlin-KOTLIN_VERSION") 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 ea47476aec6..05e58dd2d85 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 @@ -61,7 +61,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.7.1' + implementation 'org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.1-KOTLIN_VERSION' } } jvmTest { @@ -72,13 +72,13 @@ kotlin { jsMain { dependencies { implementation kotlin('stdlib-js') - implementation 'org.jetbrains.kotlinx:kotlinx-html-js:0.7.1' - implementation 'org.jetbrains:kotlin-react:16.13.0-pre.93-kotlin-KOTLIN_VERSION' - implementation 'org.jetbrains:kotlin-react-dom:16.13.0-pre.93-kotlin-KOTLIN_VERSION' - 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-KOTLIN_VERSION' + implementation 'org.jetbrains.kotlinx:kotlinx-html-js:0.7.1-KOTLIN_VERSION' + implementation 'org.jetbrains:kotlin-react:16.13.1-pre.109-kotlin-KOTLIN_VERSION' + implementation 'org.jetbrains:kotlin-react-dom:16.13.1-pre.109-kotlin-KOTLIN_VERSION' + implementation npm('react','16.13.1') + implementation npm('react-dom','16.13.1') + implementation npm('react-is','16.13.1') + implementation 'org.jetbrains:kotlin-styled:1.0.0-pre.109-kotlin-KOTLIN_VERSION' 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 266acd1c8b6..9a3cfa583e2 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 @@ -61,7 +61,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.7.1") + implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.1-KOTLIN_VERSION") } } val jvmTest by getting { @@ -72,13 +72,13 @@ kotlin { val jsMain by getting { dependencies { implementation(kotlin("stdlib-js")) - implementation("org.jetbrains.kotlinx:kotlinx-html-js:0.7.1") - implementation("org.jetbrains:kotlin-react:16.13.0-pre.93-kotlin-KOTLIN_VERSION") - implementation("org.jetbrains:kotlin-react-dom:16.13.0-pre.93-kotlin-KOTLIN_VERSION") - 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-KOTLIN_VERSION") + implementation("org.jetbrains.kotlinx:kotlinx-html-js:0.7.1-KOTLIN_VERSION") + implementation("org.jetbrains:kotlin-react:16.13.1-pre.109-kotlin-KOTLIN_VERSION") + implementation("org.jetbrains:kotlin-react-dom:16.13.1-pre.109-kotlin-KOTLIN_VERSION") + implementation(npm("react","16.13.1")) + implementation(npm("react-dom","16.13.1")) + implementation(npm("react-is","16.13.1")) + implementation("org.jetbrains:kotlin-styled:1.0.0-pre.109-kotlin-KOTLIN_VERSION") implementation(npm("styled-components","5.0.0")) implementation(npm("inline-style-prefixer","5.1.0")) } 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 c2a33127e88..c95cbaf71d0 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 @@ -20,17 +20,17 @@ object Versions { } object KOTLINX { - val KOTLINX_HTML = version("0.7.1") + val KOTLINX_HTML: (kotlinVersion: Version) -> Version = { kotlinVersion -> version("0.7.1-$kotlinVersion") } } object JS_WRAPPERS { - val KOTLIN_REACT: (kotlinVersion: Version) -> Version = { kotlinVersion -> version("16.13.0-pre.93-kotlin-$kotlinVersion") } + val KOTLIN_REACT: (kotlinVersion: Version) -> Version = { kotlinVersion -> version("16.13.1-pre.109-kotlin-$kotlinVersion") } val KOTLIN_REACT_DOM = KOTLIN_REACT - val KOTLIN_STYLED: (kotlinVersion: Version) -> Version = { kotlinVersion -> version("1.0.0-pre.93-kotlin-$kotlinVersion") } + val KOTLIN_STYLED: (kotlinVersion: Version) -> Version = { kotlinVersion -> version("1.0.0-pre.109-kotlin-$kotlinVersion") } } object NPM { - val REACT = version("16.13.0") + val REACT = version("16.13.1") val REACT_DOM = REACT val REACT_IS = REACT diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/KtorServerTemplate.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/KtorServerTemplate.kt index f7e4d4994d3..5e2dc444bf5 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/KtorServerTemplate.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/KtorServerTemplate.kt @@ -27,6 +27,7 @@ import org.jetbrains.kotlin.tools.projectWizard.Versions import org.jetbrains.kotlin.tools.projectWizard.WizardGradleRunConfiguration import org.jetbrains.kotlin.tools.projectWizard.WizardRunConfiguration import org.jetbrains.kotlin.tools.projectWizard.core.Reader +import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.KotlinPlugin import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.ModuleKind class KtorServerTemplate : Template() { @@ -44,7 +45,7 @@ class KtorServerTemplate : Template() { +ktorArtifactDependency("ktor-html-builder") +ArtifactBasedLibraryDependencyIR( MavenArtifact(DefaultRepository.JCENTER, "org.jetbrains.kotlinx", "kotlinx-html-jvm"), - Versions.KOTLINX.KOTLINX_HTML, + Versions.KOTLINX.KOTLINX_HTML(KotlinPlugin::version.propertyValue.version), DependencyType.MAIN ) } 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 945e451514a..9f916799e8b 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 @@ -72,7 +72,7 @@ class SimpleJsClientTemplate : Template() { buildList { +ArtifactBasedLibraryDependencyIR( MavenArtifact(DefaultRepository.JCENTER, "org.jetbrains.kotlinx", "kotlinx-html-js"), - Versions.KOTLINX.KOTLINX_HTML, + Versions.KOTLINX.KOTLINX_HTML(KotlinPlugin::version.propertyValue.version), DependencyType.MAIN )