From 3ef12e32eeb1df6b4ee9212bb9b56154033eaefc Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Sat, 10 Oct 2020 16:11:15 +0300 Subject: [PATCH] Wizard: update libraries versions --- .../android/expected/android/build.gradle | 4 ++-- .../android/expected/android/build.gradle.kts | 4 ++-- .../expected/androidApp/build.gradle | 4 ++-- .../expected/androidApp/build.gradle.kts | 4 ++-- .../expected/shared/build.gradle | 4 ++-- .../expected/shared/build.gradle.kts | 4 ++-- .../multiplatformMobileLibrary/expected/build.gradle | 4 ++-- .../multiplatformMobileLibrary/expected/build.gradle.kts | 4 ++-- .../org/jetbrains/kotlin/tools/projectWizard/Versions.kt | 8 ++++---- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle index ffc585187bb..5eb280decf9 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle +++ b/libraries/tools/new-project-wizard/new-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/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle.kts index 5d0446af63d..adf5024583a 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-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/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle index 6c85a99f4a3..443cf72dbea 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle +++ b/libraries/tools/new-project-wizard/new-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/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle.kts index 4261a5949c0..cf5bcacc2fc 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/androidApp/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-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/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle index 35348d20d8b..ec2641f223a 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle +++ b/libraries/tools/new-project-wizard/new-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/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle.kts index 898520c7891..92c36b08c85 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-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/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle index 2b22e23be44..9d1b6b5a587 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle +++ b/libraries/tools/new-project-wizard/new-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/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts index 2b7a1e8f4c6..6d678245488 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-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/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 f848ab013ef..d40d30f43c7 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 @@ -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 {