Kotlin incremental cache version change should not affect java only modules

This commit is contained in:
Alexey Tsvetkov
2015-11-19 13:48:39 +03:00
parent b1b0da5228
commit a447c39f69
120 changed files with 760 additions and 137 deletions
@@ -0,0 +1,36 @@
Cleaning output files:
out/production/module1/C.class
End of files
Compiling files:
module1/src/module1_C.java
End of files
Cleaning output files:
out/production/module1/A.class
End of files
Cleaning output files:
out/production/module1/B.class
out/production/module1/C.class
out/production/module1/D.class
End of files
Compiling files:
module1/src/module1_A.kt
module1/src/module1_B.kt
End of files
Compiling files:
module1/src/module1_C.java
module1/src/module1_D.java
End of files
Cleaning output files:
out/production/module2/E.class
End of files
Compiling files:
module2/src/module2_E.kt
End of files
Cleaning output files:
out/production/module3/F.class
End of files
Compiling files:
module3/src/module3_F.kt
End of files
@@ -0,0 +1,36 @@
Cleaning output files:
out/production/module1/C.class
End of files
Compiling files:
module1/src/module1_C.java
End of files
Cleaning output files:
out/production/module1/A.class
End of files
Cleaning output files:
out/production/module1/B.class
out/production/module1/C.class
out/production/module1/D.class
End of files
Compiling files:
module1/src/module1_A.kt
module1/src/module1_B.kt
End of files
Compiling files:
module1/src/module1_C.java
module1/src/module1_D.java
End of files
Cleaning output files:
out/production/module2/E.class
End of files
Compiling files:
module2/src/module2_E.kt
End of files
Cleaning output files:
out/production/module3/F.class
End of files
Compiling files:
module3/src/module3_F.kt
End of files
@@ -0,0 +1,3 @@
module1->
module2->module1
module3->module2
@@ -0,0 +1 @@
class A
@@ -0,0 +1 @@
class B
@@ -0,0 +1 @@
class C {}
@@ -0,0 +1 @@
class C {}
@@ -0,0 +1 @@
class D {}
@@ -0,0 +1 @@
class E
@@ -0,0 +1 @@
class F
@@ -0,0 +1,14 @@
Cleaning output files:
out/production/module1/A.class
End of files
Compiling files:
module1/src/module1_A.java
End of files
Cleaning output files:
out/production/module1/B.class
End of files
Compiling files:
module1/src/module1_B.java
End of files
@@ -0,0 +1,14 @@
Cleaning output files:
out/production/module1/A.class
End of files
Compiling files:
module1/src/module1_A.java
End of files
Cleaning output files:
out/production/module1/B.class
End of files
Compiling files:
module1/src/module1_B.java
End of files
@@ -0,0 +1,3 @@
module1->
module2->module1
module3->module2
@@ -1,10 +1,4 @@
Cleaning output files:
out/production/module5/module5/E.class
End of files
Compiling files:
module5/src/module5_E.java
End of files
Cleaning output files:
out/production/module4/module4/D.class
End of files
Compiling files:
@@ -1,10 +1,4 @@
Cleaning output files:
out/production/module5/module5/E.class
End of files
Compiling files:
module5/src/module5_E.java
End of files
Cleaning output files:
out/production/module4/module4/D.class
End of files
Compiling files:
@@ -7,6 +7,8 @@ module1/src/module1_A.kt
End of files
Cleaning output files:
out/production/module2/b/B.class
End of files
Cleaning output files:
out/production/module2/b/C.class
End of files
Compiling files:
@@ -0,0 +1 @@
class A {}
@@ -0,0 +1 @@
class A {}
@@ -0,0 +1,5 @@
package test
fun f() {
other.other()
}
@@ -0,0 +1,5 @@
package test
fun g() {
other.other()
}
@@ -0,0 +1,17 @@
Cleaning output files:
out/production/module/A.class
End of files
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/other/OtherKt.class
out/production/module/test/AKt.class
out/production/module/test/BKt.class
End of files
Compiling files:
src/a.kt
src/b.kt
src/other.kt
End of files
Compiling files:
src/A.java
End of files
@@ -0,0 +1,17 @@
Cleaning output files:
out/production/module/A.class
End of files
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/other/OtherKt.class
out/production/module/test/AKt.class
out/production/module/test/BKt.class
End of files
Compiling files:
src/a.kt
src/b.kt
src/other.kt
End of files
Compiling files:
src/A.java
End of files
@@ -0,0 +1,4 @@
package other
fun other() {
}
@@ -0,0 +1,40 @@
Cleaning output files:
out/production/module4/module4/D.class
End of files
Compiling files:
module4/src/module4_d.kt
End of files
Cleaning output files:
out/production/module1/META-INF/module1.kotlin_module
out/production/module1/module1/A.class
out/production/module1/module1/Module1_aKt.class
End of files
Cleaning output files:
out/production/module1/module1/Module1_fKt.class
End of files
Compiling files:
module1/src/module1_a.kt
module1/src/module1_f.kt
End of files
COMPILATION FAILED
Name expected
Compiling files:
module1/src/module1_a.kt
module1/src/module1_f.kt
End of files
Cleaning output files:
out/production/module2/META-INF/module2.kotlin_module
out/production/module2/module2/Module2_bKt.class
End of files
Compiling files:
module2/src/module2_b.kt
End of files
Cleaning output files:
out/production/module3/META-INF/module3.kotlin_module
out/production/module3/module3/Module3_cKt.class
End of files
Compiling files:
module3/src/module3_c.kt
End of files
@@ -0,0 +1,38 @@
Cleaning output files:
out/production/module4/module4/D.class
End of files
Compiling files:
module4/src/module4_d.kt
End of files
Cleaning output files:
out/production/module1/META-INF/module1.kotlin_module
out/production/module1/module1/A.class
out/production/module1/module1/Module1_aKt.class
out/production/module1/module1/Module1_fKt.class
End of files
Compiling files:
module1/src/module1_a.kt
module1/src/module1_f.kt
End of files
COMPILATION FAILED
Name expected
Compiling files:
module1/src/module1_a.kt
module1/src/module1_f.kt
End of files
Cleaning output files:
out/production/module2/META-INF/module2.kotlin_module
out/production/module2/module2/Module2_bKt.class
End of files
Compiling files:
module2/src/module2_b.kt
End of files
Cleaning output files:
out/production/module3/META-INF/module3.kotlin_module
out/production/module3/module3/Module3_cKt.class
End of files
Compiling files:
module3/src/module3_c.kt
End of files
@@ -0,0 +1,5 @@
module1->
module2->module1
module3->module2
module4->
module5->
@@ -0,0 +1,6 @@
package module1
class A
fun a() {
}
@@ -0,0 +1,3 @@
package module1
class
@@ -0,0 +1,6 @@
package module1
class A
fun a() {
}
@@ -0,0 +1,3 @@
package module1
fun f() {}
@@ -0,0 +1,8 @@
package module2
import module1.*
fun b() {
A()
a()
}
@@ -0,0 +1,7 @@
package module3
import module2.*
fun c() {
b()
}
@@ -0,0 +1,3 @@
package module4
class D
@@ -0,0 +1,3 @@
package module5;
class E {}
@@ -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
@@ -0,0 +1,4 @@
module1->
module2->module1
module3->module2
module4->module3
@@ -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
@@ -0,0 +1,3 @@
package foo
class Z
@@ -0,0 +1,3 @@
package foo
class D
@@ -0,0 +1,3 @@
package foo
class E
@@ -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
@@ -0,0 +1,3 @@
module1->
module2->module1
module3->module2
@@ -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
@@ -0,0 +1 @@
class A {}
@@ -0,0 +1 @@
class B {}
@@ -0,0 +1,6 @@
Cleaning output files:
out/production/module/A.class
End of files
Compiling files:
src/A.java
End of files
@@ -0,0 +1,3 @@
kotlin-data-container
Module 'module' production
Module 'module' tests
@@ -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
@@ -0,0 +1,4 @@
module1->
module2->module1
module3->module2
module4->module3
@@ -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
@@ -0,0 +1,3 @@
package foo
class Z
@@ -0,0 +1,3 @@
package foo
class D
@@ -0,0 +1,3 @@
package foo
class E
@@ -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
@@ -0,0 +1,4 @@
module1->
module2->module1
module3->module2
module4->module3
@@ -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
@@ -0,0 +1,3 @@
package foo
class Z
@@ -0,0 +1,3 @@
package foo
class D
@@ -0,0 +1,3 @@
package foo
class E
@@ -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
@@ -0,0 +1,4 @@
module1->
module2->module1
module3->module2
module4->module3
@@ -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
@@ -0,0 +1,3 @@
package foo
class Z

Some files were not shown because too many files have changed in this diff Show More