summaryrefslogtreecommitdiff
path: root/project-wizard
diff options
context:
space:
mode:
authorIlya Kirillov <ilya.kirillov@jetbrains.com>2020-10-10 16:11:15 +0300
committerkotlin-ide-monorepo-bot <kotlin-ide-monorepo-bot-no-reply@jetbrains.com>2020-10-19 11:29:00 +0000
commit7c47434904e768d6acad325797fc613ac2cc3a68 (patch)
treeab4b10c31278bd3f5bbbc2c0cdc6d038d0a90aed /project-wizard
parentddb29b3755b9dffaab8c962ba380036b0afc5c46 (diff)
downloadintellij-kotlin-7c47434904e768d6acad325797fc613ac2cc3a68.tar.gz
Wizard: update libraries versions
Original commit: 3ef12e32eeb1df6b4ee9212bb9b56154033eaefc GitOrigin-RevId: 97d23c0ca3e0a3ce8e7965a35290a966a0210075
Diffstat (limited to 'project-wizard')
-rw-r--r--project-wizard/cli/testData/buildFileGeneration/android/expected/android/build.gradle4
-rw-r--r--project-wizard/cli/testData/buildFileGeneration/android/expected/android/build.gradle.kts4
-rw-r--r--project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle4
-rw-r--r--project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle.kts4
-rw-r--r--project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle4
-rw-r--r--project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle.kts4
-rw-r--r--project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle4
-rw-r--r--project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts4
-rw-r--r--project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt8
9 files changed, 20 insertions, 20 deletions
diff --git a/project-wizard/cli/testData/buildFileGeneration/android/expected/android/build.gradle b/project-wizard/cli/testData/buildFileGeneration/android/expected/android/build.gradle
index 70640cfd9add..0339982a2630 100644
--- a/project-wizard/cli/testData/buildFileGeneration/android/expected/android/build.gradle
+++ b/project-wizard/cli/testData/buildFileGeneration/android/expected/android/build.gradle
@@ -8,9 +8,9 @@ group = 'testGroupId'
version = '1.0-SNAPSHOT'
dependencies {
- implementation 'com.google.android.material:material:1.2.0'
+ implementation 'com.google.android.material:material:1.2.1'
implementation 'androidx.appcompat:appcompat:1.2.0'
- implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+ implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
}
android {
diff --git a/project-wizard/cli/testData/buildFileGeneration/android/expected/android/build.gradle.kts b/project-wizard/cli/testData/buildFileGeneration/android/expected/android/build.gradle.kts
index 50569f972d65..a29a369011de 100644
--- a/project-wizard/cli/testData/buildFileGeneration/android/expected/android/build.gradle.kts
+++ b/project-wizard/cli/testData/buildFileGeneration/android/expected/android/build.gradle.kts
@@ -8,9 +8,9 @@ group = "testGroupId"
version = "1.0-SNAPSHOT"
dependencies {
- implementation("com.google.android.material:material:1.2.0")
+ implementation("com.google.android.material:material:1.2.1")
implementation("androidx.appcompat:appcompat:1.2.0")
- implementation("androidx.constraintlayout:constraintlayout:1.1.3")
+ implementation("androidx.constraintlayout:constraintlayout:2.0.2")
}
android {
diff --git a/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle b/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle
index 1d325b6486b5..51fb96128d0e 100644
--- a/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle
+++ b/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle
@@ -9,9 +9,9 @@ version = '1.0-SNAPSHOT'
dependencies {
implementation project(':shared')
- implementation 'com.google.android.material:material:1.2.0'
+ implementation 'com.google.android.material:material:1.2.1'
implementation 'androidx.appcompat:appcompat:1.2.0'
- implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+ implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
}
android {
diff --git a/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle.kts b/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle.kts
index 6780eb4ed2ca..04732a800642 100644
--- a/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle.kts
+++ b/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle.kts
@@ -9,9 +9,9 @@ version = "1.0-SNAPSHOT"
dependencies {
implementation(project(":shared"))
- implementation("com.google.android.material:material:1.2.0")
+ implementation("com.google.android.material:material:1.2.1")
implementation("androidx.appcompat:appcompat:1.2.0")
- implementation("androidx.constraintlayout:constraintlayout:1.1.3")
+ implementation("androidx.constraintlayout:constraintlayout:2.0.2")
}
android {
diff --git a/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle b/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle
index 35348d20d8b8..ec2641f223aa 100644
--- a/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle
+++ b/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle
@@ -30,13 +30,13 @@ kotlin {
}
androidMain {
dependencies {
- implementation 'com.google.android.material:material:1.2.0'
+ implementation 'com.google.android.material:material:1.2.1'
}
}
androidTest {
dependencies {
implementation kotlin('test-junit')
- implementation 'junit:junit:4.12'
+ implementation 'junit:junit:4.13'
}
}
iosMain {
diff --git a/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle.kts b/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle.kts
index 898520c78913..92c36b08c855 100644
--- a/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle.kts
+++ b/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle.kts
@@ -28,13 +28,13 @@ kotlin {
}
val androidMain by getting {
dependencies {
- implementation("com.google.android.material:material:1.2.0")
+ implementation("com.google.android.material:material:1.2.1")
}
}
val androidTest by getting {
dependencies {
implementation(kotlin("test-junit"))
- implementation("junit:junit:4.12")
+ implementation("junit:junit:4.13")
}
}
val iosMain by getting
diff --git a/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle b/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle
index 2b22e23be448..9d1b6b5a5878 100644
--- a/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle
+++ b/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle
@@ -36,13 +36,13 @@ kotlin {
}
androidMain {
dependencies {
- implementation 'com.google.android.material:material:1.2.0'
+ implementation 'com.google.android.material:material:1.2.1'
}
}
androidTest {
dependencies {
implementation kotlin('test-junit')
- implementation 'junit:junit:4.12'
+ implementation 'junit:junit:4.13'
}
}
iosMain {
diff --git a/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts b/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts
index 2b7a1e8f4c6e..6d6782454889 100644
--- a/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts
+++ b/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts
@@ -34,13 +34,13 @@ kotlin {
}
val androidMain by getting {
dependencies {
- implementation("com.google.android.material:material:1.2.0")
+ implementation("com.google.android.material:material:1.2.1")
}
}
val androidTest by getting {
dependencies {
implementation(kotlin("test-junit"))
- implementation("junit:junit:4.12")
+ implementation("junit:junit:4.13")
}
}
val iosMain by getting
diff --git a/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt b/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt
index f848ab013ef0..d40d30f43c7d 100644
--- a/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt
+++ b/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt
@@ -10,15 +10,15 @@ import org.jetbrains.kotlin.tools.projectWizard.settings.version.Version
@Suppress("ClassName", "SpellCheckingInspection")
object Versions {
val KOTLIN = version("1.4.10") // used as fallback version
- val GRADLE = version("6.3")
+ val GRADLE = version("6.6.1")
val KTOR = version("1.4.0")
- val JUNIT = version("4.12")
+ val JUNIT = version("4.13")
val JUNIT5 = version("5.6.0")
object ANDROID {
- val ANDROID_MATERIAL = version("1.2.0")
+ val ANDROID_MATERIAL = version("1.2.1")
val ANDROIDX_APPCOMPAT = version("1.2.0")
- val ANDROIDX_CONSTRAINTLAYOUT = version("1.1.3")
+ val ANDROIDX_CONSTRAINTLAYOUT = version("2.0.2")
}
object KOTLINX {