Set binary version to 1.0.0

This commit is contained in:
Alexander Udalov
2015-10-19 21:28:05 +03:00
parent 452637a946
commit 1c280c96b6
10 changed files with 14 additions and 12 deletions
@@ -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) {
@@ -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() {
@@ -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;
@@ -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 {};
@@ -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 {};
@@ -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 {};
@@ -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 {};
@@ -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 {};
@@ -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 {};
@@ -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 {};