From 9c8ee4eae6c0c4cca22ff6f6007d2f95cc6dbfa2 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 22 Sep 2014 11:43:30 +0400 Subject: [PATCH] Use '$' instead of '-' in package part class names Otherwise some tools break (e.g. CheckMethodAdapter in ASM, used in generic signature writer) because they expect class names to be Java identifiers. Some tests fixed, some will be fixed in future commits Original commit: c57441b51b65cfe72f57072978c5e03570023663 --- .../jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt | 4 ++-- .../jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt | 8 +++++--- .../incremental/circularDependency/simple/build.log | 6 +++--- .../pureKotlin/accessingFunctionsViaPackagePart/build.log | 4 ++-- .../pureKotlin/accessingPropertiesViaField/build.log | 6 +++--- .../incremental/pureKotlin/allConstants/build.log | 4 ++-- .../testData/incremental/pureKotlin/annotations/build.log | 2 +- .../pureKotlin/classInlineFunctionChanged/build.log | 2 +- .../incremental/pureKotlin/classRecreated/build.log | 4 ++-- .../pureKotlin/classSignatureChanged/build.log | 4 ++-- .../pureKotlin/classSignatureUnchanged/build.log | 2 +- .../pureKotlin/compilationErrorThenFixed/build.log | 2 +- .../incremental/pureKotlin/constantsUnchanged/build.log | 2 +- .../incremental/pureKotlin/defaultArguments/build.log | 2 +- .../pureKotlin/dependencyClassReferenced/build.log | 2 +- .../pureKotlin/filesExchangePackages/build.log | 6 +++--- .../incremental/pureKotlin/independentClasses/build.log | 2 +- .../inlineFunctionsCircularDependency/build.log | 6 +++--- .../pureKotlin/inlineFunctionsUnchanged/build.log | 2 +- .../pureKotlin/multiplePackagesModified/build.log | 6 +++--- .../incremental/pureKotlin/objectValChanged/build.log | 2 +- .../incremental/pureKotlin/ourClassReferenced/build.log | 4 ++-- .../pureKotlin/packageConstantChanged/build.log | 2 +- .../incremental/pureKotlin/packageFileAdded/build.log | 2 +- .../pureKotlin/packageFileChangedPackage/build.log | 4 ++-- .../packageFileChangedThenOtherRemoved/build.log | 6 +++--- .../incremental/pureKotlin/packageFileRemoved/build.log | 8 ++++---- .../pureKotlin/packageFilesChangedInTurn/build.log | 4 ++-- .../packageInlineFunctionAccessingField/build.log | 2 +- .../pureKotlin/packageInlineFunctionChanged/build.log | 8 ++++---- .../packageInlineFunctionFromOurPackage/build.log | 2 +- .../incremental/pureKotlin/packageRecreated/build.log | 2 +- .../pureKotlin/packageRecreatedAfterRenaming/build.log | 4 ++-- .../incremental/pureKotlin/packageRemoved/build.log | 6 +++--- .../incremental/pureKotlin/returnTypeChanged/build.log | 4 ++-- .../pureKotlin/simpleClassDependency/build.log | 2 +- .../pureKotlin/soleFileChangesPackage/build.log | 4 ++-- .../pureKotlin/topLevelFunctionSameSignature/build.log | 2 +- .../pureKotlin/topLevelMembersInTwoFiles/build.log | 4 ++-- 39 files changed, 75 insertions(+), 73 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 684e1555258..fab5c5f1e39 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -413,7 +413,7 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC result.add(packagePartClassName) } else { - val previousPackageFqName = JvmClassName.byInternalName(packagePartClassName).getFqNameForClassNameWithoutDollars().parent() + val previousPackageFqName = JvmClassName.byInternalName(packagePartClassName).getPackageFqName() val currentPackageFqName = compiledSourceFilesToFqName[sourceFile] if (currentPackageFqName != null && currentPackageFqName != previousPackageFqName.asString()) { result.add(packagePartClassName) @@ -432,7 +432,7 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC map.processKeysWithExistingMapping { key -> val packagePartClassName = map[key!!]!! - val packageFqName = JvmClassName.byInternalName(packagePartClassName).getFqNameForClassNameWithoutDollars().parent() + val packageFqName = JvmClassName.byInternalName(packagePartClassName).getPackageFqName() result.add(packageFqName) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt index 408760e6c0c..4e6509593b8 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt @@ -241,9 +241,11 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { override fun logLine(message: String?) { fun String.replaceHashWithStar(): String { - val lastHyphen = this.lastIndexOf('-') - if (lastHyphen != -1 && substring(lastHyphen + 1).matches("[0-9a-f]{1,8}\\.class")) { - return substring(0, lastHyphen) + "-*.class" + if (this contains "Package$") { + val lastDollar = this.lastIndexOf('$') + if (lastDollar != -1 && substring(lastDollar + 1).matches("[0-9a-f]{1,8}\\.class")) { + return substring(0, lastDollar) + "$*.class" + } } return this } diff --git a/jps/jps-plugin/testData/incremental/circularDependency/simple/build.log b/jps/jps-plugin/testData/incremental/circularDependency/simple/build.log index ee01130e93f..03390944246 100644 --- a/jps/jps-plugin/testData/incremental/circularDependency/simple/build.log +++ b/jps/jps-plugin/testData/incremental/circularDependency/simple/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module2/b/BPackage-module2_b-*.class +out/production/module2/b/BPackage$module2_b$*.class out/production/module2/b/BPackage.class End of files Compiling files: @@ -7,9 +7,9 @@ module2/src/module2_b.kt End of files Cleaning output files: out/production/module1/a/A.class -out/production/module1/a/APackage-module1_a-*.class +out/production/module1/a/APackage$module1_a$*.class out/production/module1/a/APackage.class End of files Compiling files: module1/src/module1_a.kt -End of files \ No newline at end of file +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log index ee902811972..38c3e40467d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/test/TestPackage-b-*.class -out/production/module/test/TestPackage-usage-*.class +out/production/module/test/TestPackage$b$*.class +out/production/module/test/TestPackage$usage$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log index 5e565b356f6..38c3e40467d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log @@ -1,6 +1,6 @@ - Cleaning output files: -out/production/module/test/TestPackage-b-*.class -out/production/module/test/TestPackage-usage-*.class +Cleaning output files: +out/production/module/test/TestPackage$b$*.class +out/production/module/test/TestPackage$usage$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log index 22f4d62f635..aec0fb80c88 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-const-*.class +out/production/module/test/TestPackage$const$*.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -8,7 +8,7 @@ End of files Cleaning output files: -out/production/module/test/TestPackage-const-*.class +out/production/module/test/TestPackage$const$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log index 3e90e7f7e51..830fd9d2ae7 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-other-*.class +out/production/module/test/TestPackage$other$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log index 41261841973..eafec833b17 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log @@ -6,7 +6,7 @@ src/inline.kt End of files Cleaning output files: out/production/module/inline/Klass.class -out/production/module/usage/UsagePackage-usage-*.class +out/production/module/usage/UsagePackage$usage$*.class out/production/module/usage/UsagePackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log index d59630c7ce7..c326658bdd5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log @@ -9,9 +9,9 @@ Compiling files: src/A.kt End of files Cleaning output files: -out/production/module/test/TestPackage-other-*.class +out/production/module/test/TestPackage$other$*.class out/production/module/test/TestPackage.class End of files Compiling files: src/other.kt -End of files \ No newline at end of file +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log index 03df388cc2b..22a85136d38 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log @@ -5,9 +5,9 @@ Compiling files: src/class.kt End of files Cleaning output files: -out/production/module/test/TestPackage-usage-*.class +out/production/module/test/TestPackage$usage$*.class out/production/module/test/TestPackage.class End of files Compiling files: src/usage.kt -End of files \ No newline at end of file +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log index cc8924d4caa..5c686f1943a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log @@ -3,4 +3,4 @@ out/production/module/test/Klass.class End of files Compiling files: src/class.kt -End of files \ No newline at end of file +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/build.log index f4fb938c215..5a8dee5393d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/_DefaultPackage-usage-*.class +out/production/module/_DefaultPackage$usage$*.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log index 7e364968874..e7a3af58bd6 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log @@ -1,7 +1,7 @@ Cleaning output files: out/production/module/test/Klass$object.class out/production/module/test/Klass.class -out/production/module/test/TestPackage-const-*.class +out/production/module/test/TestPackage$const$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log index 9fede6968ce..74e194ec93c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/_DefaultPackage-a-*.class +out/production/module/_DefaultPackage$a$*.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log index 37112dda098..4e18829e5c5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log index 492218cc4a6..a135c67f323 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/bar/BarPackage-c-*.class +out/production/module/bar/BarPackage$c$*.class out/production/module/bar/BarPackage.class -out/production/module/foo/FooPackage-b-*.class +out/production/module/foo/FooPackage$b$*.class out/production/module/foo/FooPackage.class End of files Compiling files: @@ -9,7 +9,7 @@ src/b.kt src/c.kt End of files Cleaning output files: -out/production/module/foo/FooPackage-a-*.class +out/production/module/foo/FooPackage$a$*.class out/production/module/foo/FooPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log index b33bb4d2a49..e4d8b80cbf7 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log @@ -3,4 +3,4 @@ out/production/module/test/Foo.class End of files Compiling files: src/Foo.kt -End of files \ No newline at end of file +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log index 41097177bde..624837de297 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log @@ -1,13 +1,13 @@ Cleaning output files: -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt End of files Cleaning output files: -out/production/module/test/TestPackage-a-*.class -out/production/module/test/TestPackage-b-*.class +out/production/module/test/TestPackage$a$*.class +out/production/module/test/TestPackage$b$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log index b01a631083b..31233b36691 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/inline/InlinePackage-inline-*.class +out/production/module/inline/InlinePackage$inline$*.class out/production/module/inline/InlinePackage.class out/production/module/inline/Klass.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log index 914a8b69528..440fbd4f235 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log @@ -1,14 +1,14 @@ Cleaning output files: -out/production/module/b/BPackage-b2-*.class +out/production/module/b/BPackage$b2$*.class out/production/module/b/BPackage.class End of files Compiling files: src/a2.kt End of files Cleaning output files: -out/production/module/a/APackage-a1-*.class +out/production/module/a/APackage$a1$*.class out/production/module/a/APackage.class -out/production/module/b/BPackage-b1-*.class +out/production/module/b/BPackage$b1$*.class out/production/module/b/BPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/build.log index 388e9c57d12..06bb7395a25 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/build.log @@ -3,4 +3,4 @@ out/production/module/test/Object.class End of files Compiling files: src/const.kt -End of files \ No newline at end of file +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log index ccf56d9e65b..6d8c334b1ef 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -9,7 +9,7 @@ End of files Cleaning output files: out/production/module/klass/Klass.class -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log index dbdb31fbbf0..7cb5f4c6a48 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-const-*.class +out/production/module/test/TestPackage$const$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log index f729fb6d124..df1bd14d31c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log @@ -2,7 +2,7 @@ Compiling files: src/b.kt End of files Cleaning output files: -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log index 076add162ad..c6c913124c1 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log @@ -1,12 +1,12 @@ Cleaning output files: -out/production/module/test/TestPackage-b-*.class +out/production/module/test/TestPackage$b$*.class out/production/module/test/TestPackage.class End of files Compiling files: src/b.kt End of files Cleaning output files: -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log index cd5cce6af7e..df9c0c9e3f5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -8,13 +8,13 @@ End of files Cleaning output files: -out/production/module/test/TestPackage-b-*.class +out/production/module/test/TestPackage$b$*.class out/production/module/test/TestPackage.class End of files Compiling files: End of files Cleaning output files: -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log index 7be687a676c..e6ae4266a50 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log @@ -1,13 +1,13 @@ Cleaning output files: -out/production/module/test/TestPackage-b-*.class +out/production/module/test/TestPackage$b$*.class out/production/module/test/TestPackage.class End of files Compiling files: End of files Cleaning output files: -out/production/module/other/OtherPackage-other-*.class +out/production/module/other/OtherPackage$other$*.class out/production/module/other/OtherPackage.class -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -17,7 +17,7 @@ End of files Cleaning output files: -out/production/module/other/OtherPackage-other-*.class +out/production/module/other/OtherPackage$other$*.class out/production/module/other/OtherPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log index 87d1614e2f1..31269315f90 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -8,7 +8,7 @@ End of files Cleaning output files: -out/production/module/test/TestPackage-b-*.class +out/production/module/test/TestPackage$b$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log index 7c79a56fe44..edacd856bb9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-usage-*.class +out/production/module/test/TestPackage$usage$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log index 2b175459118..1d578c6afff 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log @@ -1,17 +1,17 @@ Cleaning output files: -out/production/module/inline/InlinePackage-inline-*.class +out/production/module/inline/InlinePackage$inline$*.class out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt End of files Cleaning output files: -out/production/module/inline/InlinePackage-inline-*.class +out/production/module/inline/InlinePackage$inline$*.class out/production/module/inline/InlinePackage.class -out/production/module/usage/UsagePackage-usage-*.class +out/production/module/usage/UsagePackage$usage$*.class out/production/module/usage/UsagePackage.class End of files Compiling files: src/inline.kt src/usage.kt -End of files \ No newline at end of file +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log index 7c79a56fe44..edacd856bb9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-usage-*.class +out/production/module/test/TestPackage$usage$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log index 73408189236..510015c0156 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log index 7cb5ae7d3e1..fc781a99d2d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -11,7 +11,7 @@ Compiling files: src/b.kt End of files Cleaning output files: -out/production/module/test2/Test2Package-a-*.class +out/production/module/test2/Test2Package$a$*.class out/production/module/test2/Test2Package.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log index c307a197264..449c2b5fdd7 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log @@ -1,9 +1,9 @@ Cleaning output files: -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Cleaning output files: -out/production/module/test/TestPackage-b-*.class +out/production/module/test/TestPackage$b$*.class End of files Compiling files: -End of files \ No newline at end of file +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log index 22b74887df0..4b0a58ace9a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log @@ -1,12 +1,12 @@ Cleaning output files: -out/production/module/test/TestPackage-fun-*.class +out/production/module/test/TestPackage$fun$*.class out/production/module/test/TestPackage.class End of files Compiling files: src/fun.kt End of files Cleaning output files: -out/production/module/test/TestPackage-usage-*.class +out/production/module/test/TestPackage$usage$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log index 2cfeb2be275..cd31e5c6326 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log @@ -4,4 +4,4 @@ out/production/module/test/Foo.class End of files Compiling files: src/Foo.kt -End of files \ No newline at end of file +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log index 3c8fdd9ea17..74244f566b2 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/foo/FooPackage-a-*.class +out/production/module/foo/FooPackage$a$*.class out/production/module/foo/FooPackage.class End of files Compiling files: src/a.kt -End of files \ No newline at end of file +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log index 4a956843b6d..560795823cd 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-fun-*.class +out/production/module/test/TestPackage$fun$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log index 6e7a5e35e00..4e18829e5c5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt -End of files \ No newline at end of file +End of files