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

[Gradle] Rename -Xdepends-on to -Xfragment-refines and use ':' for -Xfragment-sources instead of ';'

Browse Source 
^KT-56210 Verification Pending
This commit is contained in:
Sebastian Sellmair
2023-02-27 12:23:24 +01:00
committed by Space Team
parent a692de871b
commit b90207edb9
24 changed files with 96 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cli/js/jsExtraHelp.out
Vendored
+3 -3
View File
@@ -63,8 +63,6 @@ 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.
Should be a subset of sources passed as free arguments
-Xcontext-receivers Enable experimental context receivers
-Xdepends-on=<fromModuleName>:<onModuleName>
Declares that <fromModuleName> depends on <onModuleName> with dependsOn relation
-Xdisable-default-scripting-plugin
Do not enable scripting plugin by default
-Xdisable-phases Disable backend phases
@@ -83,7 +81,9 @@ where advanced options include:
Use 'warning' level to issue warnings instead of errors.
-Xextended-compiler-checks Enable additional compiler checks that might provide verbose diagnostic information for certain errors.
Warning: this mode is not backward-compatible and might cause compilation errors in previously compiled code.
-Xfragment-sources=<fragment name>;<path>
-Xfragment-refines=<fromModuleName>:<onModuleName>
Declares that <fromModuleName> refines <onModuleName> with dependsOn/refines relation
-Xfragment-sources=<fragment name>:<path>
Adds sources to a specific fragment of a multiplatform compilation
-Xfragments=<fragment name> Declares all known fragments of a multiplatform compilation
-Xenable-incremental-compilation
compiler/testData/cli/js/successfulHmpp.args
Vendored
+5 -5
View File
@@ -9,8 +9,8 @@ fir-hmpp
2.0
-XXLanguage\:+MultiPlatformProjects
-Xfragments=a,b,c
-Xfragment-sources=a;$TESTDATA_DIR$/../jvm/hmpp/src/a.kt
-Xfragment-sources=b;$TESTDATA_DIR$/../jvm/hmpp/src/b.kt
-Xfragment-sources=c;$TESTDATA_DIR$/../jvm/hmpp/src/c.kt
-Xdepends-on=b\:a
-Xdepends-on=c\:b
-Xfragment-sources=a\:$TESTDATA_DIR$/../jvm/hmpp/src/a.kt
-Xfragment-sources=b\:$TESTDATA_DIR$/../jvm/hmpp/src/b.kt
-Xfragment-sources=c\:$TESTDATA_DIR$/../jvm/hmpp/src/c.kt
-Xfragment-refines=b\:a
-Xfragment-refines=c\:b
compiler/testData/cli/jvm/extraHelp.out
Vendored
+3 -3
View File
@@ -169,8 +169,6 @@ 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.
Should be a subset of sources passed as free arguments
-Xcontext-receivers Enable experimental context receivers
-Xdepends-on=<fromModuleName>:<onModuleName>
Declares that <fromModuleName> depends on <onModuleName> with dependsOn relation
-Xdisable-default-scripting-plugin
Do not enable scripting plugin by default
-Xdisable-phases Disable backend phases
@@ -189,7 +187,9 @@ where advanced options include:
Use 'warning' level to issue warnings instead of errors.
-Xextended-compiler-checks Enable additional compiler checks that might provide verbose diagnostic information for certain errors.
Warning: this mode is not backward-compatible and might cause compilation errors in previously compiled code.
-Xfragment-sources=<fragment name>;<path>
-Xfragment-refines=<fromModuleName>:<onModuleName>
Declares that <fromModuleName> refines <onModuleName> with dependsOn/refines relation
-Xfragment-sources=<fragment name>:<path>
Adds sources to a specific fragment of a multiplatform compilation
-Xfragments=<fragment name> Declares all known fragments of a multiplatform compilation
-Xenable-incremental-compilation
compiler/testData/cli/jvm/hmpp/cycleInDependencies.args
Vendored
+6 -6
View File
@@ -7,9 +7,9 @@ $TEMP_DIR$
2.0
-XXLanguage\:+MultiPlatformProjects
-Xfragments=a,b,c
-Xfragment-sources=a;$TESTDATA_DIR$/src/a.kt
-Xfragment-sources=b;$TESTDATA_DIR$/src/b.kt
-Xfragment-sources=c;$TESTDATA_DIR$/src/c.kt
-Xdepends-on=b\:a
-Xdepends-on=c\:b
-Xdepends-on=a\:c
-Xfragment-sources=a\:$TESTDATA_DIR$/src/a.kt
-Xfragment-sources=b\:$TESTDATA_DIR$/src/b.kt
-Xfragment-sources=c\:$TESTDATA_DIR$/src/c.kt
-Xfragment-refines=b\:a
-Xfragment-refines=c\:b
-Xfragment-refines=a\:c
compiler/testData/cli/jvm/hmpp/fragmentSourcesIncorrectSyntax.out
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ as no stability/compatibility guarantees are given on
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
error: incorrect syntax for -Xfragment-sources argument. `<module name>;<source file>` expected but got `a;a.kt;`
error: incorrect syntax for -Xfragment-sources argument. `<module name>:<source file>` expected but got `a;a.kt;`
error: source '$TESTDATA_DIR$/src/a.kt' does not belong to any module
error: source '$TESTDATA_DIR$/src/b.kt' does not belong to any module
COMPILATION_ERROR
compiler/testData/cli/jvm/hmpp/missingFragment.args
Vendored
+2 -2
View File
@@ -6,5 +6,5 @@ $TEMP_DIR$
2.0
-XXLanguage\:+MultiPlatformProjects
-Xfragments=a,b
-Xfragment-sources=a;$TESTDATA_DIR$/src/a.kt,b;$TESTDATA_DIR$/src/b.kt
-Xdepends-on=c\:a
-Xfragment-sources=a\:$TESTDATA_DIR$/src/a.kt,b\:$TESTDATA_DIR$/src/b.kt
-Xfragment-refines=c\:a
compiler/testData/cli/jvm/hmpp/missingFragment.out
Vendored
+1 -1
View File
@@ -8,5 +8,5 @@ as no stability/compatibility guarantees are given on
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
error: module `c` not found in -Xfragments arguments
error: `-Xfragment-refines=c:a` Fragment `c` not found in -Xfragments arguments
COMPILATION_ERROR
compiler/testData/cli/jvm/hmpp/dependsOnSingleModule.args → compiler/testData/cli/jvm/hmpp/refinesSingleModule.args
Vendored
+2 -2
View File
@@ -5,5 +5,5 @@ $TEMP_DIR$
2.0
-XXLanguage\:+MultiPlatformProjects
-Xfragments=a
-Xfragment-sources=a;$TESTDATA_DIR$/src/a.kt
-Xdepends-on=b\:a
-Xfragment-sources=a\:$TESTDATA_DIR$/src/a.kt
-Xfragment-refines=b\:a
compiler/testData/cli/jvm/hmpp/dependsOnSingleModule.out → compiler/testData/cli/jvm/hmpp/refinesSingleModule.out
Vendored
+1 -1
View File
@@ -8,5 +8,5 @@ as no stability/compatibility guarantees are given on
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
error: -Xdepends-on flag is specified but there is only one module declared
error: -Xfragment-refines flag is specified but there is only one module declared
COMPILATION_ERROR
compiler/testData/cli/jvm/hmpp/dependsOnWithoutFragments.args → compiler/testData/cli/jvm/hmpp/refinesWithoutFragments.args
Vendored
+1 -1
View File
@@ -4,4 +4,4 @@ $TEMP_DIR$
-language-version
2.0
-XXLanguage\:+MultiPlatformProjects
-Xdepends-on=a\:b
-Xfragment-refines=a\:b
compiler/testData/cli/jvm/hmpp/dependsOnWithoutModules.out → compiler/testData/cli/jvm/hmpp/refinesWithoutFragments.out
Vendored
+1 -1
View File
@@ -8,5 +8,5 @@ as no stability/compatibility guarantees are given on
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
error: -Xdepends-on flag can not be used without -Xfragments
error: -Xfragment-refines flag can not be used without -Xfragments
COMPILATION_ERROR
compiler/testData/cli/jvm/hmpp/dependsOnWithoutFragments.out → compiler/testData/cli/jvm/hmpp/refinesWithoutModules.out
Vendored
+1 -1
View File
@@ -8,5 +8,5 @@ as no stability/compatibility guarantees are given on
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
error: -Xdepends-on flag can not be used without -Xfragments
error: -Xfragment-refines flag can not be used without -Xfragments
COMPILATION_ERROR
compiler/testData/cli/jvm/hmpp/sameSourceInDifferentFragments.args
Vendored
+3 -3
View File
@@ -6,6 +6,6 @@ $TEMP_DIR$
2.0
-XXLanguage\:+MultiPlatformProjects
-Xfragments=a,b
-Xfragment-sources=a;$TESTDATA_DIR$/src/a.kt
-Xfragment-sources=b;$TESTDATA_DIR$/src/a.kt
-Xfragment-sources=b;$TESTDATA_DIR$/src/b.kt
-Xfragment-sources=a\:$TESTDATA_DIR$/src/a.kt
-Xfragment-sources=b\:$TESTDATA_DIR$/src/a.kt
-Xfragment-sources=b\:$TESTDATA_DIR$/src/b.kt
compiler/testData/cli/jvm/hmpp/sourceNotInAnyFragment.args
Vendored
+1 -1
View File
@@ -6,4 +6,4 @@ $TEMP_DIR$
2.0
-XXLanguage\:+MultiPlatformProjects
-Xfragments=a,b
-Xfragment-sources=a;$TESTDATA_DIR$/src/a.kt
-Xfragment-sources=a\:$TESTDATA_DIR$/src/a.kt
compiler/testData/cli/jvm/hmpp/successfulCompilation.args
Vendored
+5 -5
View File
@@ -9,8 +9,8 @@ $TEMP_DIR$
-Xfragments=a
-Xfragments=b
-Xfragments=c
-Xfragment-sources=a;$TESTDATA_DIR$/src/a.kt
-Xfragment-sources=b;$TESTDATA_DIR$/src/b.kt
-Xfragment-sources=c;$TESTDATA_DIR$/src/c.kt
-Xdepends-on=b\:a
-Xdepends-on=c\:b
-Xfragment-sources=a\:$TESTDATA_DIR$/src/a.kt
-Xfragment-sources=b\:$TESTDATA_DIR$/src/b.kt
-Xfragment-sources=c\:$TESTDATA_DIR$/src/c.kt
-Xfragment-refines=b\:a
-Xfragment-refines=c\:b
compiler/testData/cli/jvm/hmpp/successfulCompilation2.args
Vendored
+2 -2
View File
@@ -7,5 +7,5 @@ $TEMP_DIR$
2.0
-XXLanguage\:+MultiPlatformProjects
-Xfragments=a,b,c
-Xfragment-sources=a;$TESTDATA_DIR$/src/a.kt,b;$TESTDATA_DIR$/src/b.kt,c;$TESTDATA_DIR$/src/c.kt
-Xdepends-on=b\:a,c\:b
-Xfragment-sources=a\:$TESTDATA_DIR$/src/a.kt,b\:$TESTDATA_DIR$/src/b.kt,c\:$TESTDATA_DIR$/src/c.kt
-Xfragment-refines=b\:a,c\:b
compiler/testData/cli/metadata/successfulHmpp.args
Vendored
+5 -5
View File
@@ -7,8 +7,8 @@ $TEMP_DIR$
2.0
-XXLanguage\:+MultiPlatformProjects
-Xfragments=a,b,c
-Xfragment-sources=a;$TESTDATA_DIR$/../jvm/hmpp/src/a.kt
-Xfragment-sources=b;$TESTDATA_DIR$/../jvm/hmpp/src/b.kt
-Xfragment-sources=c;$TESTDATA_DIR$/../jvm/hmpp/src/c.kt
-Xdepends-on=b\:a
-Xdepends-on=c\:b
-Xfragment-sources=a\:$TESTDATA_DIR$/../jvm/hmpp/src/a.kt
-Xfragment-sources=b\:$TESTDATA_DIR$/../jvm/hmpp/src/b.kt
-Xfragment-sources=c\:$TESTDATA_DIR$/../jvm/hmpp/src/c.kt
-Xfragment-refines=b\:a
-Xfragment-refines=c\:b