From 1c280c96b67331820f740c61932e1114aac5c9f4 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 19 Oct 2015 21:28:05 +0300 Subject: [PATCH] Set binary version to 1.0.0 --- .../src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java | 7 +++++-- .../src/org/jetbrains/kotlin/load/java/AbiVersionUtil.java | 3 +-- .../src/org/jetbrains/kotlin/load/java/JvmAbi.java | 2 +- core/runtime.jvm/src/kotlin/jvm/internal/KotlinClass.java | 2 +- .../src/kotlin/jvm/internal/KotlinFileFacade.java | 2 +- .../src/kotlin/jvm/internal/KotlinFunction.java | 2 +- .../src/kotlin/jvm/internal/KotlinMultifileClass.java | 2 +- .../src/kotlin/jvm/internal/KotlinMultifileClassPart.java | 2 +- .../runtime.jvm/src/kotlin/jvm/internal/KotlinPackage.java | 2 +- .../src/kotlin/jvm/internal/KotlinSyntheticClass.java | 2 +- 10 files changed, 14 insertions(+), 12 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java index 94f7b13afa3..08badee2dbb 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java @@ -24,7 +24,10 @@ import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.binding.CalculatedClosure; -import org.jetbrains.kotlin.codegen.context.*; +import org.jetbrains.kotlin.codegen.context.CodegenContext; +import org.jetbrains.kotlin.codegen.context.FacadePartWithSourceFile; +import org.jetbrains.kotlin.codegen.context.MethodContext; +import org.jetbrains.kotlin.codegen.context.RootContext; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.kotlin.descriptors.*; @@ -217,7 +220,7 @@ public class JvmCodegenUtil { av.visit(JvmAnnotationNames.VERSION_FIELD_NAME, JvmAbi.VERSION.toArray()); // TODO: drop after some time - av.visit(JvmAnnotationNames.OLD_ABI_VERSION_FIELD_NAME, JvmAbi.VERSION.getMinor()); + av.visit(JvmAnnotationNames.OLD_ABI_VERSION_FIELD_NAME, 32); } public static void writeModuleName(@NotNull AnnotationVisitor av, @NotNull GenerationState state) { diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/AbiVersionUtil.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/AbiVersionUtil.java index 85ccbc0a307..1fa031941ce 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/AbiVersionUtil.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/AbiVersionUtil.java @@ -23,9 +23,8 @@ public final class AbiVersionUtil { public static final BinaryVersion INVALID_VERSION = BinaryVersion.create(new int[0]); public static boolean isAbiVersionCompatible(@NotNull BinaryVersion actual) { - // TODO: compare versions according to Semantic Versioning return actual.getMajor() == JvmAbi.VERSION.getMajor() && - actual.getMinor() == JvmAbi.VERSION.getMinor(); + actual.getMinor() <= JvmAbi.VERSION.getMinor(); } private AbiVersionUtil() { diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java index 5b906b530bf..2f9bff4b667 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java @@ -35,7 +35,7 @@ public final class JvmAbi { * - Patch version can be increased freely and is only supposed to be used for debugging. Increase the patch version when you * make a change to the metadata format or the bytecode which is both forward- and backward compatible. */ - public static final BinaryVersion VERSION = BinaryVersion.create(0, 32, 0); + public static final BinaryVersion VERSION = BinaryVersion.create(1, 0, 0); public static final String DEFAULT_IMPLS_CLASS_NAME = "DefaultImpls"; public static final String DEFAULT_IMPLS_SUFFIX = "$" + DEFAULT_IMPLS_CLASS_NAME; diff --git a/core/runtime.jvm/src/kotlin/jvm/internal/KotlinClass.java b/core/runtime.jvm/src/kotlin/jvm/internal/KotlinClass.java index 2e247fd95c4..b28693a6690 100644 --- a/core/runtime.jvm/src/kotlin/jvm/internal/KotlinClass.java +++ b/core/runtime.jvm/src/kotlin/jvm/internal/KotlinClass.java @@ -25,7 +25,7 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) public @interface KotlinClass { @Deprecated - int abiVersion(); + int abiVersion() default 32; int[] version() default {}; diff --git a/core/runtime.jvm/src/kotlin/jvm/internal/KotlinFileFacade.java b/core/runtime.jvm/src/kotlin/jvm/internal/KotlinFileFacade.java index 3ca22d71a21..a67358242f9 100644 --- a/core/runtime.jvm/src/kotlin/jvm/internal/KotlinFileFacade.java +++ b/core/runtime.jvm/src/kotlin/jvm/internal/KotlinFileFacade.java @@ -25,7 +25,7 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) public @interface KotlinFileFacade { @Deprecated - int abiVersion(); + int abiVersion() default 32; int[] version() default {}; diff --git a/core/runtime.jvm/src/kotlin/jvm/internal/KotlinFunction.java b/core/runtime.jvm/src/kotlin/jvm/internal/KotlinFunction.java index ce014141a85..b86e137f137 100644 --- a/core/runtime.jvm/src/kotlin/jvm/internal/KotlinFunction.java +++ b/core/runtime.jvm/src/kotlin/jvm/internal/KotlinFunction.java @@ -25,7 +25,7 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) public @interface KotlinFunction { @Deprecated - int abiVersion(); + int abiVersion() default 32; int[] version() default {}; diff --git a/core/runtime.jvm/src/kotlin/jvm/internal/KotlinMultifileClass.java b/core/runtime.jvm/src/kotlin/jvm/internal/KotlinMultifileClass.java index ba38a615774..5a7bbeedff9 100644 --- a/core/runtime.jvm/src/kotlin/jvm/internal/KotlinMultifileClass.java +++ b/core/runtime.jvm/src/kotlin/jvm/internal/KotlinMultifileClass.java @@ -25,7 +25,7 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) public @interface KotlinMultifileClass { @Deprecated - int abiVersion(); + int abiVersion() default 32; int[] version() default {}; diff --git a/core/runtime.jvm/src/kotlin/jvm/internal/KotlinMultifileClassPart.java b/core/runtime.jvm/src/kotlin/jvm/internal/KotlinMultifileClassPart.java index c8cdd3ecbe2..9ff44e2f626 100644 --- a/core/runtime.jvm/src/kotlin/jvm/internal/KotlinMultifileClassPart.java +++ b/core/runtime.jvm/src/kotlin/jvm/internal/KotlinMultifileClassPart.java @@ -25,7 +25,7 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) public @interface KotlinMultifileClassPart { @Deprecated - int abiVersion(); + int abiVersion() default 32; int[] version() default {}; diff --git a/core/runtime.jvm/src/kotlin/jvm/internal/KotlinPackage.java b/core/runtime.jvm/src/kotlin/jvm/internal/KotlinPackage.java index 1b4c5824cf6..c01227bdf2c 100644 --- a/core/runtime.jvm/src/kotlin/jvm/internal/KotlinPackage.java +++ b/core/runtime.jvm/src/kotlin/jvm/internal/KotlinPackage.java @@ -25,7 +25,7 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) public @interface KotlinPackage { @Deprecated - int abiVersion(); + int abiVersion() default 32; int[] version() default {}; diff --git a/core/runtime.jvm/src/kotlin/jvm/internal/KotlinSyntheticClass.java b/core/runtime.jvm/src/kotlin/jvm/internal/KotlinSyntheticClass.java index 06c341ebc86..c7e15eea267 100644 --- a/core/runtime.jvm/src/kotlin/jvm/internal/KotlinSyntheticClass.java +++ b/core/runtime.jvm/src/kotlin/jvm/internal/KotlinSyntheticClass.java @@ -25,7 +25,7 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) public @interface KotlinSyntheticClass { @Deprecated - int abiVersion(); + int abiVersion() default 32; int[] version() default {};