diff --git a/compiler/testData/cli/wrongAbiVersion.out b/compiler/testData/cli/wrongAbiVersion.out index 2e6d10b255b..18b68d92a0f 100644 --- a/compiler/testData/cli/wrongAbiVersion.out +++ b/compiler/testData/cli/wrongAbiVersion.out @@ -1,5 +1,5 @@ WARNING: $TESTDATA_DIR$/wrongAbiVersion.kt: (3, 9) Parameter 'x' is never used ERROR: $TESTDATA_DIR$/wrongAbiVersion.kt: (4, 3) Unresolved reference: bar -ERROR: $TESTDATA_DIR$/wrongAbiVersionLib/wrong/WrongPackage.class: (0, 0) Class 'wrong.WrongPackage' was compiled with an incompatible version of Kotlin. Its ABI version is -1, expected ABI version is 8 -ERROR: $TESTDATA_DIR$/wrongAbiVersionLib/ClassWithWrongAbiVersion.class: (0, 0) Class 'ClassWithWrongAbiVersion' was compiled with an incompatible version of Kotlin. Its ABI version is -1, expected ABI version is 8 +ERROR: $TESTDATA_DIR$/wrongAbiVersionLib/wrong/WrongPackage.class: (0, 0) Class 'wrong.WrongPackage' was compiled with an incompatible version of Kotlin. Its ABI version is -1, expected ABI version is 9 +ERROR: $TESTDATA_DIR$/wrongAbiVersionLib/ClassWithWrongAbiVersion.class: (0, 0) Class 'ClassWithWrongAbiVersion' was compiled with an incompatible version of Kotlin. Its ABI version is -1, expected ABI version is 9 COMPILATION_ERROR diff --git a/compiler/testData/codegen/topLevelMemberInvocation/twoModules/a.jar b/compiler/testData/codegen/topLevelMemberInvocation/twoModules/a.jar index 7bb8c5831ad..8307a0930ff 100644 Binary files a/compiler/testData/codegen/topLevelMemberInvocation/twoModules/a.jar and b/compiler/testData/codegen/topLevelMemberInvocation/twoModules/a.jar differ diff --git a/compiler/testData/compileKotlinAgainstBinariesCustom/brokenJarWithNoClassForObjectProperty/broken.jar b/compiler/testData/compileKotlinAgainstBinariesCustom/brokenJarWithNoClassForObjectProperty/broken.jar index 1e6926f8ba3..b42c5758714 100644 Binary files a/compiler/testData/compileKotlinAgainstBinariesCustom/brokenJarWithNoClassForObjectProperty/broken.jar and b/compiler/testData/compileKotlinAgainstBinariesCustom/brokenJarWithNoClassForObjectProperty/broken.jar differ diff --git a/compiler/testData/compileKotlinAgainstBinariesCustom/duplicateObjectInBinaryAndSources/objectBinaries.jar b/compiler/testData/compileKotlinAgainstBinariesCustom/duplicateObjectInBinaryAndSources/objectBinaries.jar index 2c0a8d75518..72beb54369a 100644 Binary files a/compiler/testData/compileKotlinAgainstBinariesCustom/duplicateObjectInBinaryAndSources/objectBinaries.jar and b/compiler/testData/compileKotlinAgainstBinariesCustom/duplicateObjectInBinaryAndSources/objectBinaries.jar differ diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-1.jar b/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-1.jar index a52d47d5033..8f3b55848e5 100644 Binary files a/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-1.jar and b/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-1.jar differ diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-2.jar b/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-2.jar index a52d47d5033..8f3b55848e5 100644 Binary files a/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-2.jar and b/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-2.jar differ diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/MissingEnum.jar b/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/MissingEnum.jar index 7523ae2bc0f..826bfcc401c 100644 Binary files a/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/MissingEnum.jar and b/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/MissingEnum.jar differ diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java index 26611bce03d..6f3cfaa7b99 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java @@ -25,7 +25,7 @@ public final class JvmAbi { * This constant is used to identify binary format (class file) versions * If you change class file metadata format and/or naming conventions, please increase this number */ - public static final int VERSION = 8; + public static final int VERSION = 9; public static final String TRAIT_IMPL_CLASS_NAME = "$TImpl"; public static final String TRAIT_IMPL_SUFFIX = "$" + TRAIT_IMPL_CLASS_NAME; diff --git a/idea/testData/codeInsight/overrideImplement/withLib/fakeOverride.jar b/idea/testData/codeInsight/overrideImplement/withLib/fakeOverride.jar index 22d2c988d22..ecf51a2d503 100644 Binary files a/idea/testData/codeInsight/overrideImplement/withLib/fakeOverride.jar and b/idea/testData/codeInsight/overrideImplement/withLib/fakeOverride.jar differ diff --git a/idea/testData/completion/basic/custom/TopLevelNonImportedExtFun.jar b/idea/testData/completion/basic/custom/TopLevelNonImportedExtFun.jar index 65814ae7788..a0a71fc6d55 100644 Binary files a/idea/testData/completion/basic/custom/TopLevelNonImportedExtFun.jar and b/idea/testData/completion/basic/custom/TopLevelNonImportedExtFun.jar differ diff --git a/idea/testData/completion/basic/custom/TopLevelNonImportedFun.jar b/idea/testData/completion/basic/custom/TopLevelNonImportedFun.jar index 2958dd9c039..2363847668e 100644 Binary files a/idea/testData/completion/basic/custom/TopLevelNonImportedFun.jar and b/idea/testData/completion/basic/custom/TopLevelNonImportedFun.jar differ