Kotlin incremental cache version change should not affect java only modules

jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log

@@ -1,26 +1,42 @@
 Cleaning output files:
-out/production/module/META-INF/module.kotlin_module
-out/production/module/foo/A.class
-out/production/module/foo/AKt.class
-End of files
-Cleaning output files:
-out/production/module/foo/B.class
-out/production/module/foo/BKt.class
-out/production/module/foo/C.class
-out/production/module/foo/CKt.class
+out/production/module1/foo/Z.class
 End of files
 Compiling files:
-src/a.kt
-src/b.kt
-src/c.kt
+module1/src/module1_z.kt
+End of files
+Cleaning output files:
+out/production/module2/META-INF/module2.kotlin_module
+out/production/module2/foo/A.class
+out/production/module2/foo/B.class
+out/production/module2/foo/C.class
+out/production/module2/foo/Module2_aKt.class
+out/production/module2/foo/Module2_bKt.class
+out/production/module2/foo/Module2_cKt.class
+End of files
+Compiling files:
+module2/src/module2_a.kt
+module2/src/module2_b.kt
+module2/src/module2_c.kt
+End of files
+Cleaning output files:
+out/production/module3/foo/D.class
+End of files
+Compiling files:
+module3/src/module3_d.kt
+End of files
+Cleaning output files:
+out/production/module4/foo/E.class
+End of files
+Compiling files:
+module4/src/module4_e.kt
 End of files
 
 
 Cleaning output files:
-out/production/module/META-INF/module.kotlin_module
-out/production/module/foo/A.class
-out/production/module/foo/AKt.class
+out/production/module2/META-INF/module2.kotlin_module
+out/production/module2/foo/A.class
+out/production/module2/foo/Module2_aKt.class
 End of files
 Compiling files:
-src/a.kt
+module2/src/module2_a.kt
 End of files

jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/dependencies.txt

@@ -0,0 +1,4 @@
+module1->
+module2->module1
+module3->module2
+module4->module3

jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt

@@ -4,10 +4,28 @@ kotlin-data-container
     file-to-id.tab
     id-to-file.tab
     lookups.tab
-Module 'module' production
+Module 'module1' production
+    experimental-format-version.txt
+    format-version.txt
+    proto.tab
+    source-to-classes.tab
+Module 'module1' tests
+Module 'module2' production
     experimental-format-version.txt
     format-version.txt
     package-parts.tab
     proto.tab
     source-to-classes.tab
-Module 'module' tests
+Module 'module2' tests
+Module 'module3' production
+    experimental-format-version.txt
+    format-version.txt
+    proto.tab
+    source-to-classes.tab
+Module 'module3' tests
+Module 'module4' production
+    experimental-format-version.txt
+    format-version.txt
+    proto.tab
+    source-to-classes.tab
+Module 'module4' tests

jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module1_z.kt

@@ -0,0 +1,3 @@
+package foo
+
+class Z

jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module3_d.kt

@@ -0,0 +1,3 @@
+package foo
+
+class D

jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module4_e.kt

@@ -0,0 +1,3 @@
+package foo
+
+class E

jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/build.log

@@ -0,0 +1,25 @@
+Cleaning output files:
+out/production/module1/META-INF/module1.kotlin_module
+out/production/module1/Module1_aKt.class
+End of files
+Compiling files:
+module1/src/module1_a.kt
+End of files
+Cleaning output files:
+out/production/module2/B.class
+out/production/module2/META-INF/module2.kotlin_module
+out/production/module2/Module2_cKt.class
+End of files
+Compiling files:
+module2/src/module2_c.kt
+End of files
+Compiling files:
+module2/src/module2_B.java
+End of files
+Cleaning output files:
+out/production/module3/META-INF/module3.kotlin_module
+out/production/module3/Module3_dKt.class
+End of files
+Compiling files:
+module3/src/module3_d.kt
+End of files

jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/dependencies.txt

@@ -0,0 +1,3 @@
+module1->
+module2->module1
+module3->module2

jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/expected-kotlin-caches.txt

@@ -0,0 +1,27 @@
+kotlin-data-container
+    data-container-format-version.txt
+    counters.tab
+    file-to-id.tab
+    id-to-file.tab
+    lookups.tab
+Module 'module1' production
+    experimental-format-version.txt
+    format-version.txt
+    package-parts.tab
+    proto.tab
+    source-to-classes.tab
+Module 'module1' tests
+Module 'module2' production
+    experimental-format-version.txt
+    format-version.txt
+    package-parts.tab
+    proto.tab
+    source-to-classes.tab
+Module 'module2' tests
+Module 'module3' production
+    experimental-format-version.txt
+    format-version.txt
+    package-parts.tab
+    proto.tab
+    source-to-classes.tab
+Module 'module3' tests

jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module1_a.kt

@@ -0,0 +1 @@
+fun a() {}

jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module2_B.java

@@ -0,0 +1 @@
+class B {}

jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module2_B.java.new

@@ -0,0 +1 @@
+class B {}

jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module2_c.kt

@@ -0,0 +1 @@
+fun c() {}

jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module3_d.kt

@@ -0,0 +1 @@
+fun d() {}

jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/A.java

@@ -0,0 +1 @@
+class A {}

jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/B.java

@@ -0,0 +1 @@
+class B {}

jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/build.log

@@ -0,0 +1,6 @@
+Cleaning output files:
+out/production/module/A.class
+End of files
+Compiling files:
+src/A.java
+End of files

jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/expected-kotlin-caches.txt

@@ -0,0 +1,3 @@
+kotlin-data-container
+Module 'module' production
+Module 'module' tests

jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log

@@ -1,47 +1,63 @@
 Cleaning output files:
-out/production/module/META-INF/module.kotlin_module
-out/production/module/foo/A.class
-out/production/module/foo/AKt.class
-End of files
-Cleaning output files:
-out/production/module/foo/B.class
-out/production/module/foo/BKt.class
-out/production/module/foo/C.class
-out/production/module/foo/CKt.class
+out/production/module1/foo/Z.class
 End of files
 Compiling files:
-src/a.kt
-src/b.kt
-src/c.kt
+module1/src/module1_z.kt
+End of files
+Cleaning output files:
+out/production/module2/META-INF/module2.kotlin_module
+out/production/module2/foo/A.class
+out/production/module2/foo/B.class
+out/production/module2/foo/C.class
+out/production/module2/foo/Module2_aKt.class
+out/production/module2/foo/Module2_bKt.class
+out/production/module2/foo/Module2_cKt.class
+End of files
+Compiling files:
+module2/src/module2_a.kt
+module2/src/module2_b.kt
+module2/src/module2_c.kt
+End of files
+Cleaning output files:
+out/production/module3/foo/D.class
+End of files
+Compiling files:
+module3/src/module3_d.kt
+End of files
+Cleaning output files:
+out/production/module4/foo/E.class
+End of files
+Compiling files:
+module4/src/module4_e.kt
 End of files
 
 
 Cleaning output files:
-out/production/module/META-INF/module.kotlin_module
-out/production/module/foo/A.class
-out/production/module/foo/AKt.class
+out/production/module2/META-INF/module2.kotlin_module
+out/production/module2/foo/A.class
+out/production/module2/foo/Module2_aKt.class
 End of files
 Compiling files:
-src/a.kt
+module2/src/module2_a.kt
 End of files
 
 
 Cleaning output files:
-out/production/module/META-INF/module.kotlin_module
-out/production/module/foo/A.class
-out/production/module/foo/AKt.class
+out/production/module2/META-INF/module2.kotlin_module
+out/production/module2/foo/A.class
+out/production/module2/foo/Module2_aKt.class
 End of files
 Compiling files:
-src/a.kt
+module2/src/module2_a.kt
 End of files
 Cleaning output files:
-out/production/module/META-INF/module.kotlin_module
-out/production/module/foo/B.class
-out/production/module/foo/BKt.class
-out/production/module/foo/C.class
-out/production/module/foo/CKt.class
+out/production/module2/META-INF/module2.kotlin_module
+out/production/module2/foo/B.class
+out/production/module2/foo/C.class
+out/production/module2/foo/Module2_bKt.class
+out/production/module2/foo/Module2_cKt.class
 End of files
 Compiling files:
-src/b.kt
-src/c.kt
+module2/src/module2_b.kt
+module2/src/module2_c.kt
 End of files

jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/dependencies.txt

@@ -0,0 +1,4 @@
+module1->
+module2->module1
+module3->module2
+module4->module3

jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/expected-kotlin-caches.txt

@@ -1,7 +1,22 @@
 kotlin-data-container
-Module 'module' production
+Module 'module1' production
+    format-version.txt
+    proto.tab
+    source-to-classes.tab
+Module 'module1' tests
+Module 'module2' production
     format-version.txt
     package-parts.tab
     proto.tab
     source-to-classes.tab
-Module 'module' tests
+Module 'module2' tests
+Module 'module3' production
+    format-version.txt
+    proto.tab
+    source-to-classes.tab
+Module 'module3' tests
+Module 'module4' production
+    format-version.txt
+    proto.tab
+    source-to-classes.tab
+Module 'module4' tests

jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module1_z.kt

@@ -0,0 +1,3 @@
+package foo
+
+class Z

jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module2_experimental-compilation.new.1

@@ -0,0 +1 @@
+on

jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module3_d.kt

@@ -0,0 +1,3 @@
+package foo
+
+class D

jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module4_e.kt

@@ -0,0 +1,3 @@
+package foo
+
+class E

jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log

@@ -1,20 +1,20 @@
 Cleaning output files:
-out/production/module/META-INF/module.kotlin_module
-out/production/module/foo/AKt.class
+out/production/module2/META-INF/module2.kotlin_module
+out/production/module2/foo/Module2_aKt.class
 End of files
 Compiling files:
