diff options
| author | Ilya Kirillov <ilya.kirillov@jetbrains.com> | 2020-10-14 04:32:27 +0300 |
|---|---|---|
| committer | kotlin-ide-monorepo-bot <kotlin-ide-monorepo-bot-no-reply@jetbrains.com> | 2020-10-19 11:29:01 +0000 |
| commit | 7044dbd9c4f98daa9f90272912352ebf21e2818a (patch) | |
| tree | 4b8023d87df72185995ea77cc9d8ec641bc8cb86 /project-wizard | |
| parent | b598e90e0be49c16539aa84173aee6f147aff315 (diff) | |
| download | intellij-kotlin-7044dbd9c4f98daa9f90272912352ebf21e2818a.tar.gz | |
Wizard: return junit back to android target
Original commit: b0bb03d761535ed4da594b60937404effb8fa3f6
GitOrigin-RevId: 25d9c6390de834088871ff7b956f5edaa8248412
Diffstat (limited to 'project-wizard')
3 files changed, 13 insertions, 2 deletions
diff --git a/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/common/build.gradle b/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/common/build.gradle index 80ee132e68fb..26f309f9e13f 100644 --- a/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/common/build.gradle +++ b/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/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/common/build.gradle.kts b/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/common/build.gradle.kts index 6788f15043a4..8d1b62e30ea5 100644 --- a/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/common/build.gradle.kts +++ b/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/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt b/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt index 0c172837516c..c27b58ab7bac 100644 --- a/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt +++ b/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt @@ -207,6 +207,11 @@ object AndroidTargetConfigurator : TargetConfigurator, buildList { +super<ModuleConfiguratorWithTests>.createModuleIRs(reader, configurationData, module) +super<AndroidModuleConfigurator>.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<BuildSystemIR> = |