Add several subclasses of BinaryVersion

To simplify comparison of expected vs actual versions in the future

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/AbiVersionUtil.java

@@ -20,8 +20,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.serialization.deserialization.BinaryVersion;
 
 public final class AbiVersionUtil {
-    public static final BinaryVersion INVALID_VERSION = BinaryVersion.create(new int[0]);
-
     public static boolean isAbiVersionCompatible(@NotNull BinaryVersion actual) {
         return actual.isCompatibleTo(JvmAbi.VERSION);
     }

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java

@@ -26,7 +26,6 @@ import org.jetbrains.kotlin.name.ClassId;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.name.Name;
 import org.jetbrains.kotlin.platform.JavaToKotlinClassMap;
-import org.jetbrains.kotlin.serialization.deserialization.BinaryVersion;
 import org.jetbrains.kotlin.util.capitalizeDecapitalize.CapitalizeDecapitalizeKt;
 
 import static org.jetbrains.kotlin.resolve.DescriptorUtils.isClassOrEnumClass;
@@ -43,7 +42,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(1, 0, 2);
+    public static final JvmBytecodeBinaryVersion VERSION = JvmBytecodeBinaryVersion.create(1, 0, 2);
 
     public static final String DEFAULT_IMPLS_CLASS_NAME = "DefaultImpls";
     public static final String DEFAULT_IMPLS_SUFFIX = "$" + DEFAULT_IMPLS_CLASS_NAME;

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmBytecodeBinaryVersion.kt

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.load.java
+
+import org.jetbrains.kotlin.serialization.deserialization.BinaryVersion
+
+class JvmBytecodeBinaryVersion protected constructor(
+        major: Int, minor: Int, patch: Int, rest: List<Int>
+) : BinaryVersion(major, minor, patch, rest) {
+    companion object {
+        @JvmField
+        val INVALID_VERSION = JvmBytecodeBinaryVersion.create(IntArray(0))
+
+        @JvmStatic
+        fun create(version: IntArray) = create(version, ::JvmBytecodeBinaryVersion)
+
+        @JvmStatic
+        fun create(major: Int, minor: Int, patch: Int) = create(major, minor, patch, ::JvmBytecodeBinaryVersion)
+    }
+}

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt

@@ -17,7 +17,7 @@
 package org.jetbrains.kotlin.load.kotlin
 
 import org.jetbrains.kotlin.load.java.AbiVersionUtil
-import org.jetbrains.kotlin.serialization.deserialization.BinaryVersion
+import org.jetbrains.kotlin.load.java.JvmBytecodeBinaryVersion
 import org.jetbrains.kotlin.serialization.jvm.JvmPackageTable
 import java.io.ByteArrayInputStream
 import java.io.DataInputStream
@@ -41,7 +41,7 @@ class ModuleMapping private constructor(val packageFqName2Parts: Map<String, Pac
             val inputStream = DataInputStream(ByteArrayInputStream(proto))
             val size = inputStream.readInt()
 
-            val version = BinaryVersion.create((0..size - 1).map { inputStream.readInt() }.toIntArray())
+            val version = JvmBytecodeBinaryVersion.create((0..size - 1).map { inputStream.readInt() }.toIntArray())
 
             if (AbiVersionUtil.isAbiVersionCompatible(version)) {
                 val parseFrom = JvmPackageTable.PackageTable.parseFrom(inputStream)

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor.java

@@ -20,6 +20,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.descriptors.SourceElement;
 import org.jetbrains.kotlin.load.java.AbiVersionUtil;
+import org.jetbrains.kotlin.load.java.JvmBytecodeBinaryVersion;
 import org.jetbrains.kotlin.name.ClassId;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.name.Name;
@@ -45,7 +46,7 @@ public class ReadKotlinClassHeaderAnnotationVisitor implements AnnotationVisitor
         HEADER_KINDS.put(ClassId.topLevel(KOTLIN_SYNTHETIC_CLASS), SYNTHETIC_CLASS);
     }
 
-    private BinaryVersion version = AbiVersionUtil.INVALID_VERSION;
+    private BinaryVersion version = JvmBytecodeBinaryVersion.INVALID_VERSION;
     private String multifileClassName = null;
     private String[] filePartClassNames = null;
     private String[] annotationData = null;
@@ -131,7 +132,7 @@ public class ReadKotlinClassHeaderAnnotationVisitor implements AnnotationVisitor
 
             String string = name.asString();
             if (VERSION_FIELD_NAME.equals(string)) {
-                version = value instanceof int[] ? BinaryVersion.create((int[]) value) : AbiVersionUtil.INVALID_VERSION;
+                version = value instanceof int[] ? JvmBytecodeBinaryVersion.create((int[]) value) : JvmBytecodeBinaryVersion.INVALID_VERSION;
             }
             else if (MULTIFILE_CLASS_NAME_FIELD_NAME.equals(string)) {
                 multifileClassName = value instanceof String ? (String) value : null;