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

Wizard: update versions of used libraries for 1.4-M3

Browse Source 
#KT-39503 fixed
#KT-39503 fixed
This commit is contained in:
Ilya Kirillov
2020-06-25 10:52:39 +03:00
parent 35d5936829
commit 366a75e222
7 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle
Vendored
+7 -7
View File
@@ -17,13 +17,13 @@ repositories {
dependencies { dependencies {
testImplementation 'org.jetbrains.kotlin:kotlin-test-js' testImplementation 'org.jetbrains.kotlin:kotlin-test-js'
implementation 'org.jetbrains.kotlin:kotlin-stdlib-js' implementation 'org.jetbrains.kotlin:kotlin-stdlib-js'
implementation 'org.jetbrains.kotlinx:kotlinx-html-js:0.7.1' implementation 'org.jetbrains.kotlinx:kotlinx-html-js:0.7.1-KOTLIN_VERSION'
implementation 'org.jetbrains:kotlin-react:16.13.0-pre.93-kotlin-KOTLIN_VERSION' implementation 'org.jetbrains:kotlin-react:16.13.1-pre.109-kotlin-KOTLIN_VERSION'
implementation 'org.jetbrains:kotlin-react-dom:16.13.0-pre.93-kotlin-KOTLIN_VERSION' implementation 'org.jetbrains:kotlin-react-dom:16.13.1-pre.109-kotlin-KOTLIN_VERSION'
implementation npm('react','16.13.0') implementation npm('react','16.13.1')
implementation npm('react-dom','16.13.0') implementation npm('react-dom','16.13.1')
implementation npm('react-is','16.13.0') implementation npm('react-is','16.13.1')
implementation 'org.jetbrains:kotlin-styled:1.0.0-pre.93-kotlin-KOTLIN_VERSION' implementation 'org.jetbrains:kotlin-styled:1.0.0-pre.109-kotlin-KOTLIN_VERSION'
implementation npm('styled-components','5.0.0') implementation npm('styled-components','5.0.0')
implementation npm('inline-style-prefixer','5.1.0') implementation npm('inline-style-prefixer','5.1.0')
} }
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts
Vendored
+7 -7
View File
@@ -17,13 +17,13 @@ repositories {
dependencies { dependencies {
testImplementation(kotlin("test-js")) testImplementation(kotlin("test-js"))
implementation(kotlin("stdlib-js")) implementation(kotlin("stdlib-js"))
implementation("org.jetbrains.kotlinx:kotlinx-html-js:0.7.1") implementation("org.jetbrains.kotlinx:kotlinx-html-js:0.7.1-KOTLIN_VERSION")
implementation("org.jetbrains:kotlin-react:16.13.0-pre.93-kotlin-KOTLIN_VERSION") implementation("org.jetbrains:kotlin-react:16.13.1-pre.109-kotlin-KOTLIN_VERSION")
implementation("org.jetbrains:kotlin-react-dom:16.13.0-pre.93-kotlin-KOTLIN_VERSION") implementation("org.jetbrains:kotlin-react-dom:16.13.1-pre.109-kotlin-KOTLIN_VERSION")
implementation(npm("react","16.13.0")) implementation(npm("react","16.13.1"))
implementation(npm("react-dom","16.13.0")) implementation(npm("react-dom","16.13.1"))
implementation(npm("react-is","16.13.0")) implementation(npm("react-is","16.13.1"))
implementation("org.jetbrains:kotlin-styled:1.0.0-pre.93-kotlin-KOTLIN_VERSION") implementation("org.jetbrains:kotlin-styled:1.0.0-pre.109-kotlin-KOTLIN_VERSION")
implementation(npm("styled-components","5.0.0")) implementation(npm("styled-components","5.0.0"))
implementation(npm("inline-style-prefixer","5.1.0")) implementation(npm("inline-style-prefixer","5.1.0"))
} }
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle
Vendored
+8 -8
View File
@@ -61,7 +61,7 @@ kotlin {
implementation kotlin('stdlib-jdk8') implementation kotlin('stdlib-jdk8')
implementation 'io.ktor:ktor-server-netty:1.2.6' implementation 'io.ktor:ktor-server-netty:1.2.6'
implementation 'io.ktor:ktor-html-builder: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 { jvmTest {
@@ -72,13 +72,13 @@ kotlin {
jsMain { jsMain {
dependencies { dependencies {
implementation kotlin('stdlib-js') implementation kotlin('stdlib-js')
implementation 'org.jetbrains.kotlinx:kotlinx-html-js:0.7.1' implementation 'org.jetbrains.kotlinx:kotlinx-html-js:0.7.1-KOTLIN_VERSION'
implementation 'org.jetbrains:kotlin-react:16.13.0-pre.93-kotlin-KOTLIN_VERSION' implementation 'org.jetbrains:kotlin-react:16.13.1-pre.109-kotlin-KOTLIN_VERSION'
implementation 'org.jetbrains:kotlin-react-dom:16.13.0-pre.93-kotlin-KOTLIN_VERSION' implementation 'org.jetbrains:kotlin-react-dom:16.13.1-pre.109-kotlin-KOTLIN_VERSION'
implementation npm('react','16.13.0') implementation npm('react','16.13.1')
implementation npm('react-dom','16.13.0') implementation npm('react-dom','16.13.1')
implementation npm('react-is','16.13.0') implementation npm('react-is','16.13.1')
implementation 'org.jetbrains:kotlin-styled:1.0.0-pre.93-kotlin-KOTLIN_VERSION' implementation 'org.jetbrains:kotlin-styled:1.0.0-pre.109-kotlin-KOTLIN_VERSION'
implementation npm('styled-components','5.0.0') implementation npm('styled-components','5.0.0')
implementation npm('inline-style-prefixer','5.1.0') implementation npm('inline-style-prefixer','5.1.0')
} }
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts
Vendored
+8 -8
View File
@@ -61,7 +61,7 @@ kotlin {
implementation(kotlin("stdlib-jdk8")) implementation(kotlin("stdlib-jdk8"))
implementation("io.ktor:ktor-server-netty:1.2.6") implementation("io.ktor:ktor-server-netty:1.2.6")
implementation("io.ktor:ktor-html-builder: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 { val jvmTest by getting {
@@ -72,13 +72,13 @@ kotlin {
val jsMain by getting { val jsMain by getting {
dependencies { dependencies {
implementation(kotlin("stdlib-js")) implementation(kotlin("stdlib-js"))
implementation("org.jetbrains.kotlinx:kotlinx-html-js:0.7.1") implementation("org.jetbrains.kotlinx:kotlinx-html-js:0.7.1-KOTLIN_VERSION")
implementation("org.jetbrains:kotlin-react:16.13.0-pre.93-kotlin-KOTLIN_VERSION") implementation("org.jetbrains:kotlin-react:16.13.1-pre.109-kotlin-KOTLIN_VERSION")
implementation("org.jetbrains:kotlin-react-dom:16.13.0-pre.93-kotlin-KOTLIN_VERSION") implementation("org.jetbrains:kotlin-react-dom:16.13.1-pre.109-kotlin-KOTLIN_VERSION")
implementation(npm("react","16.13.0")) implementation(npm("react","16.13.1"))
implementation(npm("react-dom","16.13.0")) implementation(npm("react-dom","16.13.1"))
implementation(npm("react-is","16.13.0")) implementation(npm("react-is","16.13.1"))
implementation("org.jetbrains:kotlin-styled:1.0.0-pre.93-kotlin-KOTLIN_VERSION") implementation("org.jetbrains:kotlin-styled:1.0.0-pre.109-kotlin-KOTLIN_VERSION")
implementation(npm("styled-components","5.0.0")) implementation(npm("styled-components","5.0.0"))
implementation(npm("inline-style-prefixer","5.1.0")) implementation(npm("inline-style-prefixer","5.1.0"))
} }
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt
+4 -4
View File
@@ -20,17 +20,17 @@ object Versions {
} }
object KOTLINX { object KOTLINX {
val KOTLINX_HTML = version("0.7.1") val KOTLINX_HTML: (kotlinVersion: Version) -> Version = { kotlinVersion -> version("0.7.1-$kotlinVersion") }
} }
object JS_WRAPPERS { 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_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 { object NPM {
val REACT = version("16.13.0") val REACT = version("16.13.1")
val REACT_DOM = REACT val REACT_DOM = REACT
val REACT_IS = REACT val REACT_IS = REACT
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/KtorServerTemplate.kt
+2 -1
View File
@@ -27,6 +27,7 @@ import org.jetbrains.kotlin.tools.projectWizard.Versions
import org.jetbrains.kotlin.tools.projectWizard.WizardGradleRunConfiguration import org.jetbrains.kotlin.tools.projectWizard.WizardGradleRunConfiguration
import org.jetbrains.kotlin.tools.projectWizard.WizardRunConfiguration import org.jetbrains.kotlin.tools.projectWizard.WizardRunConfiguration
import org.jetbrains.kotlin.tools.projectWizard.core.Reader 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 import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.ModuleKind
class KtorServerTemplate : Template() { class KtorServerTemplate : Template() {
@@ -44,7 +45,7 @@ class KtorServerTemplate : Template() {
+ktorArtifactDependency("ktor-html-builder") +ktorArtifactDependency("ktor-html-builder")
+ArtifactBasedLibraryDependencyIR( +ArtifactBasedLibraryDependencyIR(
MavenArtifact(DefaultRepository.JCENTER, "org.jetbrains.kotlinx", "kotlinx-html-jvm"), MavenArtifact(DefaultRepository.JCENTER, "org.jetbrains.kotlinx", "kotlinx-html-jvm"),
Versions.KOTLINX.KOTLINX_HTML, Versions.KOTLINX.KOTLINX_HTML(KotlinPlugin::version.propertyValue.version),
DependencyType.MAIN DependencyType.MAIN
) )
} }
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt
+1 -1
View File
@@ -72,7 +72,7 @@ class SimpleJsClientTemplate : Template() {
buildList { buildList {
+ArtifactBasedLibraryDependencyIR( +ArtifactBasedLibraryDependencyIR(
MavenArtifact(DefaultRepository.JCENTER, "org.jetbrains.kotlinx", "kotlinx-html-js"), MavenArtifact(DefaultRepository.JCENTER, "org.jetbrains.kotlinx", "kotlinx-html-js"),
Versions.KOTLINX.KOTLINX_HTML, Versions.KOTLINX.KOTLINX_HTML(KotlinPlugin::version.propertyValue.version),
DependencyType.MAIN DependencyType.MAIN
) )