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

Wizard: always generate android MPP tests

Browse Source 
#KT-40940 fixed
This commit is contained in:
Ilya Kirillov
2020-09-08 16:59:43 +03:00
parent 553c525701
commit 3a6011fae9
2 changed files with 6 additions and 12 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/MppModuleConfigurator.kt
+1 -3
View File
@@ -54,13 +54,11 @@ object MppModuleConfigurator : ModuleConfigurator,
override fun getConfiguratorProperties(): List<ModuleConfiguratorProperty<*>> = override fun getConfiguratorProperties(): List<ModuleConfiguratorProperty<*>> =
listOf(mppSources) listOf(mppSources)
// TODO remove when be removed in KMM wizard
val generateTests by booleanSetting("Generate Tests", GenerationPhase.PROJECT_GENERATION) { val generateTests by booleanSetting("Generate Tests", GenerationPhase.PROJECT_GENERATION) {
defaultValue = value(false) defaultValue = value(false)
} }
override fun getConfiguratorSettings(): List<ModuleConfiguratorSetting<*, *>> =
super.getConfiguratorSettings() + generateTests
override fun Writer.runArbitraryTask( override fun Writer.runArbitraryTask(
configurationData: ModulesToIrConversionData, configurationData: ModulesToIrConversionData,
module: Module, module: Module,
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/ModuleDependency.kt
+5 -9
View File
@@ -222,16 +222,12 @@ private fun Writer.addExpectFilesForMppModuleForAndroidAndIos(mppModule: Module,
file(FileTemplateDescriptor("mppCommon/Greeting.kt.vm", relativePath = null), "Greeting.kt", SourcesetType.main) file(FileTemplateDescriptor("mppCommon/Greeting.kt.vm", relativePath = null), "Greeting.kt", SourcesetType.main)
} }
inContextOfModuleConfigurator(mppModule) { filesFor(ModuleSubType.android) {
if (MppModuleConfigurator.generateTests.reference.settingValue) { file(FileTemplateDescriptor("android/androidTest.kt.vm", relativePath = null), "androidTest.kt", SourcesetType.test)
filesFor(ModuleSubType.android) { }
file(FileTemplateDescriptor("android/androidTest.kt.vm", relativePath = null), "androidTest.kt", SourcesetType.test)
}
filesFor(ModuleSubType.iosArm64, ModuleSubType.iosX64, ModuleSubType.ios) { filesFor(ModuleSubType.iosArm64, ModuleSubType.iosX64, ModuleSubType.ios) {
file(FileTemplateDescriptor("ios/iosTest.kt.vm", relativePath = null), "iosTest.kt", SourcesetType.test) file(FileTemplateDescriptor("ios/iosTest.kt.vm", relativePath = null), "iosTest.kt", SourcesetType.test)
}
}
} }
} }