From b0bb03d761535ed4da594b60937404effb8fa3f6 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Wed, 14 Oct 2020 04:32:27 +0300 Subject: [PATCH] Wizard: return junit back to android target --- .../expected/common/build.gradle | 4 +++- .../expected/common/build.gradle.kts | 6 +++++- .../moduleConfigurators/AndroidModuleConfigurator.kt | 5 +++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/common/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/common/build.gradle index 80ee132e68f..26f309f9e13 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/common/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/common/build.gradle @@ -39,7 +39,9 @@ kotlin { } } androidTest { - + dependencies { + implementation 'junit:junit:4.13' + } } desktopMain { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/common/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/common/build.gradle.kts index 6788f15043a..8d1b62e30ea 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/common/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/common/build.gradle.kts @@ -36,7 +36,11 @@ kotlin { api("androidx.core:core-ktx:1.3.1") } } - val androidTest by getting + val androidTest by getting { + dependencies { + implementation("junit:junit:4.13") + } + } val desktopMain by getting val desktopTest by getting } diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt index ea80fba82d7..9a5dbe72bfd 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt @@ -207,6 +207,11 @@ object AndroidTargetConfigurator : TargetConfigurator, buildList { +super.createModuleIRs(reader, configurationData, module) +super.createModuleIRs(reader, configurationData, module) + +ArtifactBasedLibraryDependencyIR( + MavenArtifact(DefaultRepository.MAVEN_CENTRAL, "junit", "junit"), + version = Versions.JUNIT, + dependencyType = DependencyType.TEST + ) } override fun createBuildFileIRs(reader: Reader, configurationData: ModulesToIrConversionData, module: Module): List =