-src/a.kt
-src/b.kt
-src/c.kt
+module2/src/module2_a.kt
+module2/src/module2_b.kt
+module2/src/module2_c.kt
 End of files
 
 
 Cleaning output files:
-out/production/module/META-INF/module.kotlin_module
-out/production/module/foo/AKt.class
+out/production/module2/META-INF/module2.kotlin_module
+out/production/module2/foo/Module2_aKt.class
 End of files
 Compiling files:
-src/a.kt
-src/b.kt
-src/c.kt
+module2/src/module2_a.kt
+module2/src/module2_b.kt
+module2/src/module2_c.kt
 End of files

jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/dependencies.txt

@@ -0,0 +1,4 @@
+module1->
+module2->module1
+module3->module2
+module4->module3

jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/expected-kotlin-caches.txt

@@ -1,3 +1,9 @@
 kotlin-data-container
-Module 'module' production
-Module 'module' tests
+Module 'module1' production
+Module 'module1' tests
+Module 'module2' production
+Module 'module2' tests
+Module 'module3' production
+Module 'module3' tests
+Module 'module4' production
+Module 'module4' tests

jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module1_z.kt

@@ -0,0 +1,3 @@
+package foo
+
+class Z

jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module3_d.kt

@@ -0,0 +1,3 @@
+package foo
+
+class D

jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module4_e.kt

@@ -0,0 +1,3 @@
+package foo
+
+class E

jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log

@@ -1,40 +1,56 @@
 Cleaning output files:
-out/production/module/META-INF/module.kotlin_module
-out/production/module/foo/AKt.class
+out/production/module2/META-INF/module2.kotlin_module
+out/production/module2/foo/Module2_aKt.class
 End of files
 Compiling files:
-src/a.kt
-src/b.kt
-src/c.kt
+module2/src/module2_a.kt
+module2/src/module2_b.kt
+module2/src/module2_c.kt
 End of files
 
 
 Cleaning output files:
-out/production/module/META-INF/module.kotlin_module
-out/production/module/foo/AKt.class
-End of files
-Cleaning output files:
-out/production/module/foo/BKt.class
-out/production/module/foo/CKt.class
+out/production/module1/foo/Z.class
 End of files
 Compiling files:
-src/a.kt
-src/b.kt
-src/c.kt
+module1/src/module1_z.kt
+End of files
+Cleaning output files:
+out/production/module2/META-INF/module2.kotlin_module
+out/production/module2/foo/Module2_aKt.class
+out/production/module2/foo/Module2_bKt.class
+out/production/module2/foo/Module2_cKt.class
+End of files
+Compiling files:
+module2/src/module2_a.kt
+module2/src/module2_b.kt
+module2/src/module2_c.kt
+End of files
+Cleaning output files:
+out/production/module3/foo/D.class
+End of files
+Compiling files:
+module3/src/module3_d.kt
+End of files
+Cleaning output files:
+out/production/module4/foo/E.class
+End of files
+Compiling files:
+module4/src/module4_e.kt
 End of files
 
 
 Cleaning output files:
-out/production/module/META-INF/module.kotlin_module
-out/production/module/foo/AKt.class
+out/production/module2/META-INF/module2.kotlin_module
+out/production/module2/foo/Module2_aKt.class
 End of files
 Compiling files:
-src/a.kt
+module2/src/module2_a.kt
 End of files
 Cleaning output files:
-out/production/module/META-INF/module.kotlin_module
-out/production/module/foo/BKt.class
+out/production/module2/META-INF/module2.kotlin_module
+out/production/module2/foo/Module2_bKt.class
 End of files
 Compiling files:
-src/b.kt
+module2/src/module2_b.kt
 End of files

jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/dependencies.txt

@@ -0,0 +1,4 @@
+module1->
+module2->module1
+module3->module2
+module4->module3

jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt

@@ -1,9 +1,24 @@
 kotlin-data-container
-Module 'module' production
+Module 'module1' production
+    format-version.txt
+    proto.tab
+    source-to-classes.tab
+Module 'module1' tests
+Module 'module2' production
     format-version.txt
     inline-functions.tab
     inlined-to.tab
     package-parts.tab
     proto.tab
     source-to-classes.tab
-Module 'module' tests
+Module 'module2' tests
+Module 'module3' production
+    format-version.txt
+    proto.tab
+    source-to-classes.tab
+Module 'module3' tests
+Module 'module4' production
+    format-version.txt
+    proto.tab
+    source-to-classes.tab
+Module 'module4' tests

jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module1_z.kt

@@ -0,0 +1,3 @@
+package foo
+
+class Z

jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_incremental-compilation.new.2

@@ -0,0 +1 @@
+on

jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module3_d.kt

@@ -0,0 +1,3 @@
+package foo
+
+class D

jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module4_e.kt

@@ -0,0 +1,3 @@
+package foo
+
+class E