[CLI] Rename -XdependsOn flag to -Xdepends-on to keep convention
^KT-56209
This commit is contained in:
committed by
Space Team
parent
18752fc1ad
commit
94faa759cb
+1
-1
@@ -729,7 +729,7 @@ abstract class CommonCompilerArguments : CommonToolArguments() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Argument(
|
@Argument(
|
||||||
value = "-XdependsOn",
|
value = "-Xdepends-on",
|
||||||
valueDescription = "<fromModuleName>:<onModuleName>",
|
valueDescription = "<fromModuleName>:<onModuleName>",
|
||||||
description = "Declares that <fromModuleName> depends on <onModuleName> with dependsOn relation",
|
description = "Declares that <fromModuleName> depends on <onModuleName> with dependsOn relation",
|
||||||
delimiter = ""
|
delimiter = ""
|
||||||
|
|||||||
@@ -145,7 +145,7 @@ private fun CompilerConfiguration.buildHmppModuleStructure(arguments: CommonComp
|
|||||||
|
|
||||||
if (rawModules == null) {
|
if (rawModules == null) {
|
||||||
if (rawDependencies != null) {
|
if (rawDependencies != null) {
|
||||||
reportError("-XdependsOn flag can not be used without -Xmodule")
|
reportError("-Xdepends-on flag can not be used without -Xmodule")
|
||||||
}
|
}
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
@@ -207,7 +207,7 @@ private fun CompilerConfiguration.buildHmppModuleStructure(arguments: CommonComp
|
|||||||
|
|
||||||
if (modules.size == 1) {
|
if (modules.size == 1) {
|
||||||
if (rawDependencies?.isNotEmpty() == true) {
|
if (rawDependencies?.isNotEmpty() == true) {
|
||||||
reportError("-XdependsOn flag is specified but there is only one module declared")
|
reportError("-Xdepends-on flag is specified but there is only one module declared")
|
||||||
}
|
}
|
||||||
return HmppCliModuleStructure(modules, emptyMap())
|
return HmppCliModuleStructure(modules, emptyMap())
|
||||||
}
|
}
|
||||||
@@ -224,7 +224,7 @@ private fun CompilerConfiguration.buildHmppModuleStructure(arguments: CommonComp
|
|||||||
val dependenciesMap = rawDependencies.orEmpty().mapNotNull {
|
val dependenciesMap = rawDependencies.orEmpty().mapNotNull {
|
||||||
val split = it.split(":")
|
val split = it.split(":")
|
||||||
if (split.size != 2) {
|
if (split.size != 2) {
|
||||||
reportError("Incorrect syntax for -XdependsOn argument. Expected <fromModuleName>:<onModuleName> but got `$it`")
|
reportError("Incorrect syntax for -Xdepends-on argument. Expected <fromModuleName>:<onModuleName> but got `$it`")
|
||||||
return@mapNotNull null
|
return@mapNotNull null
|
||||||
}
|
}
|
||||||
val moduleName1 = split[0]
|
val moduleName1 = split[0]
|
||||||
|
|||||||
+1
-1
@@ -63,7 +63,7 @@ where advanced options include:
|
|||||||
-Xcommon-sources=<path> Sources of the common module that need to be compiled together with this module in the multi-platform mode.
|
-Xcommon-sources=<path> Sources of the common module that need to be compiled together with this module in the multi-platform mode.
|
||||||
Should be a subset of sources passed as free arguments
|
Should be a subset of sources passed as free arguments
|
||||||
-Xcontext-receivers Enable experimental context receivers
|
-Xcontext-receivers Enable experimental context receivers
|
||||||
-XdependsOn=<fromModuleName>:<onModuleName>
|
-Xdepends-on=<fromModuleName>:<onModuleName>
|
||||||
Declares that <fromModuleName> depends on <onModuleName> with dependsOn relation
|
Declares that <fromModuleName> depends on <onModuleName> with dependsOn relation
|
||||||
-Xdisable-default-scripting-plugin
|
-Xdisable-default-scripting-plugin
|
||||||
Do not enable scripting plugin by default
|
Do not enable scripting plugin by default
|
||||||
|
|||||||
+2
-2
@@ -11,5 +11,5 @@ fir-hmpp
|
|||||||
-Xmodule=a;$TESTDATA_DIR$/../jvm/hmpp/src/a.kt
|
-Xmodule=a;$TESTDATA_DIR$/../jvm/hmpp/src/a.kt
|
||||||
-Xmodule=b;$TESTDATA_DIR$/../jvm/hmpp/src/b.kt
|
-Xmodule=b;$TESTDATA_DIR$/../jvm/hmpp/src/b.kt
|
||||||
-Xmodule=c;$TESTDATA_DIR$/../jvm/hmpp/src/c.kt
|
-Xmodule=c;$TESTDATA_DIR$/../jvm/hmpp/src/c.kt
|
||||||
-XdependsOn=b\:a
|
-Xdepends-on=b\:a
|
||||||
-XdependsOn=c\:b
|
-Xdepends-on=c\:b
|
||||||
|
|||||||
+1
-1
@@ -169,7 +169,7 @@ where advanced options include:
|
|||||||
-Xcommon-sources=<path> Sources of the common module that need to be compiled together with this module in the multi-platform mode.
|
-Xcommon-sources=<path> Sources of the common module that need to be compiled together with this module in the multi-platform mode.
|
||||||
Should be a subset of sources passed as free arguments
|
Should be a subset of sources passed as free arguments
|
||||||
-Xcontext-receivers Enable experimental context receivers
|
-Xcontext-receivers Enable experimental context receivers
|
||||||
-XdependsOn=<fromModuleName>:<onModuleName>
|
-Xdepends-on=<fromModuleName>:<onModuleName>
|
||||||
Declares that <fromModuleName> depends on <onModuleName> with dependsOn relation
|
Declares that <fromModuleName> depends on <onModuleName> with dependsOn relation
|
||||||
-Xdisable-default-scripting-plugin
|
-Xdisable-default-scripting-plugin
|
||||||
Do not enable scripting plugin by default
|
Do not enable scripting plugin by default
|
||||||
|
|||||||
+3
-3
@@ -9,6 +9,6 @@ $TEMP_DIR$
|
|||||||
-Xmodule=a;$TESTDATA_DIR$/src/a.kt
|
-Xmodule=a;$TESTDATA_DIR$/src/a.kt
|
||||||
-Xmodule=b;$TESTDATA_DIR$/src/b.kt
|
-Xmodule=b;$TESTDATA_DIR$/src/b.kt
|
||||||
-Xmodule=c;$TESTDATA_DIR$/src/c.kt
|
-Xmodule=c;$TESTDATA_DIR$/src/c.kt
|
||||||
-XdependsOn=b\:a
|
-Xdepends-on=b\:a
|
||||||
-XdependsOn=c\:b
|
-Xdepends-on=c\:b
|
||||||
-XdependsOn=a\:c
|
-Xdepends-on=a\:c
|
||||||
|
|||||||
@@ -5,4 +5,4 @@ $TEMP_DIR$
|
|||||||
2.0
|
2.0
|
||||||
-XXLanguage\:+MultiPlatformProjects
|
-XXLanguage\:+MultiPlatformProjects
|
||||||
-Xmodule=a;$TESTDATA_DIR$/src/a.kt
|
-Xmodule=a;$TESTDATA_DIR$/src/a.kt
|
||||||
-XdependsOn=b\:a
|
-Xdepends-on=b\:a
|
||||||
|
|||||||
@@ -8,5 +8,5 @@ as no stability/compatibility guarantees are given on
|
|||||||
compiler or generated code. Use it at your own risk!
|
compiler or generated code. Use it at your own risk!
|
||||||
|
|
||||||
warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features
|
warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features
|
||||||
error: -XdependsOn flag is specified but there is only one module declared
|
error: -Xdepends-on flag is specified but there is only one module declared
|
||||||
COMPILATION_ERROR
|
COMPILATION_ERROR
|
||||||
|
|||||||
@@ -4,4 +4,4 @@ $TEMP_DIR$
|
|||||||
-language-version
|
-language-version
|
||||||
2.0
|
2.0
|
||||||
-XXLanguage\:+MultiPlatformProjects
|
-XXLanguage\:+MultiPlatformProjects
|
||||||
-XdependsOn=a\:b
|
-Xdepends-on=a\:b
|
||||||
|
|||||||
@@ -8,5 +8,5 @@ as no stability/compatibility guarantees are given on
|
|||||||
compiler or generated code. Use it at your own risk!
|
compiler or generated code. Use it at your own risk!
|
||||||
|
|
||||||
warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features
|
warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features
|
||||||
error: -XdependsOn flag can not be used without -Xmodule
|
error: -Xdepends-on flag can not be used without -Xmodule
|
||||||
COMPILATION_ERROR
|
COMPILATION_ERROR
|
||||||
|
|||||||
+1
-1
@@ -7,4 +7,4 @@ $TEMP_DIR$
|
|||||||
-XXLanguage\:+MultiPlatformProjects
|
-XXLanguage\:+MultiPlatformProjects
|
||||||
-Xmodule=a;$TESTDATA_DIR$/src/a.kt
|
-Xmodule=a;$TESTDATA_DIR$/src/a.kt
|
||||||
-Xmodule=b;$TESTDATA_DIR$/src/b.kt
|
-Xmodule=b;$TESTDATA_DIR$/src/b.kt
|
||||||
-XdependsOn=c\:a
|
-Xdepends-on=c\:a
|
||||||
|
|||||||
@@ -9,5 +9,5 @@ $TEMP_DIR$
|
|||||||
-Xmodule=a;$TESTDATA_DIR$/src/a.kt
|
-Xmodule=a;$TESTDATA_DIR$/src/a.kt
|
||||||
-Xmodule=b;$TESTDATA_DIR$/src/b.kt
|
-Xmodule=b;$TESTDATA_DIR$/src/b.kt
|
||||||
-Xmodule=c;$TESTDATA_DIR$/src/c.kt
|
-Xmodule=c;$TESTDATA_DIR$/src/c.kt
|
||||||
-XdependsOn=b\:a
|
-Xdepends-on=b\:a
|
||||||
-XdependsOn=c\:b
|
-Xdepends-on=c\:b
|
||||||
|
|||||||
+2
-2
@@ -9,5 +9,5 @@ $TEMP_DIR$
|
|||||||
-Xmodule=a;$TESTDATA_DIR$/../jvm/hmpp/src/a.kt
|
-Xmodule=a;$TESTDATA_DIR$/../jvm/hmpp/src/a.kt
|
||||||
-Xmodule=b;$TESTDATA_DIR$/../jvm/hmpp/src/b.kt
|
-Xmodule=b;$TESTDATA_DIR$/../jvm/hmpp/src/b.kt
|
||||||
-Xmodule=c;$TESTDATA_DIR$/../jvm/hmpp/src/c.kt
|
-Xmodule=c;$TESTDATA_DIR$/../jvm/hmpp/src/c.kt
|
||||||
-XdependsOn=b\:a
|
-Xdepends-on=b\:a
|
||||||
-XdependsOn=c\:b
|
-Xdepends-on=c\:b
|
||||||
|
|||||||
Reference in New Issue
Block a user