azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Wizard] Update versions in wizard

Browse Source
This commit is contained in:
Ilya Goncharov
2020-09-10 15:03:54 +03:00
parent 38854ce40b
commit 2c4c8cdf01
6 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle
Vendored
+5 -5
View File
@@ -64,9 +64,9 @@ kotlin {
} }
jvmMain { jvmMain {
dependencies { dependencies {
implementation 'io.ktor:ktor-server-netty:1.3.2-KOTLIN_VERSION' implementation 'io.ktor:ktor-server-netty:1.4.0'
implementation 'io.ktor:ktor-html-builder:1.3.2-KOTLIN_VERSION' implementation 'io.ktor:ktor-html-builder:1.4.0'
implementation 'org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.1-KOTLIN_VERSION' implementation 'org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.2'
} }
} }
jvmTest { jvmTest {
@@ -76,8 +76,8 @@ kotlin {
} }
jsMain { jsMain {
dependencies { dependencies {
implementation 'org.jetbrains:kotlin-react:16.13.1-pre.110-kotlin-KOTLIN_VERSION' implementation 'org.jetbrains:kotlin-react:16.13.1-pre.113-kotlin-1.4.0'
implementation 'org.jetbrains:kotlin-react-dom:16.13.1-pre.110-kotlin-KOTLIN_VERSION' implementation 'org.jetbrains:kotlin-react-dom:16.13.1-pre.113-kotlin-1.4.0'
} }
} }
jsTest { jsTest {
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts
Vendored
+5 -5
View File
@@ -62,9 +62,9 @@ kotlin {
} }
val jvmMain by getting { val jvmMain by getting {
dependencies { dependencies {
implementation("io.ktor:ktor-server-netty:1.3.2-KOTLIN_VERSION") implementation("io.ktor:ktor-server-netty:1.4.0")
implementation("io.ktor:ktor-html-builder:1.3.2-KOTLIN_VERSION") implementation("io.ktor:ktor-html-builder:1.4.0")
implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.1-KOTLIN_VERSION") implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.2")
} }
} }
val jvmTest by getting { val jvmTest by getting {
@@ -74,8 +74,8 @@ kotlin {
} }
val jsMain by getting { val jsMain by getting {
dependencies { dependencies {
implementation("org.jetbrains:kotlin-react:16.13.1-pre.110-kotlin-KOTLIN_VERSION") implementation("org.jetbrains:kotlin-react:16.13.1-pre.113-kotlin-1.4.0")
implementation("org.jetbrains:kotlin-react-dom:16.13.1-pre.110-kotlin-KOTLIN_VERSION") implementation("org.jetbrains:kotlin-react-dom:16.13.1-pre.113-kotlin-1.4.0")
} }
} }
val jsTest by getting { val jsTest by getting {
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt
+11 -11
View File
@@ -9,9 +9,9 @@ import org.jetbrains.kotlin.tools.projectWizard.settings.version.Version
@Suppress("ClassName", "SpellCheckingInspection") @Suppress("ClassName", "SpellCheckingInspection")
object Versions { object Versions {
val KOTLIN = version("1.4.0-rc") // used as fallback version val KOTLIN = version("1.4.10") // used as fallback version
val GRADLE = version("6.3") val GRADLE = version("6.3")
val KTOR: (kotlinVersion: Version) -> Version = { kotlinVersion -> version("1.3.2-$kotlinVersion") } val KTOR = version("1.4.0")
val JUNIT = version("4.12") val JUNIT = version("4.12")
val JUNIT5 = version("5.6.0") val JUNIT5 = version("5.6.0")
@@ -22,20 +22,20 @@ object Versions {
} }
object KOTLINX { object KOTLINX {
val KOTLINX_HTML: (kotlinVersion: Version) -> Version = { kotlinVersion -> version("0.7.1-$kotlinVersion") } val KOTLINX_HTML = version("0.7.2")
val KOTLINX_NODEJS: Version = version("0.0.4") val KOTLINX_NODEJS: Version = version("0.0.7")
} }
object JS_WRAPPERS { object JS_WRAPPERS {
val KOTLIN_REACT: (kotlinVersion: Version) -> Version = wrapperVersion("16.13.1") val KOTLIN_REACT = wrapperVersion("16.13.1")
val KOTLIN_REACT_DOM = KOTLIN_REACT val KOTLIN_REACT_DOM = KOTLIN_REACT
val KOTLIN_STYLED: (kotlinVersion: Version) -> Version = wrapperVersion("1.0.0") val KOTLIN_STYLED = wrapperVersion("1.0.0")
val KOTLIN_REACT_ROUTER_DOM: (kotlinVersion: Version) -> Version = wrapperVersion("5.1.2") val KOTLIN_REACT_ROUTER_DOM = wrapperVersion("5.1.2")
val KOTLIN_REDUX: (kotlinVersion: Version) -> Version = wrapperVersion("4.0.0") val KOTLIN_REDUX = wrapperVersion("4.0.0")
val KOTLIN_REACT_REDUX: (kotlinVersion: Version) -> Version = wrapperVersion("5.0.7") val KOTLIN_REACT_REDUX = wrapperVersion("5.0.7")
private fun wrapperVersion(version: String): (Version) -> Version = private fun wrapperVersion(version: String): Version =
{ kotlinVersion -> version("$version-pre.110-kotlin-$kotlinVersion") } version("$version-pre.113-kotlin-1.4.0")
} }
object GRADLE_PLUGINS { object GRADLE_PLUGINS {
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/KtorServerTemplate.kt
+2 -2
View File
@@ -47,7 +47,7 @@ class KtorServerTemplate : Template() {
+ktorArtifactDependency("ktor-html-builder", kotlinVersion) +ktorArtifactDependency("ktor-html-builder", kotlinVersion)
+ArtifactBasedLibraryDependencyIR( +ArtifactBasedLibraryDependencyIR(
MavenArtifact(Repositories.KOTLINX, "org.jetbrains.kotlinx", "kotlinx-html-jvm"), MavenArtifact(Repositories.KOTLINX, "org.jetbrains.kotlinx", "kotlinx-html-jvm"),
Versions.KOTLINX.KOTLINX_HTML(KotlinPlugin.version.propertyValue.version), Versions.KOTLINX.KOTLINX_HTML,
DependencyType.MAIN DependencyType.MAIN
) )
} }
@@ -85,7 +85,7 @@ class KtorServerTemplate : Template() {
private fun ktorArtifactDependency(@NonNls name: String, kotlinVersion: Version) = ArtifactBasedLibraryDependencyIR( private fun ktorArtifactDependency(@NonNls name: String, kotlinVersion: Version) = ArtifactBasedLibraryDependencyIR(
MavenArtifact(Repositories.KTOR_BINTRAY, "io.ktor", name), MavenArtifact(Repositories.KTOR_BINTRAY, "io.ktor", name),
Versions.KTOR(kotlinVersion), Versions.KTOR,
DependencyType.MAIN DependencyType.MAIN
) )
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/ReactJsClientTemplate.kt
+8 -9
View File
@@ -67,17 +67,17 @@ class ReactJsClientTemplate : JsClientTemplate() {
override fun Writer.getRequiredLibraries(module: ModuleIR): List<DependencyIR> = withSettingsOf(module.originalModule) { override fun Writer.getRequiredLibraries(module: ModuleIR): List<DependencyIR> = withSettingsOf(module.originalModule) {
buildList { buildList {
val kotlinVersion = KotlinPlugin.version.propertyValue val kotlinVersion = KotlinPlugin.version.propertyValue
+Dependencies.KOTLIN_REACT(kotlinVersion.version) +Dependencies.KOTLIN_REACT
+Dependencies.KOTLIN_REACT_DOM(kotlinVersion.version) +Dependencies.KOTLIN_REACT_DOM
if (useStyledComponents.reference.settingValue) { if (useStyledComponents.reference.settingValue) {
+Dependencies.KOTLIN_STYLED(kotlinVersion.version) +Dependencies.KOTLIN_STYLED
} }
if (useReactRouterDom.reference.settingValue) { if (useReactRouterDom.reference.settingValue) {
+Dependencies.KOTLIN_REACT_ROUTER_DOM(kotlinVersion.version) +Dependencies.KOTLIN_REACT_ROUTER_DOM
} }
if (useReactRedux.reference.settingValue) { if (useReactRedux.reference.settingValue) {
+Dependencies.KOTLIN_REDUX(kotlinVersion.version) +Dependencies.KOTLIN_REDUX
+Dependencies.KOTLIN_REACT_REDUX(kotlinVersion.version) +Dependencies.KOTLIN_REACT_REDUX
} }
} }
} }
@@ -133,12 +133,11 @@ class ReactJsClientTemplate : JsClientTemplate() {
Versions.JS_WRAPPERS.KOTLIN_REACT_REDUX Versions.JS_WRAPPERS.KOTLIN_REACT_REDUX
) )
private fun wrapperDependency(artifact: String, version: (Version) -> Version) = { kotlinVersion: Version -> private fun wrapperDependency(artifact: String, version: Version) =
ArtifactBasedLibraryDependencyIR( ArtifactBasedLibraryDependencyIR(
MavenArtifact(Repositories.KOTLIN_JS_WRAPPERS_BINTRAY, "org.jetbrains", artifact), MavenArtifact(Repositories.KOTLIN_JS_WRAPPERS_BINTRAY, "org.jetbrains", artifact),
version(kotlinVersion), version,
DependencyType.MAIN DependencyType.MAIN
) )
}
} }
} }
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt
+1 -1
View File
@@ -46,7 +46,7 @@ class SimpleJsClientTemplate : JsClientTemplate() {
if (useKotlinxHtml.reference.settingValue()) { if (useKotlinxHtml.reference.settingValue()) {
+ArtifactBasedLibraryDependencyIR( +ArtifactBasedLibraryDependencyIR(
MavenArtifact(Repositories.KOTLINX, "org.jetbrains.kotlinx", "kotlinx-html"), MavenArtifact(Repositories.KOTLINX, "org.jetbrains.kotlinx", "kotlinx-html"),
Versions.KOTLINX.KOTLINX_HTML(KotlinPlugin.version.propertyValue.version), Versions.KOTLINX.KOTLINX_HTML,
DependencyType.MAIN DependencyType.MAIN
) )
} }