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