azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wizard: add missing test dependency

Browse Source
This commit is contained in:
Kirill Shmakov
2020-08-20 14:48:50 +03:00
parent e7f22bcfbc
commit 62be688eb7
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt
+6 -1
View File
@@ -139,6 +139,7 @@ object AndroidTargetConfigurator : TargetConfigurator,
SimpleTargetConfigurator, SimpleTargetConfigurator,
AndroidModuleConfigurator, AndroidModuleConfigurator,
SingleCoexistenceTargetConfigurator, SingleCoexistenceTargetConfigurator,
ModuleConfiguratorWithTests,
ModuleConfiguratorSettings() { ModuleConfiguratorSettings() {
override val moduleSubType = ModuleSubType.android override val moduleSubType = ModuleSubType.android
override val moduleType = ModuleType.android override val moduleType = ModuleType.android
@@ -152,7 +153,8 @@ object AndroidTargetConfigurator : TargetConfigurator,
inContextOfModuleConfigurator(module) { androidPlugin.reference.settingValue } inContextOfModuleConfigurator(module) { androidPlugin.reference.settingValue }
override fun getConfiguratorSettings() = buildList<ModuleConfiguratorSetting<*, *>> { override fun getConfiguratorSettings() = buildList<ModuleConfiguratorSetting<*, *>> {
+super.getConfiguratorSettings() +super<AndroidModuleConfigurator>.getConfiguratorSettings()
+super<ModuleConfiguratorWithTests>.getConfiguratorSettings()
+androidPlugin +androidPlugin
} }
@@ -181,8 +183,11 @@ object AndroidTargetConfigurator : TargetConfigurator,
) )
} }
override fun defaultTestFramework(): KotlinTestFramework = KotlinTestFramework.JUNIT4
override fun createModuleIRs(reader: Reader, configurationData: ModulesToIrConversionData, module: Module): List<BuildSystemIR> = override fun createModuleIRs(reader: Reader, configurationData: ModulesToIrConversionData, module: Module): List<BuildSystemIR> =
buildList { buildList {
+super<ModuleConfiguratorWithTests>.createModuleIRs(reader, configurationData, module)
+super<AndroidModuleConfigurator>.createModuleIRs(reader, configurationData, module) +super<AndroidModuleConfigurator>.createModuleIRs(reader, configurationData, module)
+ArtifactBasedLibraryDependencyIR( +ArtifactBasedLibraryDependencyIR(
MavenArtifact(DefaultRepository.MAVEN_CENTRAL, "junit", "junit"), MavenArtifact(DefaultRepository.MAVEN_CENTRAL, "junit", "junit"),
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/ModuleConfiguratorWithTests.kt
+1 -1
View File
@@ -86,7 +86,7 @@ enum class KotlinTestFramework(
), ),
JUNIT4( JUNIT4(
KotlinNewProjectWizardBundle.message("module.configurator.tests.setting.framework.junit4"), KotlinNewProjectWizardBundle.message("module.configurator.tests.setting.framework.junit4"),
listOf(ModuleType.jvm), listOf(ModuleType.jvm, ModuleType.android),
listOf("test-junit") listOf("test-junit")
), ),
JUNIT5( JUNIT5(