jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-04-13 15:52:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wizard: update libraries versions

Browse Source 
#KT-38124 fixed
This commit is contained in:
Ilya Kirillov
2020-04-10 13:03:17 +03:00
parent 7c011c48dd
commit aa3cdc09fc
14 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle vendored
View File

@@ -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'

2
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle.kts vendored
View File

@@ -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"))

14
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle vendored
View File

@@ -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')
}

14
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts vendored
View File

@@ -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"))
}

16
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle vendored
View File

@@ -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')
}

16
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts vendored
View File

@@ -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"))
}

2
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle vendored
View File

@@ -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'

2
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle.kts vendored
View File

@@ -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"))

2
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle vendored
View File

@@ -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 {

2
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle.kts vendored
View File

@@ -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

2
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle vendored
View File

@@ -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 {

2
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts vendored
View File

@@ -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

10
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt
View File

@@ -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

2
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt
View File

@@ -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
)