Register kotlin_module as output of all files

Previously kotlin_module was registered as output
only for files containing top-level declarations
This commit is contained in:
Alexey Tsvetkov
2018-06-27 21:07:27 +03:00
parent 63b4302cea
commit 5760b8cf8b
133 changed files with 209 additions and 31 deletions

View File

@@ -62,7 +62,7 @@ public class ClassFileFactory implements OutputFileCollection {
private boolean isDone = false;
private final Set<File> packagePartSourceFiles = new HashSet<>();
private final Set<File> sourceFiles = new HashSet<>();
private final Map<String, PackageParts> partsGroupedByPackage = new LinkedHashMap<>();
public ClassFileFactory(@NotNull GenerationState state, @NotNull ClassBuilderFactory builderFactory) {
@@ -122,7 +122,7 @@ public class ClassFileFactory implements OutputFileCollection {
JvmModuleProtoBuf.Module moduleProto = builder.build();
generators.put(outputFilePath, new OutAndSourceFileList(CollectionsKt.toList(packagePartSourceFiles)) {
generators.put(outputFilePath, new OutAndSourceFileList(CollectionsKt.toList(sourceFiles)) {
@Override
public byte[] asBytes(ClassBuilderFactory factory) {
return ModuleMappingKt.serializeToByteArray(moduleProto, JvmMetadataVersion.INSTANCE.toArray());
@@ -233,14 +233,14 @@ public class ClassFileFactory implements OutputFileCollection {
@NotNull
public PackageCodegen forPackage(@NotNull FqName fqName, @NotNull Collection<KtFile> files) {
assert !isDone : "Already done!";
registerPackagePartSourceFiles(files);
registerSourceFiles(files);
return state.getCodegenFactory().createPackageCodegen(state, files, fqName, buildNewPackagePartRegistry(fqName));
}
@NotNull
public MultifileClassCodegen forMultifileClass(@NotNull FqName facadeFqName, @NotNull Collection<KtFile> files) {
assert !isDone : "Already done!";
registerPackagePartSourceFiles(files);
registerSourceFiles(files);
return state.getCodegenFactory().createMultifileClassCodegen(state, files, facadeFqName, buildNewPackagePartRegistry(facadeFqName.parent()));
}
@@ -252,8 +252,8 @@ public class ClassFileFactory implements OutputFileCollection {
};
}
private void registerPackagePartSourceFiles(Collection<KtFile> files) {
packagePartSourceFiles.addAll(toIoFilesIgnoringNonPhysical(PackagePartClassUtils.getFilesWithCallables(files)));
private void registerSourceFiles(Collection<KtFile> files) {
sourceFiles.addAll(toIoFilesIgnoringNonPhysical(files));
}
@NotNull

View File

@@ -421,7 +421,10 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
assertFilesExistInOutput(module, "Foo.class")
assertFilesNotExistInOutput(module, *EXCLUDE_FILES)
checkWhen(touch("src/foo.kt"), null, arrayOf(klass("kotlinProject", "Foo")))
checkWhen(
touch("src/foo.kt"), null,
arrayOf(klass("kotlinProject", "Foo"), module("kotlinProject"))
)
}
fun testExcludeModuleFolderInSourceRootOfAnotherModule() {
@@ -431,8 +434,14 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
assertFilesExistInOutput(module, "Foo.class")
}
checkWhen(touch("src/foo.kt"), null, arrayOf(klass("kotlinProject", "Foo")))
checkWhen(touch("src/module2/src/foo.kt"), null, arrayOf(klass("module2", "Foo")))
checkWhen(
touch("src/foo.kt"), null,
arrayOf(klass("kotlinProject", "Foo"), module("kotlinProject"))
)
checkWhen(
touch("src/module2/src/foo.kt"), null,
arrayOf(klass("module2", "Foo"), module("module2"))
)
}
fun testExcludeFileUsingCompilerSettings() {
@@ -443,7 +452,7 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
assertFilesNotExistInOutput(module, *EXCLUDE_FILES)
if (IncrementalCompilation.isEnabled()) {
checkWhen(touch("src/foo.kt"), null, arrayOf(klass("kotlinProject", "Foo")))
checkWhen(touch("src/foo.kt"), null, arrayOf(module("kotlinProject"), klass("kotlinProject", "Foo")))
}
else {
val allClasses = myProject.outputPaths()
@@ -462,8 +471,8 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
assertFilesNotExistInOutput(module, *EXCLUDE_FILES)
if (IncrementalCompilation.isEnabled()) {
checkWhen(touch("src/foo.kt"), null, arrayOf(klass("kotlinProject", "Foo")))
checkWhen(touch("src/dir/subdir/bar.kt"), null, arrayOf(klass("kotlinProject", "Bar")))
checkWhen(touch("src/foo.kt"), null, arrayOf(module("kotlinProject"), klass("kotlinProject", "Foo")))
checkWhen(touch("src/dir/subdir/bar.kt"), null, arrayOf(module("kotlinProject"), klass("kotlinProject", "Bar")))
}
else {
val allClasses = myProject.outputPaths()
@@ -483,7 +492,7 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
assertFilesNotExistInOutput(module, *EXCLUDE_FILES)
if (IncrementalCompilation.isEnabled()) {
checkWhen(touch("src/foo.kt"), null, arrayOf(klass("kotlinProject", "Foo")))
checkWhen(touch("src/foo.kt"), null, arrayOf(module("kotlinProject"), klass("kotlinProject", "Foo")))
}
else {
val allClasses = myProject.outputPaths()

View File

@@ -420,7 +420,10 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
assertFilesExistInOutput(module, "Foo.class")
assertFilesNotExistInOutput(module, *EXCLUDE_FILES)
checkWhen(touch("src/foo.kt"), null, arrayOf(klass("kotlinProject", "Foo")))
checkWhen(
touch("src/foo.kt"), null,
arrayOf(klass("kotlinProject", "Foo"), module("kotlinProject"))
)
}
fun testExcludeModuleFolderInSourceRootOfAnotherModule() {
@@ -430,8 +433,14 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
assertFilesExistInOutput(module, "Foo.class")
}
checkWhen(touch("src/foo.kt"), null, arrayOf(klass("kotlinProject", "Foo")))
checkWhen(touch("src/module2/src/foo.kt"), null, arrayOf(klass("module2", "Foo")))
checkWhen(
touch("src/foo.kt"), null,
arrayOf(klass("kotlinProject", "Foo"), module("kotlinProject"))
)
checkWhen(
touch("src/module2/src/foo.kt"), null,
arrayOf(klass("module2", "Foo"), module("module2"))
)
}
fun testExcludeFileUsingCompilerSettings() {
@@ -442,7 +451,7 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
assertFilesNotExistInOutput(module, *EXCLUDE_FILES)
if (IncrementalCompilation.isEnabled()) {
checkWhen(touch("src/foo.kt"), null, arrayOf(klass("kotlinProject", "Foo")))
checkWhen(touch("src/foo.kt"), null, arrayOf(module("kotlinProject"), klass("kotlinProject", "Foo")))
}
else {
val allClasses = myProject.outputPaths()
@@ -461,8 +470,8 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
assertFilesNotExistInOutput(module, *EXCLUDE_FILES)
if (IncrementalCompilation.isEnabled()) {
checkWhen(touch("src/foo.kt"), null, arrayOf(klass("kotlinProject", "Foo")))
checkWhen(touch("src/dir/subdir/bar.kt"), null, arrayOf(klass("kotlinProject", "Bar")))
checkWhen(touch("src/foo.kt"), null, arrayOf(module("kotlinProject"), klass("kotlinProject", "Foo")))
checkWhen(touch("src/dir/subdir/bar.kt"), null, arrayOf(module("kotlinProject"), klass("kotlinProject", "Bar")))
}
else {
val allClasses = myProject.outputPaths()
@@ -482,7 +491,7 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
assertFilesNotExistInOutput(module, *EXCLUDE_FILES)
if (IncrementalCompilation.isEnabled()) {
checkWhen(touch("src/foo.kt"), null, arrayOf(klass("kotlinProject", "Foo")))
checkWhen(touch("src/foo.kt"), null, arrayOf(module("kotlinProject"), klass("kotlinProject", "Foo")))
}
else {
val allClasses = myProject.outputPaths()

View File

@@ -87,7 +87,7 @@ class KotlinJpsBuildTestIncremental : KotlinJpsBuildTest() {
checkWhen(touch("src/main.kt"), null, packageClasses("kotlinProject", "src/main.kt", "foo.MainKt"))
checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooKt"))
checkWhen(touch("src/Bar.kt"), arrayOf("src/Bar.kt"), arrayOf(klass("kotlinProject", "foo.Bar")))
checkWhen(touch("src/Bar.kt"), arrayOf("src/Bar.kt"), arrayOf(module("kotlinProject"), klass("kotlinProject", "foo.Bar")))
checkWhen(del("src/main.kt"),
pathsToCompile = null,
@@ -96,7 +96,7 @@ class KotlinJpsBuildTestIncremental : KotlinJpsBuildTest() {
assertFilesNotExistInOutput(module, "foo/MainKt.class")
checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooKt"))
checkWhen(touch("src/Bar.kt"), null, arrayOf(klass("kotlinProject", "foo.Bar")))
checkWhen(touch("src/Bar.kt"), null, arrayOf(module("kotlinProject"), klass("kotlinProject", "foo.Bar")))
}
fun testManyFilesForPackage() {

View File

@@ -21,6 +21,7 @@ Exit code: NOTHING_DONE
Building module1
Cleaning output files:
out/production/module1/A.class
out/production/module1/META-INF/module1.kotlin_module
End of files
Compiling files:
module1/src/A.kt
@@ -29,6 +30,7 @@ Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module1/B.class
out/production/module1/META-INF/module1.kotlin_module
End of files
Compiling files:
module1/src/B.kt

View File

@@ -3,6 +3,7 @@
Building module1
Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
Cleaning output files:
out/production/module1/META-INF/module1.kotlin_module
out/production/module1/a/A.class
End of files
Compiling files:
@@ -13,6 +14,7 @@ Exit code: OK
Building module2
Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
Cleaning output files:
out/production/module2/META-INF/module2.kotlin_module
out/production/module2/b/B.class
End of files
Compiling files:
@@ -23,6 +25,7 @@ Exit code: OK
Building module3
Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
Cleaning output files:
out/production/module3/META-INF/module3.kotlin_module
out/production/module3/c/C.class
End of files
Compiling files:
@@ -34,6 +37,7 @@ Building module4
Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
Cleaning output files:
out/production/module4/D/D.class
out/production/module4/META-INF/module4.kotlin_module
End of files
Compiling files:
module4/src/D.kt

View File

@@ -3,6 +3,7 @@
Building module1
Actions after cache changed: [REBUILD_ALL_KOTLIN, DO_NOTHING]
Cleaning output files:
out/production/module1/META-INF/module1.kotlin_module
out/production/module1/a/A.class
End of files
Compiling files:
@@ -18,6 +19,7 @@ Exit code: OK
Building module2
Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
Cleaning output files:
out/production/module2/META-INF/module2.kotlin_module
out/production/module2/b/B.class
End of files
Compiling files:
@@ -28,6 +30,7 @@ Exit code: OK
Building module3
Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
Cleaning output files:
out/production/module3/META-INF/module3.kotlin_module
out/production/module3/c/C.class
End of files
Compiling files:
@@ -39,6 +42,7 @@ Building module4
Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
Cleaning output files:
out/production/module4/D/D.class
out/production/module4/META-INF/module4.kotlin_module
End of files
Compiling files:
module4/src/D.kt

View File

@@ -37,6 +37,7 @@ Exit code: OK
Building module4
Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
Cleaning output files:
out/production/module4/META-INF/module4.kotlin_module
out/production/module4/module4/D.class
End of files
Compiling files:

View File

@@ -42,6 +42,7 @@ Exit code: OK
Building module4
Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
Cleaning output files:
out/production/module4/META-INF/module4.kotlin_module
out/production/module4/module4/D.class
End of files
Compiling files:

View File

@@ -14,6 +14,7 @@ Exit code: OK
Building module2
Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
Cleaning output files:
out/production/module2/META-INF/module2.kotlin_module
out/production/module2/b/B.class
End of files
Compiling files:

View File

@@ -17,6 +17,7 @@ Exit code: OK
Building module2
Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
Cleaning output files:
out/production/module2/META-INF/module2.kotlin_module
out/production/module2/b/B.class
End of files
Compiling files:

View File

@@ -15,6 +15,7 @@ Exit code: OK
Building module2
Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
Cleaning output files:
out/production/module2/META-INF/module2.kotlin_module
out/production/module2/b/B.class
End of files
Compiling files:

View File

@@ -18,6 +18,7 @@ Exit code: OK
Building module2
Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
Cleaning output files:
out/production/module2/META-INF/module2.kotlin_module
out/production/module2/b/B.class
End of files
Compiling files:

View File

@@ -51,6 +51,7 @@ Exit code: OK
Building module4
Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
Cleaning output files:
out/production/module4/META-INF/module4.kotlin_module
out/production/module4/module4/D.class
End of files
Compiling files:

View File

@@ -64,6 +64,7 @@ Exit code: OK
Building module4
Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
Cleaning output files:
out/production/module4/META-INF/module4.kotlin_module
out/production/module4/module4/D.class
End of files
Compiling files:

View File

@@ -34,6 +34,7 @@ Exit code: NOTHING_DONE
Building module1
Actions after cache changed: [REBUILD_ALL_KOTLIN, REBUILD_CHUNK]
Cleaning output files:
out/production/module1/META-INF/module1.kotlin_module
out/production/module1/foo/Z.class
End of files
Compiling files:
@@ -66,6 +67,7 @@ Exit code: OK
Building module3
Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
Cleaning output files:
out/production/module3/META-INF/module3.kotlin_module
out/production/module3/foo/D.class
End of files
Compiling files:
@@ -76,6 +78,7 @@ Exit code: OK
Building module4
Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING]
Cleaning output files:
out/production/module4/META-INF/module4.kotlin_module
out/production/module4/foo/E.class
End of files
Compiling files:

View File

@@ -2,6 +2,7 @@
Cleaning output files:
out/production/module/Ann1.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/Ann1.kt

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/A.class
End of files
Compiling files:
@@ -54,6 +55,7 @@ Exit code: OK
================ Step #2 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/A.class
out/production/module/foo/Ann.class
End of files

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/AChild.class
End of files
Compiling files:

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/A.class
End of files
Compiling files:

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/A.class
End of files
Compiling files:

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/A.class
End of files
Compiling files:

View File

@@ -10,6 +10,7 @@ Cleaning output files:
out/production/module/B.class
out/production/module/C$Z.class
out/production/module/C.class
out/production/module/META-INF/module.kotlin_module
out/production/module/X.class
End of files
Compiling files:

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/A.class
End of files
Marked as dirty by Kotlin:
@@ -13,7 +14,6 @@ Marked as dirty by Kotlin:
src/useBbar.kt
src/useCbaz.kt
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/B.class
out/production/module/foo/C.class
out/production/module/use/CreateAKt.class

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/A.class
End of files
Marked as dirty by Kotlin:
@@ -10,7 +11,6 @@ Marked as dirty by Kotlin:
src/useAfoo.kt
src/useBbar.kt
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/B.class
out/production/module/use/CreateAKt.class
out/production/module/use/CreateBKt.class

View File

@@ -2,6 +2,7 @@
Cleaning output files:
out/production/module/B.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/B.kt

View File

@@ -3,6 +3,7 @@
Cleaning output files:
out/production/module/A$AA.class
out/production/module/A.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/A.kt

View File

@@ -3,6 +3,7 @@
Cleaning output files:
out/production/module/A$AA.class
out/production/module/A.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/A.kt

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/A.class
End of files
Compiling files:

View File

@@ -2,6 +2,7 @@
Cleaning output files:
out/production/module/Enum.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/Enum.kt

View File

@@ -2,6 +2,7 @@
Cleaning output files:
out/production/module/Enum.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/Enum.kt

View File

@@ -2,6 +2,7 @@
Cleaning output files:
out/production/module/Enum.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/Enum.kt

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/A.class
out/production/module/foo/B.class
End of files

View File

@@ -2,6 +2,7 @@
Cleaning output files:
out/production/module/A.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/A.kt

View File

@@ -2,6 +2,7 @@
Cleaning output files:
out/production/module/B.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/B.kt

View File

@@ -2,6 +2,7 @@
Cleaning output files:
out/production/module/B.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/B.kt

View File

@@ -2,6 +2,7 @@
Cleaning output files:
out/production/module/B.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/B.kt

View File

@@ -2,6 +2,7 @@
Cleaning output files:
out/production/module/B.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/B.kt

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/A.class
End of files
Compiling files:

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/A.class
End of files
Compiling files:

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/A.class
End of files
Compiling files:

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/A.class
End of files
Compiling files:

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/A.class
End of files
Compiling files:

View File

@@ -2,6 +2,7 @@
Cleaning output files:
out/production/module/A.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/A.kt
@@ -12,6 +13,7 @@ Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/B.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/B.kt

View File

@@ -2,6 +2,7 @@
Cleaning output files:
out/production/module/B.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/B.kt
@@ -12,6 +13,7 @@ Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/BA.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/BA.kt

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/A$x$1.class
out/production/module/foo/A.class
End of files

View File

@@ -4,6 +4,7 @@ Cleaning output files:
out/production/module/A.class
out/production/module/B.class
out/production/module/Base.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/Base.kt

View File

@@ -4,6 +4,7 @@ Cleaning output files:
out/production/module/Base.class
out/production/module/Impl1.class
out/production/module/Intermediate.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/Base.kt

View File

@@ -4,6 +4,7 @@ Cleaning output files:
out/production/module/Base$A.class
out/production/module/Base$B.class
out/production/module/Base.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/Base.kt

View File

@@ -2,6 +2,7 @@
Cleaning output files:
out/production/module/A.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/A.kt
@@ -15,7 +16,6 @@ Conflicting overloads: public constructor A(x: String) defined in A, public fun
Cleaning output files:
out/production/module/AConstructorFunctionKt.class
out/production/module/META-INF/module.kotlin_module
End of files
Cleaning output files:
out/production/module/CreateAFromStringKt.class

View File

@@ -2,6 +2,7 @@
Cleaning output files:
out/production/module/A.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/A.kt

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/A.class
End of files
Compiling files:
@@ -55,6 +56,7 @@ Exit code: OK
================ Step #2 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/A.class
End of files
Compiling files:

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/A.class
End of files
Compiling files:

View File

@@ -2,6 +2,7 @@
Cleaning output files:
out/production/module/A.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/A.kt

View File

@@ -9,6 +9,7 @@ Compiling files:
src/JavaClass.java
End of files
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/Usage.class
End of files
Compiling files:

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/test/Klass$Companion.class
out/production/module/test/Klass.class
End of files

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/test/Klass$Companion.class
out/production/module/test/Klass.class
End of files

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/test/Klass$Companion.class
out/production/module/test/Klass.class
End of files

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/test/Klass$Companion.class
out/production/module/test/Klass.class
End of files

View File

@@ -12,6 +12,7 @@ Marked as dirty by Kotlin:
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/usage/Usage.class
End of files
Compiling files:

View File

@@ -12,6 +12,7 @@ Marked as dirty by Kotlin:
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/usage/Usage$Companion.class
out/production/module/usage/Usage.class
End of files

View File

@@ -12,6 +12,7 @@ Marked as dirty by Kotlin:
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/usage/Usage.class
End of files
Compiling files:

View File

@@ -12,6 +12,7 @@ Marked as dirty by Kotlin:
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/usage/Usage.class
End of files
Compiling files:

View File

@@ -12,6 +12,7 @@ Marked as dirty by Kotlin:
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/usage/Usage.class
End of files
Compiling files:

View File

@@ -12,6 +12,7 @@ Marked as dirty by Kotlin:
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/usage/Usage.class
End of files
Compiling files:

View File

@@ -12,6 +12,7 @@ Marked as dirty by Kotlin:
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/usage/Usage.class
End of files
Compiling files:

View File

@@ -2,6 +2,7 @@
Cleaning output files:
out/production/module/A.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/A.kt

View File

@@ -4,6 +4,7 @@ Cleaning output files:
out/production/module/A.class
out/production/module/B.class
out/production/module/C.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/main.kt

View File

@@ -2,6 +2,7 @@
Building module1, module2, module3
Cleaning output files:
out/production/module1/META-INF/module1.kotlin_module
out/production/module1/foo/A.class
End of files
Compiling files:
@@ -16,8 +17,11 @@ Marked as dirty by Kotlin:
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module1/META-INF/module1.kotlin_module
out/production/module1/foo/D.class
out/production/module2/META-INF/module2.kotlin_module
out/production/module2/foo/B.class
out/production/module3/META-INF/module3.kotlin_module
out/production/module3/foo/C.class
End of files
Compiling files:
@@ -59,6 +63,7 @@ Exit code: NOTHING_DONE
------------------------------------------
Building module4
Cleaning output files:
out/production/module4/META-INF/module4.kotlin_module
out/production/module4/foo/E.class
End of files
Compiling files:
@@ -68,6 +73,7 @@ Exit code: OK
------------------------------------------
Building module5
Cleaning output files:
out/production/module5/META-INF/module5.kotlin_module
out/production/module5/foo/F.class
End of files
Compiling files:

View File

@@ -2,6 +2,7 @@
Building module1, module2
Cleaning output files:
out/production/module2/META-INF/module2.kotlin_module
out/production/module2/b/B.class
out/production/module2/b/BB.class
End of files
@@ -13,6 +14,7 @@ Marked as dirty by Kotlin:
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module1/META-INF/module1.kotlin_module
out/production/module1/a/A.class
out/production/module1/a/AA.class
End of files

View File

@@ -4,6 +4,7 @@ Building module1
Exit code: NOTHING_DONE
------------------------------------------
Cleaning output files:
out/production/module2/META-INF/module2.kotlin_module
out/production/module2/foo/A.class
End of files
Building module2
@@ -14,7 +15,6 @@ Marked as dirty by Kotlin:
module2/src/useAfoo.kt
module2/src/useBbar.kt
Cleaning output files:
out/production/module2/META-INF/module2.kotlin_module
out/production/module2/foo/B.class
out/production/module2/use/CreateAKt.class
out/production/module2/use/CreateBKt.class

View File

@@ -16,6 +16,7 @@ Exit code: NOTHING_DONE
------------------------------------------
Building module2
Cleaning output files:
out/production/module2/META-INF/module2.kotlin_module
out/production/module2/usage/Usage.class
End of files
Compiling files:

View File

@@ -2,6 +2,7 @@
Building module1
Cleaning output files:
out/production/module1/META-INF/module1.kotlin_module
out/production/module1/foo/A.class
End of files
Compiling files:

View File

@@ -2,6 +2,7 @@
Building module1
Cleaning output files:
out/production/module1/META-INF/module1.kotlin_module
out/production/module1/a/A.class
End of files
Compiling files:

View File

@@ -2,6 +2,7 @@
Building module1
Cleaning output files:
out/production/module1/META-INF/module1.kotlin_module
out/production/module1/a/A.class
End of files
Compiling files:

View File

@@ -2,6 +2,7 @@
Building module1
Cleaning output files:
out/production/module1/META-INF/module1.kotlin_module
out/production/module1/foo/A.class
End of files
Compiling files:

View File

@@ -2,6 +2,7 @@
Building module1
Cleaning output files:
out/production/module1/META-INF/module1.kotlin_module
out/production/module1/foo/A.class
End of files
Compiling files:
@@ -18,6 +19,7 @@ Exit code: NOTHING_DONE
------------------------------------------
Building module2
Cleaning output files:
out/production/module2/META-INF/module2.kotlin_module
out/production/module2/foo/AChild.class
End of files
Compiling files:
@@ -33,6 +35,7 @@ Cannot access 'A': it is private in file
Building module1
Cleaning output files:
out/production/module1/META-INF/module1.kotlin_module
out/production/module1/foo/A.class
End of files
Compiling files:
@@ -55,6 +58,7 @@ Exit code: OK
------------------------------------------
Building module3
Cleaning output files:
out/production/module3/META-INF/module3.kotlin_module
out/production/module3/foo/AGrandChild.class
End of files
Compiling files:
@@ -64,6 +68,9 @@ End of files
Exit code: OK
------------------------------------------
Building module4
Cleaning output files:
out/production/module4/META-INF/module4.kotlin_module
End of files
Compiling files:
module4/src/importAGrandChild.kt
End of files

View File

@@ -2,6 +2,7 @@
Building module1
Cleaning output files:
out/production/module1/META-INF/module1.kotlin_module
out/production/module1/foo/A.class
End of files
Compiling files:
@@ -17,6 +18,7 @@ Exit code: NOTHING_DONE
------------------------------------------
Building module2
Cleaning output files:
out/production/module2/META-INF/module2.kotlin_module
out/production/module2/foo/AChild.class
End of files
Compiling files:
@@ -34,6 +36,7 @@ Cannot access 'A': it is private in file
Building module1
Cleaning output files:
out/production/module1/META-INF/module1.kotlin_module
out/production/module1/foo/A.class
End of files
Compiling files:
@@ -55,6 +58,9 @@ End of files
Exit code: OK
------------------------------------------
Building module3
Cleaning output files:
out/production/module3/META-INF/module3.kotlin_module
End of files
Compiling files:
module3/src/importAChild.kt
End of files

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/a/Outer$B.class
out/production/module/a/Outer.class
End of files

View File

@@ -24,6 +24,7 @@ Marked as dirty by Kotlin:
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/test/Usage.class
End of files
Compiling files:

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/inline/Klass.class
End of files
Compiling files:

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/test/Klass$Companion.class
out/production/module/test/Klass.class
End of files
@@ -12,6 +13,7 @@ Marked as dirty by Kotlin:
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/test/Usage.class
End of files
Compiling files:

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/test/A.class
End of files
Compiling files:

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/test/Klass.class
End of files
Compiling files:

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/test/Klass.class
End of files
Compiling files:

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/A.class
End of files
Compiling files:

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/A.class
End of files
Compiling files:

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/A.class
End of files
Compiling files:

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/foo/A.class
End of files
Compiling files:

View File

@@ -13,6 +13,7 @@ Marked as dirty by Kotlin:
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/usage/UsageVal.class
out/production/module/usage/UsageVar.class
End of files
@@ -37,6 +38,7 @@ Marked as dirty by Kotlin:
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/usage/UsageVar.class
End of files
Compiling files:

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/inline/Inline.class
End of files
Compiling files:
@@ -12,6 +13,7 @@ Marked as dirty by Kotlin:
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/usage/UsageVal.class
out/production/module/usage/UsageVar.class
End of files
@@ -25,6 +27,7 @@ Exit code: OK
================ Step #2 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/inline/Inline.class
End of files
Compiling files:
@@ -35,6 +38,7 @@ Marked as dirty by Kotlin:
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/usage/UsageVar.class
End of files
Compiling files:

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/Y.class
End of files
Compiling files:
@@ -11,6 +12,7 @@ Marked as dirty by Kotlin:
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/X$main$1.class
out/production/module/X.class
End of files

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/test/Foo.class
End of files
Compiling files:

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/inline/A.class
End of files
Compiling files:
@@ -23,6 +24,7 @@ Exit code: OK
================ Step #2 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/inline/A.class
End of files
Compiling files:

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/test/ClassA.class
End of files
Compiling files:

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/test/ClassA.class
End of files
Compiling files:

View File

@@ -2,6 +2,7 @@
Cleaning output files:
out/production/module/Foo.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/b.kt
@@ -13,6 +14,7 @@ Exit code: OK
Cleaning output files:
out/production/module/Foo.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
End of files

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/test/Object.class
End of files
Compiling files:
@@ -11,6 +12,7 @@ Marked as dirty by Kotlin:
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/test/Usage.class
End of files
Compiling files:

View File

@@ -12,6 +12,7 @@ Marked as dirty by Kotlin:
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/test/Usage.class
End of files
Compiling files:

View File

@@ -1,6 +1,7 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/test/ClassA.class
End of files
Compiling files:

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