diff --git a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/_dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/_dependencies.txt index cc3166eab6f..4d7c19bc98d 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/_dependencies.txt +++ b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/_dependencies.txt @@ -1,7 +1,4 @@ c [sourceSetHolder] pJvm [compilationAndSourceSetHolder, jvm] -pJvm -> c [include] - -pJs [compilationAndSourceSetHolder, js] -pJs -> c [include] \ No newline at end of file +pJvm -> c [include] \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/_steps.txt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/_steps.txt index bec742d23bc..521ca59b46e 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/_steps.txt +++ b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/_steps.txt @@ -1,5 +1,3 @@ -use @Optional in JS -remove @Optional from JS use @Optional in JVM remove @Optional from JVM add another @Optional in Common module \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/build.log index 86ce0e9baeb..3ae181fc71c 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/build.log @@ -1,31 +1,6 @@ -================ Step #1 use @Optional in JS ================= +================ Step #1 use @Optional in JVM ================= Building c -Building pJs -Compiling files: - pJs/src/c.kt -End of files -Exit code: ABORT ------------------------------------------- -COMPILATION FAILED -Declaration annotated with '@OptionalExpectation' can only be used in common module sources - -================ Step #2 remove @Optional from JS ================= - -Building c -Building pJs -Exit code: NOTHING_DONE ------------------------------------------- -Building pJvm -Exit code: NOTHING_DONE ------------------------------------------- - -================ Step #3 use @Optional in JVM ================= - -Building c -Building pJs -Exit code: NOTHING_DONE ------------------------------------------- Building pJvm Compiling files: pJvm/src/c.kt @@ -33,27 +8,17 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Declaration annotated with '@OptionalExpectation' can only be used in common module sources -================ Step #4 remove @Optional from JVM ================= +================ Step #2 remove @Optional from JVM ================= Building c -Building pJs -Exit code: NOTHING_DONE ------------------------------------------- Building pJvm Exit code: NOTHING_DONE ------------------------------------------ -================ Step #5 add another @Optional in Common module ================= +================ Step #3 add another @Optional in Common module ================= Building c -Building pJs -Compiling files: - c/src/b.kt -End of files -Exit code: OK ------------------------------------------- Building pJvm Compiling files: c/src/b.kt diff --git a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJs_c.kt.delete.2 b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJs_c.kt.delete.2 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJs_c.kt.new.1 b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJs_c.kt.new.1 deleted file mode 100644 index 6b3d50be104..00000000000 --- a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg/pJs_c.kt.new.1 +++ /dev/null @@ -1,3 +0,0 @@ -// Should be an error: Declaration annotated with '@OptionalExpectation' can only be used in common module sources -@Optional("BarJs") -class BarJs \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/_dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/_dependencies.txt index 94161f8d01d..07575225595 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/_dependencies.txt +++ b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/_dependencies.txt @@ -2,6 +2,3 @@ c [sourceSetHolder] pJvm [compilationAndSourceSetHolder, jvm] pJvm -> c [include] - -pJs [compilationAndSourceSetHolder, js] -pJs -> c [include] diff --git a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/build.log index 85eb646b8c3..af16378dc2c 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/build.log @@ -1,17 +1,6 @@ ================ Step #1 ================= Building c -Building pJs -Cleaning output files: - out/production/pJs/pJs.js - out/production/pJs/pJs.meta.js - out/production/pJs/pJs/root-package.kjsm -End of files -Compiling files: - c/src/usage.kt -End of files -Exit code: OK ------------------------------------------- Building pJvm Cleaning output files: out/production/pJvm/META-INF/pJvm.kotlin_module