[Gradle, JS] Fix id and text in simple js module configurators
^KT-40527 fixed
This commit is contained in:
+1
-1
@@ -1,5 +1,5 @@
|
||||
kotlin:
|
||||
projectKind: js
|
||||
modules:
|
||||
- type: jsSinglePlatform
|
||||
- type: jsBrowserSinglePlatform
|
||||
name: a
|
||||
+2
-1
@@ -72,7 +72,8 @@ module.type.ios=iOS
|
||||
module.name=Module name
|
||||
module.name.with.name=Module name {0}
|
||||
|
||||
module.configurator.js=JS for Browser
|
||||
module.configurator.simple.js.browser=JS for Browser
|
||||
module.configurator.simple.js.node=JS for Node.JS
|
||||
|
||||
module.configurator.android=Android
|
||||
module.configurator.android.setting.android.plugin=Android plugin
|
||||
|
||||
+18
-8
@@ -89,7 +89,7 @@ enum class JsTarget {
|
||||
NODE;
|
||||
}
|
||||
|
||||
open class JsSinglePlatformModuleConfigurator(
|
||||
abstract class JsSinglePlatformModuleConfigurator(
|
||||
private val jsTarget: JsTarget
|
||||
) : JSConfigurator, ModuleConfiguratorWithTests, SinglePlatformModuleConfigurator,
|
||||
ModuleConfiguratorWithSettings {
|
||||
@@ -103,8 +103,7 @@ open class JsSinglePlatformModuleConfigurator(
|
||||
override val suggestedModuleName = "js"
|
||||
|
||||
@NonNls
|
||||
override val id = "jsSinglePlatform"
|
||||
override val text = KotlinNewProjectWizardBundle.message("module.configurator.js")
|
||||
override val id = "js${jsTarget.name.toLowerCase().capitalize()}SinglePlatform"
|
||||
|
||||
override fun defaultTestFramework(): KotlinTestFramework = KotlinTestFramework.JS
|
||||
|
||||
@@ -123,13 +122,12 @@ open class JsSinglePlatformModuleConfigurator(
|
||||
): List<BuildSystemIR> = irsList {
|
||||
"kotlin" {
|
||||
"js" {
|
||||
when (jsTarget) {
|
||||
JsTarget.BROWSER -> browserSubTarget(module, reader)
|
||||
JsTarget.NODE -> nodejsSubTarget(module, reader)
|
||||
}
|
||||
subTarget(module, reader)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected abstract fun GradleIRListBuilder.subTarget(module: Module, reader: Reader)
|
||||
}
|
||||
|
||||
object BrowserJsSinglePlatformModuleConfigurator : JsSinglePlatformModuleConfigurator(
|
||||
@@ -139,11 +137,23 @@ object BrowserJsSinglePlatformModuleConfigurator : JsSinglePlatformModuleConfigu
|
||||
return super.getConfiguratorSettings() +
|
||||
JSConfigurator.cssSupport
|
||||
}
|
||||
|
||||
override fun GradleIRListBuilder.subTarget(module: Module, reader: Reader) {
|
||||
browserSubTarget(module, reader)
|
||||
}
|
||||
|
||||
override val text = KotlinNewProjectWizardBundle.message("module.configurator.simple.js.browser")
|
||||
}
|
||||
|
||||
object NodeJsSinglePlatformModuleConfigurator : JsSinglePlatformModuleConfigurator(
|
||||
JsTarget.NODE
|
||||
)
|
||||
) {
|
||||
override fun GradleIRListBuilder.subTarget(module: Module, reader: Reader) {
|
||||
nodejsSubTarget(module, reader)
|
||||
}
|
||||
|
||||
override val text = KotlinNewProjectWizardBundle.message("module.configurator.simple.js.node")
|
||||
}
|
||||
|
||||
fun GradleIRListBuilder.applicationSupport() {
|
||||
+"binaries.executable()"
|
||||
|
||||
Reference in New Issue
Block a user