implements
- // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.SinceKotlinInfo)
- org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoOrBuilder {
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.VersionRequirement)
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() {
- return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_SinceKotlinInfo_descriptor;
+ return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_VersionRequirement_descriptor;
}
protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
- return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_SinceKotlinInfo_fieldAccessorTable
+ return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_VersionRequirement_fieldAccessorTable
.ensureFieldAccessorsInitialized(
- org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo.Builder.class);
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Builder.class);
}
- // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo.newBuilder()
+ // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
}
@@ -26288,7 +26288,7 @@ public final class DebugProtoBuf {
bitField0_ = (bitField0_ & ~0x00000001);
versionFull_ = 0;
bitField0_ = (bitField0_ & ~0x00000002);
- level_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo.Level.ERROR;
+ level_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Level.ERROR;
bitField0_ = (bitField0_ & ~0x00000004);
errorCode_ = 0;
bitField0_ = (bitField0_ & ~0x00000008);
@@ -26303,23 +26303,23 @@ public final class DebugProtoBuf {
public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptorForType() {
- return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_SinceKotlinInfo_descriptor;
+ return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_VersionRequirement_descriptor;
}
- public org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo getDefaultInstanceForType() {
- return org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo.getDefaultInstance();
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement getDefaultInstanceForType() {
+ return org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.getDefaultInstance();
}
- public org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo build() {
- org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo result = buildPartial();
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement build() {
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement result = buildPartial();
if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
return result;
}
- public org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo buildPartial() {
- org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo(this);
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement buildPartial() {
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement(this);
int from_bitField0_ = bitField0_;
int to_bitField0_ = 0;
if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -26348,16 +26348,16 @@ public final class DebugProtoBuf {
}
public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
- if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo) {
- return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo)other);
+ if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement) {
+ return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement)other);
} else {
super.mergeFrom(other);
return this;
}
}
- public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo other) {
- if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo.getDefaultInstance()) return this;
+ public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement other) {
+ if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.getDefaultInstance()) return this;
if (other.hasVersion()) {
setVersion(other.getVersion());
}
@@ -26385,11 +26385,11 @@ public final class DebugProtoBuf {
org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
- org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo parsedMessage = null;
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
} catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
- parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo) e.getUnfinishedMessage();
+ parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement) e.getUnfinishedMessage();
throw e;
} finally {
if (parsedMessage != null) {
@@ -26508,9 +26508,9 @@ public final class DebugProtoBuf {
return this;
}
- private org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo.Level level_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo.Level.ERROR;
+ private org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Level level_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Level.ERROR;
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfo.Level level = 3 [default = ERROR];
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirement.Level level = 3 [default = ERROR];
*
*
* Level of the reported diagnostic
@@ -26520,23 +26520,23 @@ public final class DebugProtoBuf {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfo.Level level = 3 [default = ERROR];
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirement.Level level = 3 [default = ERROR];
*
*
* Level of the reported diagnostic
*
*/
- public org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo.Level getLevel() {
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Level getLevel() {
return level_;
}
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfo.Level level = 3 [default = ERROR];
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirement.Level level = 3 [default = ERROR];
*
*
* Level of the reported diagnostic
*
*/
- public Builder setLevel(org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo.Level value) {
+ public Builder setLevel(org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Level value) {
if (value == null) {
throw new NullPointerException();
}
@@ -26546,7 +26546,7 @@ public final class DebugProtoBuf {
return this;
}
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfo.Level level = 3 [default = ERROR];
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirement.Level level = 3 [default = ERROR];
*
*
* Level of the reported diagnostic
@@ -26554,7 +26554,7 @@ public final class DebugProtoBuf {
*/
public Builder clearLevel() {
bitField0_ = (bitField0_ & ~0x00000004);
- level_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo.Level.ERROR;
+ level_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Level.ERROR;
onChanged();
return this;
}
@@ -26655,65 +26655,65 @@ public final class DebugProtoBuf {
return this;
}
- // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.SinceKotlinInfo)
+ // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.VersionRequirement)
}
static {
- defaultInstance = new SinceKotlinInfo(true);
+ defaultInstance = new VersionRequirement(true);
defaultInstance.initFields();
}
- // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.SinceKotlinInfo)
+ // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.VersionRequirement)
}
- public interface SinceKotlinInfoTableOrBuilder extends
- // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.SinceKotlinInfoTable)
+ public interface VersionRequirementTableOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.VersionRequirementTable)
org.jetbrains.kotlin.protobuf.MessageOrBuilder {
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- java.util.List
- getInfoList();
+ java.util.List
+ getRequirementList();
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo getInfo(int index);
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement getRequirement(int index);
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- int getInfoCount();
+ int getRequirementCount();
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- java.util.List
- getInfoOrBuilderList();
+ java.util.List
+ getRequirementOrBuilderList();
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoOrBuilder getInfoOrBuilder(
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementOrBuilder getRequirementOrBuilder(
int index);
}
/**
- * Protobuf type {@code org.jetbrains.kotlin.serialization.SinceKotlinInfoTable}
+ * Protobuf type {@code org.jetbrains.kotlin.serialization.VersionRequirementTable}
*/
- public static final class SinceKotlinInfoTable extends
+ public static final class VersionRequirementTable extends
org.jetbrains.kotlin.protobuf.GeneratedMessage implements
- // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.SinceKotlinInfoTable)
- SinceKotlinInfoTableOrBuilder {
- // Use SinceKotlinInfoTable.newBuilder() to construct.
- private SinceKotlinInfoTable(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.VersionRequirementTable)
+ VersionRequirementTableOrBuilder {
+ // Use VersionRequirementTable.newBuilder() to construct.
+ private VersionRequirementTable(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private SinceKotlinInfoTable(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.UnknownFieldSet.getDefaultInstance(); }
+ private VersionRequirementTable(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.UnknownFieldSet.getDefaultInstance(); }
- private static final SinceKotlinInfoTable defaultInstance;
- public static SinceKotlinInfoTable getDefaultInstance() {
+ private static final VersionRequirementTable defaultInstance;
+ public static VersionRequirementTable getDefaultInstance() {
return defaultInstance;
}
- public SinceKotlinInfoTable getDefaultInstanceForType() {
+ public VersionRequirementTable getDefaultInstanceForType() {
return defaultInstance;
}
@@ -26723,7 +26723,7 @@ public final class DebugProtoBuf {
getUnknownFields() {
return this.unknownFields;
}
- private SinceKotlinInfoTable(
+ private VersionRequirementTable(
org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
@@ -26748,10 +26748,10 @@ public final class DebugProtoBuf {
}
case 10: {
if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
- info_ = new java.util.ArrayList();
+ requirement_ = new java.util.ArrayList();
mutable_bitField0_ |= 0x00000001;
}
- info_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo.PARSER, extensionRegistry));
+ requirement_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.PARSER, extensionRegistry));
break;
}
}
@@ -26763,7 +26763,7 @@ public final class DebugProtoBuf {
e.getMessage()).setUnfinishedMessage(this);
} finally {
if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
- info_ = java.util.Collections.unmodifiableList(info_);
+ requirement_ = java.util.Collections.unmodifiableList(requirement_);
}
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
@@ -26771,68 +26771,68 @@ public final class DebugProtoBuf {
}
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() {
- return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_SinceKotlinInfoTable_descriptor;
+ return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_VersionRequirementTable_descriptor;
}
protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
- return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_SinceKotlinInfoTable_fieldAccessorTable
+ return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_VersionRequirementTable_fieldAccessorTable
.ensureFieldAccessorsInitialized(
- org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTable.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTable.Builder.class);
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.Builder.class);
}
- public static org.jetbrains.kotlin.protobuf.Parser PARSER =
- new org.jetbrains.kotlin.protobuf.AbstractParser() {
- public SinceKotlinInfoTable parsePartialFrom(
+ public static org.jetbrains.kotlin.protobuf.Parser PARSER =
+ new org.jetbrains.kotlin.protobuf.AbstractParser() {
+ public VersionRequirementTable parsePartialFrom(
org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
- return new SinceKotlinInfoTable(input, extensionRegistry);
+ return new VersionRequirementTable(input, extensionRegistry);
}
};
@java.lang.Override
- public org.jetbrains.kotlin.protobuf.Parser getParserForType() {
+ public org.jetbrains.kotlin.protobuf.Parser getParserForType() {
return PARSER;
}
- public static final int INFO_FIELD_NUMBER = 1;
- private java.util.List info_;
+ public static final int REQUIREMENT_FIELD_NUMBER = 1;
+ private java.util.List requirement_;
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public java.util.List getInfoList() {
- return info_;
+ public java.util.List getRequirementList() {
+ return requirement_;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public java.util.List
- getInfoOrBuilderList() {
- return info_;
+ public java.util.List
+ getRequirementOrBuilderList() {
+ return requirement_;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public int getInfoCount() {
- return info_.size();
+ public int getRequirementCount() {
+ return requirement_.size();
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo getInfo(int index) {
- return info_.get(index);
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement getRequirement(int index) {
+ return requirement_.get(index);
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoOrBuilder getInfoOrBuilder(
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementOrBuilder getRequirementOrBuilder(
int index) {
- return info_.get(index);
+ return requirement_.get(index);
}
private void initFields() {
- info_ = java.util.Collections.emptyList();
+ requirement_ = java.util.Collections.emptyList();
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -26847,8 +26847,8 @@ public final class DebugProtoBuf {
public void writeTo(org.jetbrains.kotlin.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
- for (int i = 0; i < info_.size(); i++) {
- output.writeMessage(1, info_.get(i));
+ for (int i = 0; i < requirement_.size(); i++) {
+ output.writeMessage(1, requirement_.get(i));
}
getUnknownFields().writeTo(output);
}
@@ -26859,9 +26859,9 @@ public final class DebugProtoBuf {
if (size != -1) return size;
size = 0;
- for (int i = 0; i < info_.size(); i++) {
+ for (int i = 0; i < requirement_.size(); i++) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
- .computeMessageSize(1, info_.get(i));
+ .computeMessageSize(1, requirement_.get(i));
}
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
@@ -26875,53 +26875,53 @@ public final class DebugProtoBuf {
return super.writeReplace();
}
- public static org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTable parseFrom(
+ public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable parseFrom(
org.jetbrains.kotlin.protobuf.ByteString data)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTable parseFrom(
+ public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable parseFrom(
org.jetbrains.kotlin.protobuf.ByteString data,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTable parseFrom(byte[] data)
+ public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable parseFrom(byte[] data)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTable parseFrom(
+ public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable parseFrom(
byte[] data,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTable parseFrom(java.io.InputStream input)
+ public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable parseFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
- public static org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTable parseFrom(
+ public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable parseFrom(
java.io.InputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
- public static org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTable parseDelimitedFrom(java.io.InputStream input)
+ public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input);
}
- public static org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTable parseDelimitedFrom(
+ public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable parseDelimitedFrom(
java.io.InputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
- public static org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTable parseFrom(
+ public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable parseFrom(
org.jetbrains.kotlin.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
- public static org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTable parseFrom(
+ public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable parseFrom(
org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
@@ -26930,7 +26930,7 @@ public final class DebugProtoBuf {
public static Builder newBuilder() { return Builder.create(); }
public Builder newBuilderForType() { return newBuilder(); }
- public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTable prototype) {
+ public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable prototype) {
return newBuilder().mergeFrom(prototype);
}
public Builder toBuilder() { return newBuilder(this); }
@@ -26942,25 +26942,25 @@ public final class DebugProtoBuf {
return builder;
}
/**
- * Protobuf type {@code org.jetbrains.kotlin.serialization.SinceKotlinInfoTable}
+ * Protobuf type {@code org.jetbrains.kotlin.serialization.VersionRequirementTable}
*/
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
- // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.SinceKotlinInfoTable)
- org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTableOrBuilder {
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.VersionRequirementTable)
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTableOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() {
- return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_SinceKotlinInfoTable_descriptor;
+ return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_VersionRequirementTable_descriptor;
}
protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
- return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_SinceKotlinInfoTable_fieldAccessorTable
+ return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_VersionRequirementTable_fieldAccessorTable
.ensureFieldAccessorsInitialized(
- org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTable.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTable.Builder.class);
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.Builder.class);
}
- // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTable.newBuilder()
+ // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
}
@@ -26972,7 +26972,7 @@ public final class DebugProtoBuf {
}
private void maybeForceBuilderInitialization() {
if (org.jetbrains.kotlin.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
- getInfoFieldBuilder();
+ getRequirementFieldBuilder();
}
}
private static Builder create() {
@@ -26981,11 +26981,11 @@ public final class DebugProtoBuf {
public Builder clear() {
super.clear();
- if (infoBuilder_ == null) {
- info_ = java.util.Collections.emptyList();
+ if (requirementBuilder_ == null) {
+ requirement_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000001);
} else {
- infoBuilder_.clear();
+ requirementBuilder_.clear();
}
return this;
}
@@ -26996,71 +26996,71 @@ public final class DebugProtoBuf {
public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptorForType() {
- return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_SinceKotlinInfoTable_descriptor;
+ return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_VersionRequirementTable_descriptor;
}
- public org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTable getDefaultInstanceForType() {
- return org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTable.getDefaultInstance();
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable getDefaultInstanceForType() {
+ return org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.getDefaultInstance();
}
- public org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTable build() {
- org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTable result = buildPartial();
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable build() {
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable result = buildPartial();
if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
return result;
}
- public org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTable buildPartial() {
- org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTable result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTable(this);
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable buildPartial() {
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable(this);
int from_bitField0_ = bitField0_;
- if (infoBuilder_ == null) {
+ if (requirementBuilder_ == null) {
if (((bitField0_ & 0x00000001) == 0x00000001)) {
- info_ = java.util.Collections.unmodifiableList(info_);
+ requirement_ = java.util.Collections.unmodifiableList(requirement_);
bitField0_ = (bitField0_ & ~0x00000001);
}
- result.info_ = info_;
+ result.requirement_ = requirement_;
} else {
- result.info_ = infoBuilder_.build();
+ result.requirement_ = requirementBuilder_.build();
}
onBuilt();
return result;
}
public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
- if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTable) {
- return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTable)other);
+ if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable) {
+ return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable)other);
} else {
super.mergeFrom(other);
return this;
}
}
- public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTable other) {
- if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTable.getDefaultInstance()) return this;
- if (infoBuilder_ == null) {
- if (!other.info_.isEmpty()) {
- if (info_.isEmpty()) {
- info_ = other.info_;
+ public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable other) {
+ if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.getDefaultInstance()) return this;
+ if (requirementBuilder_ == null) {
+ if (!other.requirement_.isEmpty()) {
+ if (requirement_.isEmpty()) {
+ requirement_ = other.requirement_;
bitField0_ = (bitField0_ & ~0x00000001);
} else {
- ensureInfoIsMutable();
- info_.addAll(other.info_);
+ ensureRequirementIsMutable();
+ requirement_.addAll(other.requirement_);
}
onChanged();
}
} else {
- if (!other.info_.isEmpty()) {
- if (infoBuilder_.isEmpty()) {
- infoBuilder_.dispose();
- infoBuilder_ = null;
- info_ = other.info_;
+ if (!other.requirement_.isEmpty()) {
+ if (requirementBuilder_.isEmpty()) {
+ requirementBuilder_.dispose();
+ requirementBuilder_ = null;
+ requirement_ = other.requirement_;
bitField0_ = (bitField0_ & ~0x00000001);
- infoBuilder_ =
+ requirementBuilder_ =
org.jetbrains.kotlin.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
- getInfoFieldBuilder() : null;
+ getRequirementFieldBuilder() : null;
} else {
- infoBuilder_.addAllMessages(other.info_);
+ requirementBuilder_.addAllMessages(other.requirement_);
}
}
}
@@ -27076,11 +27076,11 @@ public final class DebugProtoBuf {
org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
- org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTable parsedMessage = null;
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
} catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
- parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoTable) e.getUnfinishedMessage();
+ parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable) e.getUnfinishedMessage();
throw e;
} finally {
if (parsedMessage != null) {
@@ -27091,255 +27091,255 @@ public final class DebugProtoBuf {
}
private int bitField0_;
- private java.util.List info_ =
+ private java.util.List requirement_ =
java.util.Collections.emptyList();
- private void ensureInfoIsMutable() {
+ private void ensureRequirementIsMutable() {
if (!((bitField0_ & 0x00000001) == 0x00000001)) {
- info_ = new java.util.ArrayList(info_);
+ requirement_ = new java.util.ArrayList(requirement_);
bitField0_ |= 0x00000001;
}
}
private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
- org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo, org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoOrBuilder> infoBuilder_;
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementOrBuilder> requirementBuilder_;
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public java.util.List getInfoList() {
- if (infoBuilder_ == null) {
- return java.util.Collections.unmodifiableList(info_);
+ public java.util.List getRequirementList() {
+ if (requirementBuilder_ == null) {
+ return java.util.Collections.unmodifiableList(requirement_);
} else {
- return infoBuilder_.getMessageList();
+ return requirementBuilder_.getMessageList();
}
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public int getInfoCount() {
- if (infoBuilder_ == null) {
- return info_.size();
+ public int getRequirementCount() {
+ if (requirementBuilder_ == null) {
+ return requirement_.size();
} else {
- return infoBuilder_.getCount();
+ return requirementBuilder_.getCount();
}
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo getInfo(int index) {
- if (infoBuilder_ == null) {
- return info_.get(index);
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement getRequirement(int index) {
+ if (requirementBuilder_ == null) {
+ return requirement_.get(index);
} else {
- return infoBuilder_.getMessage(index);
+ return requirementBuilder_.getMessage(index);
}
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public Builder setInfo(
- int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo value) {
- if (infoBuilder_ == null) {
+ public Builder setRequirement(
+ int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement value) {
+ if (requirementBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
- ensureInfoIsMutable();
- info_.set(index, value);
+ ensureRequirementIsMutable();
+ requirement_.set(index, value);
onChanged();
} else {
- infoBuilder_.setMessage(index, value);
+ requirementBuilder_.setMessage(index, value);
}
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public Builder setInfo(
- int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo.Builder builderForValue) {
- if (infoBuilder_ == null) {
- ensureInfoIsMutable();
- info_.set(index, builderForValue.build());
+ public Builder setRequirement(
+ int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Builder builderForValue) {
+ if (requirementBuilder_ == null) {
+ ensureRequirementIsMutable();
+ requirement_.set(index, builderForValue.build());
onChanged();
} else {
- infoBuilder_.setMessage(index, builderForValue.build());
+ requirementBuilder_.setMessage(index, builderForValue.build());
}
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public Builder addInfo(org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo value) {
- if (infoBuilder_ == null) {
+ public Builder addRequirement(org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement value) {
+ if (requirementBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
- ensureInfoIsMutable();
- info_.add(value);
+ ensureRequirementIsMutable();
+ requirement_.add(value);
onChanged();
} else {
- infoBuilder_.addMessage(value);
+ requirementBuilder_.addMessage(value);
}
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public Builder addInfo(
- int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo value) {
- if (infoBuilder_ == null) {
+ public Builder addRequirement(
+ int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement value) {
+ if (requirementBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
- ensureInfoIsMutable();
- info_.add(index, value);
+ ensureRequirementIsMutable();
+ requirement_.add(index, value);
onChanged();
} else {
- infoBuilder_.addMessage(index, value);
+ requirementBuilder_.addMessage(index, value);
}
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public Builder addInfo(
- org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo.Builder builderForValue) {
- if (infoBuilder_ == null) {
- ensureInfoIsMutable();
- info_.add(builderForValue.build());
+ public Builder addRequirement(
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Builder builderForValue) {
+ if (requirementBuilder_ == null) {
+ ensureRequirementIsMutable();
+ requirement_.add(builderForValue.build());
onChanged();
} else {
- infoBuilder_.addMessage(builderForValue.build());
+ requirementBuilder_.addMessage(builderForValue.build());
}
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public Builder addInfo(
- int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo.Builder builderForValue) {
- if (infoBuilder_ == null) {
- ensureInfoIsMutable();
- info_.add(index, builderForValue.build());
+ public Builder addRequirement(
+ int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Builder builderForValue) {
+ if (requirementBuilder_ == null) {
+ ensureRequirementIsMutable();
+ requirement_.add(index, builderForValue.build());
onChanged();
} else {
- infoBuilder_.addMessage(index, builderForValue.build());
+ requirementBuilder_.addMessage(index, builderForValue.build());
}
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public Builder addAllInfo(
- java.lang.Iterable values) {
- if (infoBuilder_ == null) {
- ensureInfoIsMutable();
+ public Builder addAllRequirement(
+ java.lang.Iterable values) {
+ if (requirementBuilder_ == null) {
+ ensureRequirementIsMutable();
org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
- values, info_);
+ values, requirement_);
onChanged();
} else {
- infoBuilder_.addAllMessages(values);
+ requirementBuilder_.addAllMessages(values);
}
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public Builder clearInfo() {
- if (infoBuilder_ == null) {
- info_ = java.util.Collections.emptyList();
+ public Builder clearRequirement() {
+ if (requirementBuilder_ == null) {
+ requirement_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000001);
onChanged();
} else {
- infoBuilder_.clear();
+ requirementBuilder_.clear();
}
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public Builder removeInfo(int index) {
- if (infoBuilder_ == null) {
- ensureInfoIsMutable();
- info_.remove(index);
+ public Builder removeRequirement(int index) {
+ if (requirementBuilder_ == null) {
+ ensureRequirementIsMutable();
+ requirement_.remove(index);
onChanged();
} else {
- infoBuilder_.remove(index);
+ requirementBuilder_.remove(index);
}
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo.Builder getInfoBuilder(
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Builder getRequirementBuilder(
int index) {
- return getInfoFieldBuilder().getBuilder(index);
+ return getRequirementFieldBuilder().getBuilder(index);
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoOrBuilder getInfoOrBuilder(
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementOrBuilder getRequirementOrBuilder(
int index) {
- if (infoBuilder_ == null) {
- return info_.get(index); } else {
- return infoBuilder_.getMessageOrBuilder(index);
+ if (requirementBuilder_ == null) {
+ return requirement_.get(index); } else {
+ return requirementBuilder_.getMessageOrBuilder(index);
}
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public java.util.List
- getInfoOrBuilderList() {
- if (infoBuilder_ != null) {
- return infoBuilder_.getMessageOrBuilderList();
+ public java.util.List
+ getRequirementOrBuilderList() {
+ if (requirementBuilder_ != null) {
+ return requirementBuilder_.getMessageOrBuilderList();
} else {
- return java.util.Collections.unmodifiableList(info_);
+ return java.util.Collections.unmodifiableList(requirement_);
}
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo.Builder addInfoBuilder() {
- return getInfoFieldBuilder().addBuilder(
- org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo.getDefaultInstance());
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Builder addRequirementBuilder() {
+ return getRequirementFieldBuilder().addBuilder(
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.getDefaultInstance());
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo.Builder addInfoBuilder(
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Builder addRequirementBuilder(
int index) {
- return getInfoFieldBuilder().addBuilder(
- index, org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo.getDefaultInstance());
+ return getRequirementFieldBuilder().addBuilder(
+ index, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.getDefaultInstance());
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public java.util.List
- getInfoBuilderList() {
- return getInfoFieldBuilder().getBuilderList();
+ public java.util.List
+ getRequirementBuilderList() {
+ return getRequirementFieldBuilder().getBuilderList();
}
private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
- org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo, org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoOrBuilder>
- getInfoFieldBuilder() {
- if (infoBuilder_ == null) {
- infoBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
- org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo, org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfo.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.SinceKotlinInfoOrBuilder>(
- info_,
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementOrBuilder>
+ getRequirementFieldBuilder() {
+ if (requirementBuilder_ == null) {
+ requirementBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementOrBuilder>(
+ requirement_,
((bitField0_ & 0x00000001) == 0x00000001),
getParentForChildren(),
isClean());
- info_ = null;
+ requirement_ = null;
}
- return infoBuilder_;
+ return requirementBuilder_;
}
- // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.SinceKotlinInfoTable)
+ // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.VersionRequirementTable)
}
static {
- defaultInstance = new SinceKotlinInfoTable(true);
+ defaultInstance = new VersionRequirementTable(true);
defaultInstance.initFields();
}
- // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.SinceKotlinInfoTable)
+ // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.VersionRequirementTable)
}
public interface PackageFragmentOrBuilder extends
@@ -28742,15 +28742,15 @@ public final class DebugProtoBuf {
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_EnumEntry_fieldAccessorTable;
private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
- internal_static_org_jetbrains_kotlin_serialization_SinceKotlinInfo_descriptor;
+ internal_static_org_jetbrains_kotlin_serialization_VersionRequirement_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
- internal_static_org_jetbrains_kotlin_serialization_SinceKotlinInfo_fieldAccessorTable;
+ internal_static_org_jetbrains_kotlin_serialization_VersionRequirement_fieldAccessorTable;
private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
- internal_static_org_jetbrains_kotlin_serialization_SinceKotlinInfoTable_descriptor;
+ internal_static_org_jetbrains_kotlin_serialization_VersionRequirementTable_descriptor;
private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
- internal_static_org_jetbrains_kotlin_serialization_SinceKotlinInfoTable_fieldAccessorTable;
+ internal_static_org_jetbrains_kotlin_serialization_VersionRequirementTable_fieldAccessorTable;
private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_PackageFragment_descriptor;
private static
@@ -28823,7 +28823,7 @@ public final class DebugProtoBuf {
"ter.Variance:\003INV\022=\n\013upper_bound\030\005 \003(\0132(" +
".org.jetbrains.kotlin.serialization.Type" +
"\022\026\n\016upper_bound_id\030\006 \003(\005\"$\n\010Variance\022\006\n\002" +
- "IN\020\000\022\007\n\003OUT\020\001\022\007\n\003INV\020\002*\005\010d\020\350\007\"\307\007\n\005Class\022" +
+ "IN\020\000\022\007\n\003OUT\020\001\022\007\n\003INV\020\002*\005\010d\020\350\007\"\320\007\n\005Class\022" +
"\020\n\005flags\030\001 \001(\005:\0016\022\025\n\007fq_name\030\003 \002(\005B\004\220\265\030\001",
"\022#\n\025companion_object_name\030\004 \001(\005B\004\210\265\030\001\022I\n" +
"\016type_parameter\030\005 \003(\01321.org.jetbrains.ko" +
@@ -28841,93 +28841,94 @@ public final class DebugProtoBuf {
"-.org.jetbrains.kotlin.serialization.Enu" +
"mEntry\022\'\n\027sealed_subclass_fq_name\030\020 \003(\005B" +
"\006\020\001\220\265\030\001\022A\n\ntype_table\030\036 \001(\0132-.org.jetbra" +
- "ins.kotlin.serialization.TypeTable\022\027\n\017si" +
- "nceKotlinInfo\030\037 \001(\005\022Y\n\027since_kotlin_info" +
- "_table\030 \001(\01328.org.jetbrains.kotlin.seri" +
- "alization.SinceKotlinInfoTable\"x\n\004Kind\022\t",
- "\n\005CLASS\020\000\022\r\n\tINTERFACE\020\001\022\016\n\nENUM_CLASS\020\002" +
- "\022\016\n\nENUM_ENTRY\020\003\022\024\n\020ANNOTATION_CLASS\020\004\022\n" +
- "\n\006OBJECT\020\005\022\024\n\020COMPANION_OBJECT\020\006*\005\010d\020\310\001\"" +
- "\361\002\n\007Package\022>\n\010function\030\003 \003(\0132,.org.jetb" +
- "rains.kotlin.serialization.Function\022>\n\010p" +
- "roperty\030\004 \003(\0132,.org.jetbrains.kotlin.ser" +
- "ialization.Property\022A\n\ntype_alias\030\005 \003(\0132" +
- "-.org.jetbrains.kotlin.serialization.Typ" +
- "eAlias\022A\n\ntype_table\030\036 \001(\0132-.org.jetbrai" +
- "ns.kotlin.serialization.TypeTable\022Y\n\027sin",
- "ce_kotlin_info_table\030 \001(\01328.org.jetbrai" +
- "ns.kotlin.serialization.SinceKotlinInfoT" +
- "able*\005\010d\020\310\001\"_\n\tTypeTable\0226\n\004type\030\001 \003(\0132(" +
- ".org.jetbrains.kotlin.serialization.Type" +
- "\022\032\n\016first_nullable\030\002 \001(\005:\002-1\"\214\001\n\013Constru" +
- "ctor\022\020\n\005flags\030\001 \001(\005:\0016\022K\n\017value_paramete" +
- "r\030\002 \003(\01322.org.jetbrains.kotlin.serializa" +
- "tion.ValueParameter\022\027\n\017sinceKotlinInfo\030\037" +
- " \001(\005*\005\010d\020\310\001\"\363\003\n\010Function\022\020\n\005flags\030\t \001(\005:" +
- "\0016\022\024\n\told_flags\030\001 \001(\005:\0016\022\022\n\004name\030\002 \002(\005B\004",
- "\210\265\030\001\022=\n\013return_type\030\003 \001(\0132(.org.jetbrain" +
- "s.kotlin.serialization.Type\022\026\n\016return_ty" +
- "pe_id\030\007 \001(\005\022I\n\016type_parameter\030\004 \003(\01321.or" +
- "g.jetbrains.kotlin.serialization.TypePar" +
- "ameter\022?\n\rreceiver_type\030\005 \001(\0132(.org.jetb" +
- "rains.kotlin.serialization.Type\022\030\n\020recei" +
- "ver_type_id\030\010 \001(\005\022K\n\017value_parameter\030\006 \003" +
- "(\01322.org.jetbrains.kotlin.serialization." +
- "ValueParameter\022A\n\ntype_table\030\036 \001(\0132-.org" +
- ".jetbrains.kotlin.serialization.TypeTabl",
- "e\022\027\n\017sinceKotlinInfo\030\037 \001(\005*\005\010d\020\310\001\"\350\003\n\010Pr" +
- "operty\022\022\n\005flags\030\013 \001(\005:\003518\022\027\n\told_flags\030" +
- "\001 \001(\005:\0042054\022\022\n\004name\030\002 \002(\005B\004\210\265\030\001\022=\n\013retur" +
- "n_type\030\003 \001(\0132(.org.jetbrains.kotlin.seri" +
- "alization.Type\022\026\n\016return_type_id\030\t \001(\005\022I" +
- "\n\016type_parameter\030\004 \003(\01321.org.jetbrains.k" +
- "otlin.serialization.TypeParameter\022?\n\rrec" +
- "eiver_type\030\005 \001(\0132(.org.jetbrains.kotlin." +
- "serialization.Type\022\030\n\020receiver_type_id\030\n" +
- " \001(\005\022R\n\026setter_value_parameter\030\006 \001(\01322.o",
- "rg.jetbrains.kotlin.serialization.ValueP" +
- "arameter\022\024\n\014getter_flags\030\007 \001(\005\022\024\n\014setter" +
- "_flags\030\010 \001(\005\022\027\n\017sinceKotlinInfo\030\037 \001(\005*\005\010" +
- "d\020\310\001\"\355\001\n\016ValueParameter\022\020\n\005flags\030\001 \001(\005:\001" +
- "0\022\022\n\004name\030\002 \002(\005B\004\210\265\030\001\0226\n\004type\030\003 \001(\0132(.or" +
- "g.jetbrains.kotlin.serialization.Type\022\017\n" +
- "\007type_id\030\005 \001(\005\022E\n\023vararg_element_type\030\004 " +
+ "ins.kotlin.serialization.TypeTable\022\033\n\023ve" +
+ "rsion_requirement\030\037 \001(\005\022^\n\031version_requi" +
+ "rement_table\030 \001(\0132;.org.jetbrains.kotli" +
+ "n.serialization.VersionRequirementTable\"",
+ "x\n\004Kind\022\t\n\005CLASS\020\000\022\r\n\tINTERFACE\020\001\022\016\n\nENU" +
+ "M_CLASS\020\002\022\016\n\nENUM_ENTRY\020\003\022\024\n\020ANNOTATION_" +
+ "CLASS\020\004\022\n\n\006OBJECT\020\005\022\024\n\020COMPANION_OBJECT\020" +
+ "\006*\005\010d\020\310\001\"\366\002\n\007Package\022>\n\010function\030\003 \003(\0132," +
+ ".org.jetbrains.kotlin.serialization.Func" +
+ "tion\022>\n\010property\030\004 \003(\0132,.org.jetbrains.k" +
+ "otlin.serialization.Property\022A\n\ntype_ali" +
+ "as\030\005 \003(\0132-.org.jetbrains.kotlin.serializ" +
+ "ation.TypeAlias\022A\n\ntype_table\030\036 \001(\0132-.or" +
+ "g.jetbrains.kotlin.serialization.TypeTab",
+ "le\022^\n\031version_requirement_table\030 \001(\0132;." +
+ "org.jetbrains.kotlin.serialization.Versi" +
+ "onRequirementTable*\005\010d\020\310\001\"_\n\tTypeTable\0226" +
+ "\n\004type\030\001 \003(\0132(.org.jetbrains.kotlin.seri" +
+ "alization.Type\022\032\n\016first_nullable\030\002 \001(\005:\002" +
+ "-1\"\220\001\n\013Constructor\022\020\n\005flags\030\001 \001(\005:\0016\022K\n\017" +
+ "value_parameter\030\002 \003(\01322.org.jetbrains.ko" +
+ "tlin.serialization.ValueParameter\022\033\n\023ver" +
+ "sion_requirement\030\037 \001(\005*\005\010d\020\310\001\"\367\003\n\010Functi" +
+ "on\022\020\n\005flags\030\t \001(\005:\0016\022\024\n\told_flags\030\001 \001(\005:",
+ "\0016\022\022\n\004name\030\002 \002(\005B\004\210\265\030\001\022=\n\013return_type\030\003 " +
"\001(\0132(.org.jetbrains.kotlin.serialization" +
- ".Type\022\036\n\026vararg_element_type_id\030\006 \001(\005*\005\010" +
- "d\020\310\001\"\232\003\n\tTypeAlias\022\020\n\005flags\030\001 \001(\005:\0016\022\022\n\004",
- "name\030\002 \002(\005B\004\210\265\030\001\022I\n\016type_parameter\030\003 \003(\013" +
- "21.org.jetbrains.kotlin.serialization.Ty" +
- "peParameter\022A\n\017underlying_type\030\004 \001(\0132(.o" +
- "rg.jetbrains.kotlin.serialization.Type\022\032" +
- "\n\022underlying_type_id\030\005 \001(\005\022?\n\rexpanded_t" +
- "ype\030\006 \001(\0132(.org.jetbrains.kotlin.seriali" +
- "zation.Type\022\030\n\020expanded_type_id\030\007 \001(\005\022B\n" +
- "\nannotation\030\010 \003(\0132..org.jetbrains.kotlin" +
- ".serialization.Annotation\022\027\n\017sinceKotlin" +
- "Info\030\037 \001(\005*\005\010d\020\310\001\"&\n\tEnumEntry\022\022\n\004name\030\001",
- " \001(\005B\004\210\265\030\001*\005\010d\020\310\001\"\341\001\n\017SinceKotlinInfo\022\017\n" +
- "\007version\030\001 \001(\005\022\024\n\014version_full\030\002 \001(\005\022O\n\005" +
- "level\030\003 \001(\01629.org.jetbrains.kotlin.seria" +
- "lization.SinceKotlinInfo.Level:\005ERROR\022\022\n" +
- "\nerror_code\030\004 \001(\005\022\025\n\007message\030\005 \001(\005B\004\230\265\030\001" +
- "\"+\n\005Level\022\013\n\007WARNING\020\000\022\t\n\005ERROR\020\001\022\n\n\006HID" +
- "DEN\020\002\"Y\n\024SinceKotlinInfoTable\022A\n\004info\030\001 " +
- "\003(\01323.org.jetbrains.kotlin.serialization" +
- ".SinceKotlinInfo\"\243\002\n\017PackageFragment\022@\n\007" +
- "strings\030\001 \001(\0132/.org.jetbrains.kotlin.ser",
- "ialization.StringTable\022O\n\017qualified_name" +
- "s\030\002 \001(\01326.org.jetbrains.kotlin.serializa" +
- "tion.QualifiedNameTable\022<\n\007package\030\003 \001(\013" +
- "2+.org.jetbrains.kotlin.serialization.Pa" +
- "ckage\0228\n\005class\030\004 \003(\0132).org.jetbrains.kot" +
- "lin.serialization.Class*\005\010d\020\310\001*9\n\010Modali" +
- "ty\022\t\n\005FINAL\020\000\022\010\n\004OPEN\020\001\022\014\n\010ABSTRACT\020\002\022\n\n" +
- "\006SEALED\020\003*b\n\nVisibility\022\014\n\010INTERNAL\020\000\022\013\n" +
- "\007PRIVATE\020\001\022\r\n\tPROTECTED\020\002\022\n\n\006PUBLIC\020\003\022\023\n" +
- "\017PRIVATE_TO_THIS\020\004\022\t\n\005LOCAL\020\005*Q\n\nMemberK",
- "ind\022\017\n\013DECLARATION\020\000\022\021\n\rFAKE_OVERRIDE\020\001\022" +
- "\016\n\nDELEGATION\020\002\022\017\n\013SYNTHESIZED\020\003B\017B\rDebu" +
- "gProtoBuf"
+ ".Type\022\026\n\016return_type_id\030\007 \001(\005\022I\n\016type_pa" +
+ "rameter\030\004 \003(\01321.org.jetbrains.kotlin.ser" +
+ "ialization.TypeParameter\022?\n\rreceiver_typ" +
+ "e\030\005 \001(\0132(.org.jetbrains.kotlin.serializa" +
+ "tion.Type\022\030\n\020receiver_type_id\030\010 \001(\005\022K\n\017v" +
+ "alue_parameter\030\006 \003(\01322.org.jetbrains.kot" +
+ "lin.serialization.ValueParameter\022A\n\ntype" +
+ "_table\030\036 \001(\0132-.org.jetbrains.kotlin.seri",
+ "alization.TypeTable\022\033\n\023version_requireme" +
+ "nt\030\037 \001(\005*\005\010d\020\310\001\"\354\003\n\010Property\022\022\n\005flags\030\013 " +
+ "\001(\005:\003518\022\027\n\told_flags\030\001 \001(\005:\0042054\022\022\n\004nam" +
+ "e\030\002 \002(\005B\004\210\265\030\001\022=\n\013return_type\030\003 \001(\0132(.org" +
+ ".jetbrains.kotlin.serialization.Type\022\026\n\016" +
+ "return_type_id\030\t \001(\005\022I\n\016type_parameter\030\004" +
+ " \003(\01321.org.jetbrains.kotlin.serializatio" +
+ "n.TypeParameter\022?\n\rreceiver_type\030\005 \001(\0132(" +
+ ".org.jetbrains.kotlin.serialization.Type" +
+ "\022\030\n\020receiver_type_id\030\n \001(\005\022R\n\026setter_val",
+ "ue_parameter\030\006 \001(\01322.org.jetbrains.kotli" +
+ "n.serialization.ValueParameter\022\024\n\014getter" +
+ "_flags\030\007 \001(\005\022\024\n\014setter_flags\030\010 \001(\005\022\033\n\023ve" +
+ "rsion_requirement\030\037 \001(\005*\005\010d\020\310\001\"\355\001\n\016Value" +
+ "Parameter\022\020\n\005flags\030\001 \001(\005:\0010\022\022\n\004name\030\002 \002(" +
+ "\005B\004\210\265\030\001\0226\n\004type\030\003 \001(\0132(.org.jetbrains.ko" +
+ "tlin.serialization.Type\022\017\n\007type_id\030\005 \001(\005" +
+ "\022E\n\023vararg_element_type\030\004 \001(\0132(.org.jetb" +
+ "rains.kotlin.serialization.Type\022\036\n\026varar" +
+ "g_element_type_id\030\006 \001(\005*\005\010d\020\310\001\"\236\003\n\tTypeA",
+ "lias\022\020\n\005flags\030\001 \001(\005:\0016\022\022\n\004name\030\002 \002(\005B\004\210\265" +
+ "\030\001\022I\n\016type_parameter\030\003 \003(\01321.org.jetbrai" +
+ "ns.kotlin.serialization.TypeParameter\022A\n" +
+ "\017underlying_type\030\004 \001(\0132(.org.jetbrains.k" +
+ "otlin.serialization.Type\022\032\n\022underlying_t" +
+ "ype_id\030\005 \001(\005\022?\n\rexpanded_type\030\006 \001(\0132(.or" +
+ "g.jetbrains.kotlin.serialization.Type\022\030\n" +
+ "\020expanded_type_id\030\007 \001(\005\022B\n\nannotation\030\010 " +
+ "\003(\0132..org.jetbrains.kotlin.serialization" +
+ ".Annotation\022\033\n\023version_requirement\030\037 \001(\005",
+ "*\005\010d\020\310\001\"&\n\tEnumEntry\022\022\n\004name\030\001 \001(\005B\004\210\265\030\001" +
+ "*\005\010d\020\310\001\"\347\001\n\022VersionRequirement\022\017\n\007versio" +
+ "n\030\001 \001(\005\022\024\n\014version_full\030\002 \001(\005\022R\n\005level\030\003" +
+ " \001(\0162<.org.jetbrains.kotlin.serializatio" +
+ "n.VersionRequirement.Level:\005ERROR\022\022\n\nerr" +
+ "or_code\030\004 \001(\005\022\025\n\007message\030\005 \001(\005B\004\230\265\030\001\"+\n\005" +
+ "Level\022\013\n\007WARNING\020\000\022\t\n\005ERROR\020\001\022\n\n\006HIDDEN\020" +
+ "\002\"f\n\027VersionRequirementTable\022K\n\013requirem" +
+ "ent\030\001 \003(\01326.org.jetbrains.kotlin.seriali" +
+ "zation.VersionRequirement\"\243\002\n\017PackageFra",
+ "gment\022@\n\007strings\030\001 \001(\0132/.org.jetbrains.k" +
+ "otlin.serialization.StringTable\022O\n\017quali" +
+ "fied_names\030\002 \001(\01326.org.jetbrains.kotlin." +
+ "serialization.QualifiedNameTable\022<\n\007pack" +
+ "age\030\003 \001(\0132+.org.jetbrains.kotlin.seriali" +
+ "zation.Package\0228\n\005class\030\004 \003(\0132).org.jetb" +
+ "rains.kotlin.serialization.Class*\005\010d\020\310\001*" +
+ "9\n\010Modality\022\t\n\005FINAL\020\000\022\010\n\004OPEN\020\001\022\014\n\010ABST" +
+ "RACT\020\002\022\n\n\006SEALED\020\003*b\n\nVisibility\022\014\n\010INTE" +
+ "RNAL\020\000\022\013\n\007PRIVATE\020\001\022\r\n\tPROTECTED\020\002\022\n\n\006PU",
+ "BLIC\020\003\022\023\n\017PRIVATE_TO_THIS\020\004\022\t\n\005LOCAL\020\005*Q" +
+ "\n\nMemberKind\022\017\n\013DECLARATION\020\000\022\021\n\rFAKE_OV" +
+ "ERRIDE\020\001\022\016\n\nDELEGATION\020\002\022\017\n\013SYNTHESIZED\020" +
+ "\003B\017B\rDebugProtoBuf"
};
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
@@ -29001,13 +29002,13 @@ public final class DebugProtoBuf {
internal_static_org_jetbrains_kotlin_serialization_Class_fieldAccessorTable = new
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_Class_descriptor,
- new java.lang.String[] { "Flags", "FqName", "CompanionObjectName", "TypeParameter", "Supertype", "SupertypeId", "NestedClassName", "Constructor", "Function", "Property", "TypeAlias", "EnumEntry", "SealedSubclassFqName", "TypeTable", "SinceKotlinInfo", "SinceKotlinInfoTable", });
+ new java.lang.String[] { "Flags", "FqName", "CompanionObjectName", "TypeParameter", "Supertype", "SupertypeId", "NestedClassName", "Constructor", "Function", "Property", "TypeAlias", "EnumEntry", "SealedSubclassFqName", "TypeTable", "VersionRequirement", "VersionRequirementTable", });
internal_static_org_jetbrains_kotlin_serialization_Package_descriptor =
getDescriptor().getMessageTypes().get(6);
internal_static_org_jetbrains_kotlin_serialization_Package_fieldAccessorTable = new
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_Package_descriptor,
- new java.lang.String[] { "Function", "Property", "TypeAlias", "TypeTable", "SinceKotlinInfoTable", });
+ new java.lang.String[] { "Function", "Property", "TypeAlias", "TypeTable", "VersionRequirementTable", });
internal_static_org_jetbrains_kotlin_serialization_TypeTable_descriptor =
getDescriptor().getMessageTypes().get(7);
internal_static_org_jetbrains_kotlin_serialization_TypeTable_fieldAccessorTable = new
@@ -29019,19 +29020,19 @@ public final class DebugProtoBuf {
internal_static_org_jetbrains_kotlin_serialization_Constructor_fieldAccessorTable = new
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_Constructor_descriptor,
- new java.lang.String[] { "Flags", "ValueParameter", "SinceKotlinInfo", });
+ new java.lang.String[] { "Flags", "ValueParameter", "VersionRequirement", });
internal_static_org_jetbrains_kotlin_serialization_Function_descriptor =
getDescriptor().getMessageTypes().get(9);
internal_static_org_jetbrains_kotlin_serialization_Function_fieldAccessorTable = new
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_Function_descriptor,
- new java.lang.String[] { "Flags", "OldFlags", "Name", "ReturnType", "ReturnTypeId", "TypeParameter", "ReceiverType", "ReceiverTypeId", "ValueParameter", "TypeTable", "SinceKotlinInfo", });
+ new java.lang.String[] { "Flags", "OldFlags", "Name", "ReturnType", "ReturnTypeId", "TypeParameter", "ReceiverType", "ReceiverTypeId", "ValueParameter", "TypeTable", "VersionRequirement", });
internal_static_org_jetbrains_kotlin_serialization_Property_descriptor =
getDescriptor().getMessageTypes().get(10);
internal_static_org_jetbrains_kotlin_serialization_Property_fieldAccessorTable = new
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_Property_descriptor,
- new java.lang.String[] { "Flags", "OldFlags", "Name", "ReturnType", "ReturnTypeId", "TypeParameter", "ReceiverType", "ReceiverTypeId", "SetterValueParameter", "GetterFlags", "SetterFlags", "SinceKotlinInfo", });
+ new java.lang.String[] { "Flags", "OldFlags", "Name", "ReturnType", "ReturnTypeId", "TypeParameter", "ReceiverType", "ReceiverTypeId", "SetterValueParameter", "GetterFlags", "SetterFlags", "VersionRequirement", });
internal_static_org_jetbrains_kotlin_serialization_ValueParameter_descriptor =
getDescriptor().getMessageTypes().get(11);
internal_static_org_jetbrains_kotlin_serialization_ValueParameter_fieldAccessorTable = new
@@ -29043,25 +29044,25 @@ public final class DebugProtoBuf {
internal_static_org_jetbrains_kotlin_serialization_TypeAlias_fieldAccessorTable = new
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_TypeAlias_descriptor,
- new java.lang.String[] { "Flags", "Name", "TypeParameter", "UnderlyingType", "UnderlyingTypeId", "ExpandedType", "ExpandedTypeId", "Annotation", "SinceKotlinInfo", });
+ new java.lang.String[] { "Flags", "Name", "TypeParameter", "UnderlyingType", "UnderlyingTypeId", "ExpandedType", "ExpandedTypeId", "Annotation", "VersionRequirement", });
internal_static_org_jetbrains_kotlin_serialization_EnumEntry_descriptor =
getDescriptor().getMessageTypes().get(13);
internal_static_org_jetbrains_kotlin_serialization_EnumEntry_fieldAccessorTable = new
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_EnumEntry_descriptor,
new java.lang.String[] { "Name", });
- internal_static_org_jetbrains_kotlin_serialization_SinceKotlinInfo_descriptor =
+ internal_static_org_jetbrains_kotlin_serialization_VersionRequirement_descriptor =
getDescriptor().getMessageTypes().get(14);
- internal_static_org_jetbrains_kotlin_serialization_SinceKotlinInfo_fieldAccessorTable = new
+ internal_static_org_jetbrains_kotlin_serialization_VersionRequirement_fieldAccessorTable = new
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_SinceKotlinInfo_descriptor,
+ internal_static_org_jetbrains_kotlin_serialization_VersionRequirement_descriptor,
new java.lang.String[] { "Version", "VersionFull", "Level", "ErrorCode", "Message", });
- internal_static_org_jetbrains_kotlin_serialization_SinceKotlinInfoTable_descriptor =
+ internal_static_org_jetbrains_kotlin_serialization_VersionRequirementTable_descriptor =
getDescriptor().getMessageTypes().get(15);
- internal_static_org_jetbrains_kotlin_serialization_SinceKotlinInfoTable_fieldAccessorTable = new
+ internal_static_org_jetbrains_kotlin_serialization_VersionRequirementTable_fieldAccessorTable = new
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_SinceKotlinInfoTable_descriptor,
- new java.lang.String[] { "Info", });
+ internal_static_org_jetbrains_kotlin_serialization_VersionRequirementTable_descriptor,
+ new java.lang.String[] { "Requirement", });
internal_static_org_jetbrains_kotlin_serialization_PackageFragment_descriptor =
getDescriptor().getMessageTypes().get(16);
internal_static_org_jetbrains_kotlin_serialization_PackageFragment_fieldAccessorTable = new
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/JvmRuntimeVersionsConsistencyChecker.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/JvmRuntimeVersionsConsistencyChecker.kt
index a3c214cc6d4..9f904acb213 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/JvmRuntimeVersionsConsistencyChecker.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/JvmRuntimeVersionsConsistencyChecker.kt
@@ -180,7 +180,7 @@ object JvmRuntimeVersionsConsistencyChecker {
// The "Core" jar files should not be newer than the compiler. This behavior is reserved for the future if we realise that we're
// going to break language/library compatibility in such a way that it's easier to make the old compiler just report an error
// in the case the new runtime library is specified in the classpath, rather than employing any other compatibility breakage tools
- // we have at our disposal (Deprecated, SinceKotlin, SinceKotlinInfo in metadata, etc.)
+ // we have at our disposal (Deprecated, SinceKotlin, VersionRequirement in metadata, etc.)
if (runtimeJarsInfo.coreJars.map {
checkNotNewerThanCompiler(messageCollector, it)
}.any { it }) return ClasspathConsistency.InconsistentWithCompilerVersion
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
index e9c3f63b302..e61ffd4ec56 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
@@ -39,7 +39,7 @@ import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall;
import org.jetbrains.kotlin.resolve.calls.tower.WrongResolutionToClassifier;
import org.jetbrains.kotlin.resolve.checkers.ExpectedActualDeclarationChecker.Compatibility.Incompatible;
import org.jetbrains.kotlin.serialization.deserialization.IncompatibleVersionErrorData;
-import org.jetbrains.kotlin.serialization.deserialization.descriptors.SinceKotlinInfo;
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.VersionRequirement;
import org.jetbrains.kotlin.types.KotlinType;
import java.lang.reflect.Field;
@@ -101,8 +101,10 @@ public interface Errors {
DiagnosticFactory2 DEPRECATION_ERROR = DiagnosticFactory2.create(ERROR);
DiagnosticFactory3 TYPEALIAS_EXPANSION_DEPRECATION = DiagnosticFactory3.create(WARNING);
DiagnosticFactory3 TYPEALIAS_EXPANSION_DEPRECATION_ERROR = DiagnosticFactory3.create(ERROR);
- DiagnosticFactory3> SINCE_KOTLIN_INFO_DEPRECATION = DiagnosticFactory3.create(WARNING);
- DiagnosticFactory3> SINCE_KOTLIN_INFO_DEPRECATION_ERROR = DiagnosticFactory3.create(ERROR);
+ DiagnosticFactory3>
+ VERSION_REQUIREMENT_DEPRECATION = DiagnosticFactory3.create(WARNING);
+ DiagnosticFactory3>
+ VERSION_REQUIREMENT_DEPRECATION_ERROR = DiagnosticFactory3.create(ERROR);
DiagnosticFactory2 API_NOT_AVAILABLE = DiagnosticFactory2.create(ERROR);
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java
index f9a3d1883e4..8650118cb9a 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.diagnostics.DiagnosticFactory;
import org.jetbrains.kotlin.diagnostics.Errors;
import org.jetbrains.kotlin.resolve.VarianceConflictDiagnosticData;
-import org.jetbrains.kotlin.serialization.deserialization.descriptors.SinceKotlinInfo;
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.VersionRequirement;
import org.jetbrains.kotlin.types.KotlinTypeKt;
import org.jetbrains.kotlin.util.MappedExtensionProvider;
import org.jetbrains.kotlin.util.OperatorNameConventions;
@@ -344,16 +344,16 @@ public class DefaultErrorMessages {
MAP.put(TYPEALIAS_EXPANSION_DEPRECATION, "''{0}'' uses ''{1}'', which is deprecated. {2}", DEPRECATION_RENDERER, DEPRECATION_RENDERER, STRING);
MAP.put(TYPEALIAS_EXPANSION_DEPRECATION_ERROR, "''{0}'' uses ''{1}'', which is an error. {2}", DEPRECATION_RENDERER, DEPRECATION_RENDERER, STRING);
- DiagnosticParameterRenderer> sinceKotlinInfoMessage = (pair, renderingContext) -> {
+ DiagnosticParameterRenderer> versionRequirementMessage = (pair, renderingContext) -> {
String message = pair.getSecond();
return pair.getFirst().getVersionString() + (message != null ? ". " + message : "");
};
- MAP.put(SINCE_KOTLIN_INFO_DEPRECATION, "''{0}''{1} should not be used in Kotlin {2}", DEPRECATION_RENDERER,
- (obj, renderingContext) -> obj.equals(SinceKotlinInfo.Version.INFINITY) ? "" : " is only supported since Kotlin " + obj.asString() + " and",
- sinceKotlinInfoMessage);
- MAP.put(SINCE_KOTLIN_INFO_DEPRECATION_ERROR, "''{0}''{1} cannot be used in Kotlin {2}", DEPRECATION_RENDERER,
- (obj, renderingContext) -> obj.equals(SinceKotlinInfo.Version.INFINITY) ? "" : " is only available since Kotlin " + obj.asString() + " and",
- sinceKotlinInfoMessage);
+ MAP.put(VERSION_REQUIREMENT_DEPRECATION, "''{0}''{1} should not be used in Kotlin {2}", DEPRECATION_RENDERER,
+ (obj, renderingContext) -> obj.equals(VersionRequirement.Version.INFINITY) ? "" : " is only supported since Kotlin " + obj.asString() + " and",
+ versionRequirementMessage);
+ MAP.put(VERSION_REQUIREMENT_DEPRECATION_ERROR, "''{0}''{1} cannot be used in Kotlin {2}", DEPRECATION_RENDERER,
+ (obj, renderingContext) -> obj.equals(VersionRequirement.Version.INFINITY) ? "" : " is only available since Kotlin " + obj.asString() + " and",
+ versionRequirementMessage);
MAP.put(API_NOT_AVAILABLE, "This declaration is only available since Kotlin {0} and cannot be used with the specified API version {1}", STRING, STRING);
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/deprecationUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/deprecationUtil.kt
index 3ee0f147b26..bd3370a28a9 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/deprecationUtil.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/deprecationUtil.kt
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.resolve.calls.checkers.shouldWarnAboutDeprecatedModF
import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedMemberDescriptor
-import org.jetbrains.kotlin.serialization.deserialization.descriptors.SinceKotlinInfo
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.VersionRequirement
import org.jetbrains.kotlin.storage.StorageManager
import org.jetbrains.kotlin.types.KotlinType
import org.jetbrains.kotlin.types.TypeUtils
@@ -99,12 +99,12 @@ private data class DeprecatedByOverridden(private val deprecations: Collection WARNING
DeprecationLevel.ERROR -> ERROR
DeprecationLevel.HIDDEN -> HIDDEN
@@ -112,8 +112,8 @@ private data class DeprecatedBySinceKotlinInfo(
override val message: String?
get() {
- val message = sinceKotlinInfo.message
- val errorCode = sinceKotlinInfo.errorCode
+ val message = versionRequirement.message
+ val errorCode = versionRequirement.errorCode
if (message == null && errorCode == null) return null
return buildString {
@@ -128,9 +128,6 @@ private data class DeprecatedBySinceKotlinInfo(
}
}
}
-
- val sinceKotlinVersion: SinceKotlinInfo.Version
- get() = sinceKotlinInfo.version
}
private data class DeprecatedTypealiasByAnnotation(
@@ -152,12 +149,12 @@ internal fun createDeprecationDiagnostic(
): Diagnostic {
val targetOriginal = deprecation.target.original
return when (deprecation) {
- is DeprecatedBySinceKotlinInfo -> {
+ is DeprecatedByVersionRequirement -> {
val factory = when (deprecation.deprecationLevel) {
- WARNING -> Errors.SINCE_KOTLIN_INFO_DEPRECATION
- ERROR, HIDDEN -> Errors.SINCE_KOTLIN_INFO_DEPRECATION_ERROR
+ WARNING -> Errors.VERSION_REQUIREMENT_DEPRECATION
+ ERROR, HIDDEN -> Errors.VERSION_REQUIREMENT_DEPRECATION_ERROR
}
- factory.on(element, targetOriginal, deprecation.sinceKotlinVersion,
+ factory.on(element, targetOriginal, deprecation.versionRequirement.version,
languageVersionSettings.languageVersion to deprecation.message)
}
@@ -289,15 +286,15 @@ class DeprecationResolver(
result.add(deprecation)
}
- val sinceKotlinInfo =
- (target as? DeserializedMemberDescriptor)?.sinceKotlinInfo
- ?: (target as? DeserializedClassDescriptor)?.sinceKotlinInfo
- if (sinceKotlinInfo != null) {
+ val versionRequirement =
+ (target as? DeserializedMemberDescriptor)?.versionRequirement
+ ?: (target as? DeserializedClassDescriptor)?.versionRequirement
+ if (versionRequirement != null) {
// We're using ApiVersion because it's convenient to compare versions, "-api-version" is not involved in any way
// TODO: usage of ApiVersion is confusing here, refactor
- if (ApiVersion.createBySinceKotlinInfo(sinceKotlinInfo) >
+ if (ApiVersion.createByVersionRequirement(versionRequirement) >
ApiVersion.createByLanguageVersion(languageVersionSettings.languageVersion)) {
- result.add(DeprecatedBySinceKotlinInfo(sinceKotlinInfo, target))
+ result.add(DeprecatedByVersionRequirement(versionRequirement, target))
}
}
}
diff --git a/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.kt b/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.kt
index 91f04a84790..dd7f07648f3 100644
--- a/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.kt
+++ b/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.kt
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.resolve.DescriptorUtils.isEnumEntry
import org.jetbrains.kotlin.resolve.MemberComparator
import org.jetbrains.kotlin.resolve.constants.NullValue
-import org.jetbrains.kotlin.serialization.deserialization.descriptors.SinceKotlinInfo
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.VersionRequirement
import org.jetbrains.kotlin.types.*
import org.jetbrains.kotlin.types.typeUtil.contains
import org.jetbrains.kotlin.utils.Interner
@@ -41,7 +41,7 @@ class DescriptorSerializer private constructor(
private val typeParameters: Interner,
private val extension: SerializerExtension,
private val typeTable: MutableTypeTable,
- private val sinceKotlinInfoTable: MutableSinceKotlinInfoTable,
+ private val versionRequirementTable: MutableVersionRequirementTable,
private val serializeTypeTableToFunction: Boolean
) {
fun serialize(message: MessageLite): ByteArray {
@@ -52,7 +52,7 @@ class DescriptorSerializer private constructor(
}
private fun createChildSerializer(descriptor: DeclarationDescriptor): DescriptorSerializer =
- DescriptorSerializer(descriptor, Interner(typeParameters), extension, typeTable, sinceKotlinInfoTable,
+ DescriptorSerializer(descriptor, Interner(typeParameters), extension, typeTable, versionRequirementTable,
serializeTypeTableToFunction = false)
val stringTable: StringTable
@@ -134,9 +134,9 @@ class DescriptorSerializer private constructor(
builder.typeTable = typeTableProto
}
- val sinceKotlinInfoProto = sinceKotlinInfoTable.serialize()
- if (sinceKotlinInfoProto != null) {
- builder.sinceKotlinInfoTable = sinceKotlinInfoProto
+ val versionRequirementTableProto = versionRequirementTable.serialize()
+ if (versionRequirementTableProto != null) {
+ builder.versionRequirementTable = versionRequirementTableProto
}
extension.serializeClass(classDescriptor, builder)
@@ -217,7 +217,7 @@ class DescriptorSerializer private constructor(
}
if (descriptor.isSuspendOrHasSuspendTypesInSignature()) {
- builder.sinceKotlinInfo = writeSinceKotlinInfo(LanguageFeature.Coroutines)
+ builder.versionRequirement = writeVersionRequirement(LanguageFeature.Coroutines)
}
extension.serializeProperty(descriptor, builder)
@@ -274,7 +274,7 @@ class DescriptorSerializer private constructor(
}
if (descriptor.isSuspendOrHasSuspendTypesInSignature()) {
- builder.sinceKotlinInfo = writeSinceKotlinInfo(LanguageFeature.Coroutines)
+ builder.versionRequirement = writeVersionRequirement(LanguageFeature.Coroutines)
}
extension.serializeFunction(descriptor, builder)
@@ -297,7 +297,7 @@ class DescriptorSerializer private constructor(
}
if (descriptor.isSuspendOrHasSuspendTypesInSignature()) {
- builder.sinceKotlinInfo = writeSinceKotlinInfo(LanguageFeature.Coroutines)
+ builder.versionRequirement = writeVersionRequirement(LanguageFeature.Coroutines)
}
extension.serializeConstructor(descriptor, builder)
@@ -557,9 +557,9 @@ class DescriptorSerializer private constructor(
builder.typeTable = typeTableProto
}
- val sinceKotlinInfoProto = sinceKotlinInfoTable.serialize()
- if (sinceKotlinInfoProto != null) {
- builder.sinceKotlinInfoTable = sinceKotlinInfoProto
+ val versionRequirementTableProto = versionRequirementTable.serialize()
+ if (versionRequirementTableProto != null) {
+ builder.versionRequirementTable = versionRequirementTableProto
}
extension.serializePackage(packageFqName, builder)
@@ -567,15 +567,15 @@ class DescriptorSerializer private constructor(
return builder
}
- private fun writeSinceKotlinInfo(languageFeature: LanguageFeature): Int {
+ private fun writeVersionRequirement(languageFeature: LanguageFeature): Int {
val languageVersion = languageFeature.sinceVersion!!
- val sinceKotlinInfo = ProtoBuf.SinceKotlinInfo.newBuilder().apply {
- SinceKotlinInfo.Version(languageVersion.major, languageVersion.minor).encode(
+ val requirement = ProtoBuf.VersionRequirement.newBuilder().apply {
+ VersionRequirement.Version(languageVersion.major, languageVersion.minor).encode(
writeVersion = { version = it },
writeVersionFull = { versionFull = it }
)
}
- return sinceKotlinInfoTable[sinceKotlinInfo]
+ return versionRequirementTable[requirement]
}
private fun getClassifierId(descriptor: ClassifierDescriptorWithTypeParameters): Int =
@@ -590,13 +590,13 @@ class DescriptorSerializer private constructor(
companion object {
@JvmStatic
fun createTopLevel(extension: SerializerExtension): DescriptorSerializer {
- return DescriptorSerializer(null, Interner(), extension, MutableTypeTable(), MutableSinceKotlinInfoTable(),
+ return DescriptorSerializer(null, Interner(), extension, MutableTypeTable(), MutableVersionRequirementTable(),
serializeTypeTableToFunction = false)
}
@JvmStatic
fun createForLambda(extension: SerializerExtension): DescriptorSerializer {
- return DescriptorSerializer(null, Interner(), extension, MutableTypeTable(), MutableSinceKotlinInfoTable(),
+ return DescriptorSerializer(null, Interner(), extension, MutableTypeTable(), MutableVersionRequirementTable(),
serializeTypeTableToFunction = true)
}
@@ -616,7 +616,7 @@ class DescriptorSerializer private constructor(
Interner(parentSerializer.typeParameters),
parentSerializer.extension,
MutableTypeTable(),
- MutableSinceKotlinInfoTable(),
+ MutableVersionRequirementTable(),
serializeTypeTableToFunction = false
)
for (typeParameter in descriptor.declaredTypeParameters) {
diff --git a/compiler/serialization/src/org/jetbrains/kotlin/serialization/MutableTable.kt b/compiler/serialization/src/org/jetbrains/kotlin/serialization/MutableTable.kt
index 76e986a702e..dd8d14c1637 100644
--- a/compiler/serialization/src/org/jetbrains/kotlin/serialization/MutableTable.kt
+++ b/compiler/serialization/src/org/jetbrains/kotlin/serialization/MutableTable.kt
@@ -63,10 +63,10 @@ class MutableTypeTable : MutableTable() {
- override fun createTableBuilder(): ProtoBuf.SinceKotlinInfoTable.Builder = ProtoBuf.SinceKotlinInfoTable.newBuilder()
+class MutableVersionRequirementTable : MutableTable() {
+ override fun createTableBuilder(): ProtoBuf.VersionRequirementTable.Builder = ProtoBuf.VersionRequirementTable.newBuilder()
- override fun addElement(builder: ProtoBuf.SinceKotlinInfoTable.Builder, element: ProtoBuf.SinceKotlinInfo.Builder) {
- builder.addInfo(element)
+ override fun addElement(builder: ProtoBuf.VersionRequirementTable.Builder, element: ProtoBuf.VersionRequirement.Builder) {
+ builder.addRequirement(element)
}
}
diff --git a/compiler/testData/sinceKotlinInfo/suspendFun.kt b/compiler/testData/versionRequirement/suspendFun.kt
similarity index 100%
rename from compiler/testData/sinceKotlinInfo/suspendFun.kt
rename to compiler/testData/versionRequirement/suspendFun.kt
diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/SinceKotlinInfoTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/VersionRequirementTest.kt
similarity index 83%
rename from compiler/tests/org/jetbrains/kotlin/serialization/SinceKotlinInfoTest.kt
rename to compiler/tests/org/jetbrains/kotlin/serialization/VersionRequirementTest.kt
index 48d8d8fd46b..b8c6ae92f78 100644
--- a/compiler/tests/org/jetbrains/kotlin/serialization/SinceKotlinInfoTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/VersionRequirementTest.kt
@@ -22,24 +22,22 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.descriptors.PackageViewDescriptor
-import org.jetbrains.kotlin.incremental.components.NoLookupLocation
import org.jetbrains.kotlin.jvm.compiler.LoadDescriptorUtil
import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil
import org.jetbrains.kotlin.resolve.scopes.getDescriptorsFiltered
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedMemberDescriptor
-import org.jetbrains.kotlin.serialization.deserialization.descriptors.SinceKotlinInfo
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.VersionRequirement
import org.jetbrains.kotlin.test.ConfigurationKind
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.TestCaseWithTmpdir
import org.jetbrains.kotlin.test.TestJdkKind
import java.io.File
-class SinceKotlinInfoTest : TestCaseWithTmpdir() {
+class VersionRequirementTest : TestCaseWithTmpdir() {
fun doTest(
fileName: String,
- expectedSinceKotlinInfoVersion: SinceKotlinInfo.Version,
+ expectedVersionRequirement: VersionRequirement.Version,
expectedLevel: DeprecationLevel,
expectedMessage: String?,
expectedErrorCode: Int?,
@@ -63,12 +61,12 @@ class SinceKotlinInfoTest : TestCaseWithTmpdir() {
throw AssertionError("Not a deserialized descriptor: $descriptor")
}
- val sinceKotlinInfo = descriptor.sinceKotlinInfo ?: throw AssertionError("No SinceKotlinInfo for $descriptor")
+ val requirement = descriptor.versionRequirement ?: throw AssertionError("No VersionRequirement for $descriptor")
- assertEquals(expectedSinceKotlinInfoVersion, sinceKotlinInfo.version)
- assertEquals(expectedLevel, sinceKotlinInfo.level)
- assertEquals(expectedMessage, sinceKotlinInfo.message)
- assertEquals(expectedErrorCode, sinceKotlinInfo.errorCode)
+ assertEquals(expectedVersionRequirement, requirement.version)
+ assertEquals(expectedLevel, requirement.level)
+ assertEquals(expectedMessage, requirement.message)
+ assertEquals(expectedErrorCode, requirement.errorCode)
}
for (fqName in fqNames) {
@@ -98,8 +96,8 @@ class SinceKotlinInfoTest : TestCaseWithTmpdir() {
}
fun testSuspendFun() {
- doTest("compiler/testData/sinceKotlinInfo/suspendFun.kt",
- SinceKotlinInfo.Version(1, 1), DeprecationLevel.ERROR, null, null,
+ doTest("compiler/testData/versionRequirement/suspendFun.kt",
+ VersionRequirement.Version(1, 1), DeprecationLevel.ERROR, null, null,
"test.topLevel",
"test.Foo.member",
"test.Foo.",
diff --git a/compiler/util/src/org/jetbrains/kotlin/config/ApiVersion.kt b/compiler/util/src/org/jetbrains/kotlin/config/ApiVersion.kt
index 5d03983492f..09127670ef1 100644
--- a/compiler/util/src/org/jetbrains/kotlin/config/ApiVersion.kt
+++ b/compiler/util/src/org/jetbrains/kotlin/config/ApiVersion.kt
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.config
-import org.jetbrains.kotlin.serialization.deserialization.descriptors.SinceKotlinInfo
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.VersionRequirement
import org.jetbrains.kotlin.utils.DescriptionAware
class ApiVersion private constructor(
@@ -60,8 +60,8 @@ class ApiVersion private constructor(
fun createByLanguageVersion(version: LanguageVersion): ApiVersion = parse(version.versionString)!!
@JvmStatic
- fun createBySinceKotlinInfo(sinceKotlinInfo: SinceKotlinInfo): ApiVersion =
- sinceKotlinInfo.version.let { version -> parse(version.asString()) ?: error("Could not parse version: $version") }
+ fun createByVersionRequirement(versionRequirement: VersionRequirement): ApiVersion =
+ versionRequirement.version.let { version -> parse(version.asString()) ?: error("Could not parse version: $version") }
fun parse(versionString: String): ApiVersion? = try {
ApiVersion(MavenComparableVersion(versionString), versionString)
diff --git a/core/deserialization/src/descriptors.proto b/core/deserialization/src/descriptors.proto
index cff1e9b5e64..246a78811d2 100644
--- a/core/deserialization/src/descriptors.proto
+++ b/core/deserialization/src/descriptors.proto
@@ -211,10 +211,10 @@ message Class {
optional TypeTable type_table = 30;
- // Index into the SinceKotlinInfoTable
- optional int32 sinceKotlinInfo = 31;
+ // Index into the VersionRequirementTable
+ optional int32 version_requirement = 31;
- optional SinceKotlinInfoTable since_kotlin_info_table = 32;
+ optional VersionRequirementTable version_requirement_table = 32;
extensions 100 to 199;
}
@@ -226,7 +226,7 @@ message Package {
optional TypeTable type_table = 30;
- optional SinceKotlinInfoTable since_kotlin_info_table = 32;
+ optional VersionRequirementTable version_requirement_table = 32;
extensions 100 to 199;
}
@@ -249,8 +249,8 @@ message Constructor {
repeated ValueParameter value_parameter = 2;
- // Index into the SinceKotlinInfoTable
- optional int32 sinceKotlinInfo = 31;
+ // Index into the VersionRequirementTable
+ optional int32 version_requirement = 31;
extensions 100 to 199;
}
@@ -286,8 +286,8 @@ message Function {
optional TypeTable type_table = 30;
- // Index into the SinceKotlinInfoTable
- optional int32 sinceKotlinInfo = 31;
+ // Index into the VersionRequirementTable
+ optional int32 version_requirement = 31;
extensions 100 to 199;
}
@@ -334,8 +334,8 @@ message Property {
optional int32 getter_flags = 7 /* absent => same as property */;
optional int32 setter_flags = 8 /* absent => same as property */;
- // Index into the SinceKotlinInfoTable
- optional int32 sinceKotlinInfo = 31;
+ // Index into the VersionRequirementTable
+ optional int32 version_requirement = 31;
extensions 100 to 199;
}
@@ -379,8 +379,8 @@ message TypeAlias {
repeated Annotation annotation = 8;
- // Index into the SinceKotlinInfoTable
- optional int32 sinceKotlinInfo = 31;
+ // Index into the VersionRequirementTable
+ optional int32 version_requirement = 31;
extensions 100 to 199;
}
@@ -417,7 +417,7 @@ enum MemberKind {
SYNTHESIZED = 3;
}
-message SinceKotlinInfo {
+message VersionRequirement {
enum Level {
WARNING = 0;
ERROR = 1;
@@ -443,8 +443,8 @@ message SinceKotlinInfo {
optional int32 message = 5 [(string_id_in_table) = true];
}
-message SinceKotlinInfoTable {
- repeated SinceKotlinInfo info = 1;
+message VersionRequirementTable {
+ repeated VersionRequirement requirement = 1;
}
// A part of the package, which is used to serialize .kjsm/.meta.js, .kotlin_builtins and .kotlin_metadata files.
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
index b4542e08119..331e01a373a 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
@@ -8120,30 +8120,30 @@ public final class ProtoBuf {
org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable getTypeTable();
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- boolean hasSinceKotlinInfo();
+ boolean hasVersionRequirement();
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- int getSinceKotlinInfo();
+ int getVersionRequirement();
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfoTable since_kotlin_info_table = 32;
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
*/
- boolean hasSinceKotlinInfoTable();
+ boolean hasVersionRequirementTable();
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfoTable since_kotlin_info_table = 32;
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
*/
- org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable getSinceKotlinInfoTable();
+ org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable getVersionRequirementTable();
}
/**
* Protobuf type {@code org.jetbrains.kotlin.serialization.Class}
@@ -8345,18 +8345,18 @@ public final class ProtoBuf {
}
case 248: {
bitField0_ |= 0x00000010;
- sinceKotlinInfo_ = input.readInt32();
+ versionRequirement_ = input.readInt32();
break;
}
case 258: {
- org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable.Builder subBuilder = null;
+ org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.Builder subBuilder = null;
if (((bitField0_ & 0x00000020) == 0x00000020)) {
- subBuilder = sinceKotlinInfoTable_.toBuilder();
+ subBuilder = versionRequirementTable_.toBuilder();
}
- sinceKotlinInfoTable_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable.PARSER, extensionRegistry);
+ versionRequirementTable_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.PARSER, extensionRegistry);
if (subBuilder != null) {
- subBuilder.mergeFrom(sinceKotlinInfoTable_);
- sinceKotlinInfoTable_ = subBuilder.buildPartial();
+ subBuilder.mergeFrom(versionRequirementTable_);
+ versionRequirementTable_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000020;
break;
@@ -8928,42 +8928,42 @@ public final class ProtoBuf {
return typeTable_;
}
- public static final int SINCEKOTLININFO_FIELD_NUMBER = 31;
- private int sinceKotlinInfo_;
+ public static final int VERSION_REQUIREMENT_FIELD_NUMBER = 31;
+ private int versionRequirement_;
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public boolean hasSinceKotlinInfo() {
+ public boolean hasVersionRequirement() {
return ((bitField0_ & 0x00000010) == 0x00000010);
}
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public int getSinceKotlinInfo() {
- return sinceKotlinInfo_;
+ public int getVersionRequirement() {
+ return versionRequirement_;
}
- public static final int SINCE_KOTLIN_INFO_TABLE_FIELD_NUMBER = 32;
- private org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable sinceKotlinInfoTable_;
+ public static final int VERSION_REQUIREMENT_TABLE_FIELD_NUMBER = 32;
+ private org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable versionRequirementTable_;
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfoTable since_kotlin_info_table = 32;
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
*/
- public boolean hasSinceKotlinInfoTable() {
+ public boolean hasVersionRequirementTable() {
return ((bitField0_ & 0x00000020) == 0x00000020);
}
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfoTable since_kotlin_info_table = 32;
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
*/
- public org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable getSinceKotlinInfoTable() {
- return sinceKotlinInfoTable_;
+ public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable getVersionRequirementTable() {
+ return versionRequirementTable_;
}
private void initFields() {
@@ -8981,8 +8981,8 @@ public final class ProtoBuf {
enumEntry_ = java.util.Collections.emptyList();
sealedSubclassFqName_ = java.util.Collections.emptyList();
typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
- sinceKotlinInfo_ = 0;
- sinceKotlinInfoTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable.getDefaultInstance();
+ versionRequirement_ = 0;
+ versionRequirementTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.getDefaultInstance();
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -9111,10 +9111,10 @@ public final class ProtoBuf {
output.writeMessage(30, typeTable_);
}
if (((bitField0_ & 0x00000010) == 0x00000010)) {
- output.writeInt32(31, sinceKotlinInfo_);
+ output.writeInt32(31, versionRequirement_);
}
if (((bitField0_ & 0x00000020) == 0x00000020)) {
- output.writeMessage(32, sinceKotlinInfoTable_);
+ output.writeMessage(32, versionRequirementTable_);
}
extensionWriter.writeUntil(200, output);
output.writeRawBytes(unknownFields);
@@ -9214,11 +9214,11 @@ public final class ProtoBuf {
}
if (((bitField0_ & 0x00000010) == 0x00000010)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
- .computeInt32Size(31, sinceKotlinInfo_);
+ .computeInt32Size(31, versionRequirement_);
}
if (((bitField0_ & 0x00000020) == 0x00000020)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
- .computeMessageSize(32, sinceKotlinInfoTable_);
+ .computeMessageSize(32, versionRequirementTable_);
}
size += extensionsSerializedSize();
size += unknownFields.size();
@@ -9342,9 +9342,9 @@ public final class ProtoBuf {
bitField0_ = (bitField0_ & ~0x00001000);
typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00002000);
- sinceKotlinInfo_ = 0;
+ versionRequirement_ = 0;
bitField0_ = (bitField0_ & ~0x00004000);
- sinceKotlinInfoTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable.getDefaultInstance();
+ versionRequirementTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00008000);
return this;
}
@@ -9438,11 +9438,11 @@ public final class ProtoBuf {
if (((from_bitField0_ & 0x00004000) == 0x00004000)) {
to_bitField0_ |= 0x00000010;
}
- result.sinceKotlinInfo_ = sinceKotlinInfo_;
+ result.versionRequirement_ = versionRequirement_;
if (((from_bitField0_ & 0x00008000) == 0x00008000)) {
to_bitField0_ |= 0x00000020;
}
- result.sinceKotlinInfoTable_ = sinceKotlinInfoTable_;
+ result.versionRequirementTable_ = versionRequirementTable_;
result.bitField0_ = to_bitField0_;
return result;
}
@@ -9561,11 +9561,11 @@ public final class ProtoBuf {
if (other.hasTypeTable()) {
mergeTypeTable(other.getTypeTable());
}
- if (other.hasSinceKotlinInfo()) {
- setSinceKotlinInfo(other.getSinceKotlinInfo());
+ if (other.hasVersionRequirement()) {
+ setVersionRequirement(other.getVersionRequirement());
}
- if (other.hasSinceKotlinInfoTable()) {
- mergeSinceKotlinInfoTable(other.getSinceKotlinInfoTable());
+ if (other.hasVersionRequirementTable()) {
+ mergeVersionRequirementTable(other.getVersionRequirementTable());
}
this.mergeExtensionFields(other);
setUnknownFields(
@@ -10921,109 +10921,109 @@ public final class ProtoBuf {
return this;
}
- private int sinceKotlinInfo_ ;
+ private int versionRequirement_ ;
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public boolean hasSinceKotlinInfo() {
+ public boolean hasVersionRequirement() {
return ((bitField0_ & 0x00004000) == 0x00004000);
}
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public int getSinceKotlinInfo() {
- return sinceKotlinInfo_;
+ public int getVersionRequirement() {
+ return versionRequirement_;
}
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public Builder setSinceKotlinInfo(int value) {
+ public Builder setVersionRequirement(int value) {
bitField0_ |= 0x00004000;
- sinceKotlinInfo_ = value;
+ versionRequirement_ = value;
return this;
}
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public Builder clearSinceKotlinInfo() {
+ public Builder clearVersionRequirement() {
bitField0_ = (bitField0_ & ~0x00004000);
- sinceKotlinInfo_ = 0;
+ versionRequirement_ = 0;
return this;
}
- private org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable sinceKotlinInfoTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable.getDefaultInstance();
+ private org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable versionRequirementTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.getDefaultInstance();
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfoTable since_kotlin_info_table = 32;
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
*/
- public boolean hasSinceKotlinInfoTable() {
+ public boolean hasVersionRequirementTable() {
return ((bitField0_ & 0x00008000) == 0x00008000);
}
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfoTable since_kotlin_info_table = 32;
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
*/
- public org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable getSinceKotlinInfoTable() {
- return sinceKotlinInfoTable_;
+ public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable getVersionRequirementTable() {
+ return versionRequirementTable_;
}
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfoTable since_kotlin_info_table = 32;
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
*/
- public Builder setSinceKotlinInfoTable(org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable value) {
+ public Builder setVersionRequirementTable(org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable value) {
if (value == null) {
throw new NullPointerException();
}
- sinceKotlinInfoTable_ = value;
+ versionRequirementTable_ = value;
bitField0_ |= 0x00008000;
return this;
}
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfoTable since_kotlin_info_table = 32;
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
*/
- public Builder setSinceKotlinInfoTable(
- org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable.Builder builderForValue) {
- sinceKotlinInfoTable_ = builderForValue.build();
+ public Builder setVersionRequirementTable(
+ org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.Builder builderForValue) {
+ versionRequirementTable_ = builderForValue.build();
bitField0_ |= 0x00008000;
return this;
}
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfoTable since_kotlin_info_table = 32;
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
*/
- public Builder mergeSinceKotlinInfoTable(org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable value) {
+ public Builder mergeVersionRequirementTable(org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable value) {
if (((bitField0_ & 0x00008000) == 0x00008000) &&
- sinceKotlinInfoTable_ != org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable.getDefaultInstance()) {
- sinceKotlinInfoTable_ =
- org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable.newBuilder(sinceKotlinInfoTable_).mergeFrom(value).buildPartial();
+ versionRequirementTable_ != org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.getDefaultInstance()) {
+ versionRequirementTable_ =
+ org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.newBuilder(versionRequirementTable_).mergeFrom(value).buildPartial();
} else {
- sinceKotlinInfoTable_ = value;
+ versionRequirementTable_ = value;
}
bitField0_ |= 0x00008000;
return this;
}
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfoTable since_kotlin_info_table = 32;
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
*/
- public Builder clearSinceKotlinInfoTable() {
- sinceKotlinInfoTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable.getDefaultInstance();
+ public Builder clearVersionRequirementTable() {
+ versionRequirementTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00008000);
return this;
@@ -11097,13 +11097,13 @@ public final class ProtoBuf {
org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable getTypeTable();
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfoTable since_kotlin_info_table = 32;
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
*/
- boolean hasSinceKotlinInfoTable();
+ boolean hasVersionRequirementTable();
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfoTable since_kotlin_info_table = 32;
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
*/
- org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable getSinceKotlinInfoTable();
+ org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable getVersionRequirementTable();
}
/**
* Protobuf type {@code org.jetbrains.kotlin.serialization.Package}
@@ -11194,14 +11194,14 @@ public final class ProtoBuf {
break;
}
case 258: {
- org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable.Builder subBuilder = null;
+ org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.Builder subBuilder = null;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
- subBuilder = sinceKotlinInfoTable_.toBuilder();
+ subBuilder = versionRequirementTable_.toBuilder();
}
- sinceKotlinInfoTable_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable.PARSER, extensionRegistry);
+ versionRequirementTable_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.PARSER, extensionRegistry);
if (subBuilder != null) {
- subBuilder.mergeFrom(sinceKotlinInfoTable_);
- sinceKotlinInfoTable_ = subBuilder.buildPartial();
+ subBuilder.mergeFrom(versionRequirementTable_);
+ versionRequirementTable_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000002;
break;
@@ -11369,19 +11369,19 @@ public final class ProtoBuf {
return typeTable_;
}
- public static final int SINCE_KOTLIN_INFO_TABLE_FIELD_NUMBER = 32;
- private org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable sinceKotlinInfoTable_;
+ public static final int VERSION_REQUIREMENT_TABLE_FIELD_NUMBER = 32;
+ private org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable versionRequirementTable_;
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfoTable since_kotlin_info_table = 32;
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
*/
- public boolean hasSinceKotlinInfoTable() {
+ public boolean hasVersionRequirementTable() {
return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfoTable since_kotlin_info_table = 32;
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
*/
- public org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable getSinceKotlinInfoTable() {
- return sinceKotlinInfoTable_;
+ public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable getVersionRequirementTable() {
+ return versionRequirementTable_;
}
private void initFields() {
@@ -11389,7 +11389,7 @@ public final class ProtoBuf {
property_ = java.util.Collections.emptyList();
typeAlias_ = java.util.Collections.emptyList();
typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
- sinceKotlinInfoTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable.getDefaultInstance();
+ versionRequirementTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.getDefaultInstance();
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -11448,7 +11448,7 @@ public final class ProtoBuf {
output.writeMessage(30, typeTable_);
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
- output.writeMessage(32, sinceKotlinInfoTable_);
+ output.writeMessage(32, versionRequirementTable_);
}
extensionWriter.writeUntil(200, output);
output.writeRawBytes(unknownFields);
@@ -11478,7 +11478,7 @@ public final class ProtoBuf {
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
- .computeMessageSize(32, sinceKotlinInfoTable_);
+ .computeMessageSize(32, versionRequirementTable_);
}
size += extensionsSerializedSize();
size += unknownFields.size();
@@ -11582,7 +11582,7 @@ public final class ProtoBuf {
bitField0_ = (bitField0_ & ~0x00000004);
typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000008);
- sinceKotlinInfoTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable.getDefaultInstance();
+ versionRequirementTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000010);
return this;
}
@@ -11629,7 +11629,7 @@ public final class ProtoBuf {
if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
to_bitField0_ |= 0x00000002;
}
- result.sinceKotlinInfoTable_ = sinceKotlinInfoTable_;
+ result.versionRequirementTable_ = versionRequirementTable_;
result.bitField0_ = to_bitField0_;
return result;
}
@@ -11669,8 +11669,8 @@ public final class ProtoBuf {
if (other.hasTypeTable()) {
mergeTypeTable(other.getTypeTable());
}
- if (other.hasSinceKotlinInfoTable()) {
- mergeSinceKotlinInfoTable(other.getSinceKotlinInfoTable());
+ if (other.hasVersionRequirementTable()) {
+ mergeVersionRequirementTable(other.getVersionRequirementTable());
}
this.mergeExtensionFields(other);
setUnknownFields(
@@ -12164,61 +12164,61 @@ public final class ProtoBuf {
return this;
}
- private org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable sinceKotlinInfoTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable.getDefaultInstance();
+ private org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable versionRequirementTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.getDefaultInstance();
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfoTable since_kotlin_info_table = 32;
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
*/
- public boolean hasSinceKotlinInfoTable() {
+ public boolean hasVersionRequirementTable() {
return ((bitField0_ & 0x00000010) == 0x00000010);
}
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfoTable since_kotlin_info_table = 32;
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
*/
- public org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable getSinceKotlinInfoTable() {
- return sinceKotlinInfoTable_;
+ public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable getVersionRequirementTable() {
+ return versionRequirementTable_;
}
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfoTable since_kotlin_info_table = 32;
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
*/
- public Builder setSinceKotlinInfoTable(org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable value) {
+ public Builder setVersionRequirementTable(org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable value) {
if (value == null) {
throw new NullPointerException();
}
- sinceKotlinInfoTable_ = value;
+ versionRequirementTable_ = value;
bitField0_ |= 0x00000010;
return this;
}
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfoTable since_kotlin_info_table = 32;
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
*/
- public Builder setSinceKotlinInfoTable(
- org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable.Builder builderForValue) {
- sinceKotlinInfoTable_ = builderForValue.build();
+ public Builder setVersionRequirementTable(
+ org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.Builder builderForValue) {
+ versionRequirementTable_ = builderForValue.build();
bitField0_ |= 0x00000010;
return this;
}
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfoTable since_kotlin_info_table = 32;
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
*/
- public Builder mergeSinceKotlinInfoTable(org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable value) {
+ public Builder mergeVersionRequirementTable(org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable value) {
if (((bitField0_ & 0x00000010) == 0x00000010) &&
- sinceKotlinInfoTable_ != org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable.getDefaultInstance()) {
- sinceKotlinInfoTable_ =
- org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable.newBuilder(sinceKotlinInfoTable_).mergeFrom(value).buildPartial();
+ versionRequirementTable_ != org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.getDefaultInstance()) {
+ versionRequirementTable_ =
+ org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.newBuilder(versionRequirementTable_).mergeFrom(value).buildPartial();
} else {
- sinceKotlinInfoTable_ = value;
+ versionRequirementTable_ = value;
}
bitField0_ |= 0x00000010;
return this;
}
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfoTable since_kotlin_info_table = 32;
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
*/
- public Builder clearSinceKotlinInfoTable() {
- sinceKotlinInfoTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable.getDefaultInstance();
+ public Builder clearVersionRequirementTable() {
+ versionRequirementTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000010);
return this;
@@ -12890,21 +12890,21 @@ public final class ProtoBuf {
int getValueParameterCount();
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- boolean hasSinceKotlinInfo();
+ boolean hasVersionRequirement();
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- int getSinceKotlinInfo();
+ int getVersionRequirement();
}
/**
* Protobuf type {@code org.jetbrains.kotlin.serialization.Constructor}
@@ -12972,7 +12972,7 @@ public final class ProtoBuf {
}
case 248: {
bitField0_ |= 0x00000002;
- sinceKotlinInfo_ = input.readInt32();
+ versionRequirement_ = input.readInt32();
break;
}
}
@@ -13074,33 +13074,33 @@ public final class ProtoBuf {
return valueParameter_.get(index);
}
- public static final int SINCEKOTLININFO_FIELD_NUMBER = 31;
- private int sinceKotlinInfo_;
+ public static final int VERSION_REQUIREMENT_FIELD_NUMBER = 31;
+ private int versionRequirement_;
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public boolean hasSinceKotlinInfo() {
+ public boolean hasVersionRequirement() {
return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public int getSinceKotlinInfo() {
- return sinceKotlinInfo_;
+ public int getVersionRequirement() {
+ return versionRequirement_;
}
private void initFields() {
flags_ = 6;
valueParameter_ = java.util.Collections.emptyList();
- sinceKotlinInfo_ = 0;
+ versionRequirement_ = 0;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -13135,7 +13135,7 @@ public final class ProtoBuf {
output.writeMessage(2, valueParameter_.get(i));
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
- output.writeInt32(31, sinceKotlinInfo_);
+ output.writeInt32(31, versionRequirement_);
}
extensionWriter.writeUntil(200, output);
output.writeRawBytes(unknownFields);
@@ -13157,7 +13157,7 @@ public final class ProtoBuf {
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
- .computeInt32Size(31, sinceKotlinInfo_);
+ .computeInt32Size(31, versionRequirement_);
}
size += extensionsSerializedSize();
size += unknownFields.size();
@@ -13257,7 +13257,7 @@ public final class ProtoBuf {
bitField0_ = (bitField0_ & ~0x00000001);
valueParameter_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000002);
- sinceKotlinInfo_ = 0;
+ versionRequirement_ = 0;
bitField0_ = (bitField0_ & ~0x00000004);
return this;
}
@@ -13294,7 +13294,7 @@ public final class ProtoBuf {
if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
to_bitField0_ |= 0x00000002;
}
- result.sinceKotlinInfo_ = sinceKotlinInfo_;
+ result.versionRequirement_ = versionRequirement_;
result.bitField0_ = to_bitField0_;
return result;
}
@@ -13314,8 +13314,8 @@ public final class ProtoBuf {
}
}
- if (other.hasSinceKotlinInfo()) {
- setSinceKotlinInfo(other.getSinceKotlinInfo());
+ if (other.hasVersionRequirement()) {
+ setVersionRequirement(other.getVersionRequirement());
}
this.mergeExtensionFields(other);
setUnknownFields(
@@ -13537,50 +13537,50 @@ public final class ProtoBuf {
return this;
}
- private int sinceKotlinInfo_ ;
+ private int versionRequirement_ ;
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public boolean hasSinceKotlinInfo() {
+ public boolean hasVersionRequirement() {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public int getSinceKotlinInfo() {
- return sinceKotlinInfo_;
+ public int getVersionRequirement() {
+ return versionRequirement_;
}
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public Builder setSinceKotlinInfo(int value) {
+ public Builder setVersionRequirement(int value) {
bitField0_ |= 0x00000004;
- sinceKotlinInfo_ = value;
+ versionRequirement_ = value;
return this;
}
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public Builder clearSinceKotlinInfo() {
+ public Builder clearVersionRequirement() {
bitField0_ = (bitField0_ & ~0x00000004);
- sinceKotlinInfo_ = 0;
+ versionRequirement_ = 0;
return this;
}
@@ -13730,21 +13730,21 @@ public final class ProtoBuf {
org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable getTypeTable();
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- boolean hasSinceKotlinInfo();
+ boolean hasVersionRequirement();
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- int getSinceKotlinInfo();
+ int getVersionRequirement();
}
/**
* Protobuf type {@code org.jetbrains.kotlin.serialization.Function}
@@ -13879,7 +13879,7 @@ public final class ProtoBuf {
}
case 248: {
bitField0_ |= 0x00000100;
- sinceKotlinInfo_ = input.readInt32();
+ versionRequirement_ = input.readInt32();
break;
}
}
@@ -14140,27 +14140,27 @@ public final class ProtoBuf {
return typeTable_;
}
- public static final int SINCEKOTLININFO_FIELD_NUMBER = 31;
- private int sinceKotlinInfo_;
+ public static final int VERSION_REQUIREMENT_FIELD_NUMBER = 31;
+ private int versionRequirement_;
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public boolean hasSinceKotlinInfo() {
+ public boolean hasVersionRequirement() {
return ((bitField0_ & 0x00000100) == 0x00000100);
}
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public int getSinceKotlinInfo() {
- return sinceKotlinInfo_;
+ public int getVersionRequirement() {
+ return versionRequirement_;
}
private void initFields() {
@@ -14174,7 +14174,7 @@ public final class ProtoBuf {
receiverTypeId_ = 0;
valueParameter_ = java.util.Collections.emptyList();
typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
- sinceKotlinInfo_ = 0;
+ versionRequirement_ = 0;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -14261,7 +14261,7 @@ public final class ProtoBuf {
output.writeMessage(30, typeTable_);
}
if (((bitField0_ & 0x00000100) == 0x00000100)) {
- output.writeInt32(31, sinceKotlinInfo_);
+ output.writeInt32(31, versionRequirement_);
}
extensionWriter.writeUntil(200, output);
output.writeRawBytes(unknownFields);
@@ -14315,7 +14315,7 @@ public final class ProtoBuf {
}
if (((bitField0_ & 0x00000100) == 0x00000100)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
- .computeInt32Size(31, sinceKotlinInfo_);
+ .computeInt32Size(31, versionRequirement_);
}
size += extensionsSerializedSize();
size += unknownFields.size();
@@ -14431,7 +14431,7 @@ public final class ProtoBuf {
bitField0_ = (bitField0_ & ~0x00000100);
typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000200);
- sinceKotlinInfo_ = 0;
+ versionRequirement_ = 0;
bitField0_ = (bitField0_ & ~0x00000400);
return this;
}
@@ -14501,7 +14501,7 @@ public final class ProtoBuf {
if (((from_bitField0_ & 0x00000400) == 0x00000400)) {
to_bitField0_ |= 0x00000100;
}
- result.sinceKotlinInfo_ = sinceKotlinInfo_;
+ result.versionRequirement_ = versionRequirement_;
result.bitField0_ = to_bitField0_;
return result;
}
@@ -14552,8 +14552,8 @@ public final class ProtoBuf {
if (other.hasTypeTable()) {
mergeTypeTable(other.getTypeTable());
}
- if (other.hasSinceKotlinInfo()) {
- setSinceKotlinInfo(other.getSinceKotlinInfo());
+ if (other.hasVersionRequirement()) {
+ setVersionRequirement(other.getVersionRequirement());
}
this.mergeExtensionFields(other);
setUnknownFields(
@@ -15268,50 +15268,50 @@ public final class ProtoBuf {
return this;
}
- private int sinceKotlinInfo_ ;
+ private int versionRequirement_ ;
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public boolean hasSinceKotlinInfo() {
+ public boolean hasVersionRequirement() {
return ((bitField0_ & 0x00000400) == 0x00000400);
}
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public int getSinceKotlinInfo() {
- return sinceKotlinInfo_;
+ public int getVersionRequirement() {
+ return versionRequirement_;
}
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public Builder setSinceKotlinInfo(int value) {
+ public Builder setVersionRequirement(int value) {
bitField0_ |= 0x00000400;
- sinceKotlinInfo_ = value;
+ versionRequirement_ = value;
return this;
}
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public Builder clearSinceKotlinInfo() {
+ public Builder clearVersionRequirement() {
bitField0_ = (bitField0_ & ~0x00000400);
- sinceKotlinInfo_ = 0;
+ versionRequirement_ = 0;
return this;
}
@@ -15487,21 +15487,21 @@ public final class ProtoBuf {
int getSetterFlags();
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- boolean hasSinceKotlinInfo();
+ boolean hasVersionRequirement();
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- int getSinceKotlinInfo();
+ int getVersionRequirement();
}
/**
* Protobuf type {@code org.jetbrains.kotlin.serialization.Property}
@@ -15638,7 +15638,7 @@ public final class ProtoBuf {
}
case 248: {
bitField0_ |= 0x00000400;
- sinceKotlinInfo_ = input.readInt32();
+ versionRequirement_ = input.readInt32();
break;
}
}
@@ -15913,27 +15913,27 @@ public final class ProtoBuf {
return setterFlags_;
}
- public static final int SINCEKOTLININFO_FIELD_NUMBER = 31;
- private int sinceKotlinInfo_;
+ public static final int VERSION_REQUIREMENT_FIELD_NUMBER = 31;
+ private int versionRequirement_;
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public boolean hasSinceKotlinInfo() {
+ public boolean hasVersionRequirement() {
return ((bitField0_ & 0x00000400) == 0x00000400);
}
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public int getSinceKotlinInfo() {
- return sinceKotlinInfo_;
+ public int getVersionRequirement() {
+ return versionRequirement_;
}
private void initFields() {
@@ -15948,7 +15948,7 @@ public final class ProtoBuf {
setterValueParameter_ = org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.getDefaultInstance();
getterFlags_ = 0;
setterFlags_ = 0;
- sinceKotlinInfo_ = 0;
+ versionRequirement_ = 0;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -16032,7 +16032,7 @@ public final class ProtoBuf {
output.writeInt32(11, flags_);
}
if (((bitField0_ & 0x00000400) == 0x00000400)) {
- output.writeInt32(31, sinceKotlinInfo_);
+ output.writeInt32(31, versionRequirement_);
}
extensionWriter.writeUntil(200, output);
output.writeRawBytes(unknownFields);
@@ -16090,7 +16090,7 @@ public final class ProtoBuf {
}
if (((bitField0_ & 0x00000400) == 0x00000400)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
- .computeInt32Size(31, sinceKotlinInfo_);
+ .computeInt32Size(31, versionRequirement_);
}
size += extensionsSerializedSize();
size += unknownFields.size();
@@ -16208,7 +16208,7 @@ public final class ProtoBuf {
bitField0_ = (bitField0_ & ~0x00000200);
setterFlags_ = 0;
bitField0_ = (bitField0_ & ~0x00000400);
- sinceKotlinInfo_ = 0;
+ versionRequirement_ = 0;
bitField0_ = (bitField0_ & ~0x00000800);
return this;
}
@@ -16281,7 +16281,7 @@ public final class ProtoBuf {
if (((from_bitField0_ & 0x00000800) == 0x00000800)) {
to_bitField0_ |= 0x00000400;
}
- result.sinceKotlinInfo_ = sinceKotlinInfo_;
+ result.versionRequirement_ = versionRequirement_;
result.bitField0_ = to_bitField0_;
return result;
}
@@ -16328,8 +16328,8 @@ public final class ProtoBuf {
if (other.hasSetterFlags()) {
setSetterFlags(other.getSetterFlags());
}
- if (other.hasSinceKotlinInfo()) {
- setSinceKotlinInfo(other.getSinceKotlinInfo());
+ if (other.hasVersionRequirement()) {
+ setVersionRequirement(other.getVersionRequirement());
}
this.mergeExtensionFields(other);
setUnknownFields(
@@ -17021,50 +17021,50 @@ public final class ProtoBuf {
return this;
}
- private int sinceKotlinInfo_ ;
+ private int versionRequirement_ ;
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public boolean hasSinceKotlinInfo() {
+ public boolean hasVersionRequirement() {
return ((bitField0_ & 0x00000800) == 0x00000800);
}
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public int getSinceKotlinInfo() {
- return sinceKotlinInfo_;
+ public int getVersionRequirement() {
+ return versionRequirement_;
}
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public Builder setSinceKotlinInfo(int value) {
+ public Builder setVersionRequirement(int value) {
bitField0_ |= 0x00000800;
- sinceKotlinInfo_ = value;
+ versionRequirement_ = value;
return this;
}
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public Builder clearSinceKotlinInfo() {
+ public Builder clearVersionRequirement() {
bitField0_ = (bitField0_ & ~0x00000800);
- sinceKotlinInfo_ = 0;
+ versionRequirement_ = 0;
return this;
}
@@ -18095,21 +18095,21 @@ public final class ProtoBuf {
int getAnnotationCount();
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- boolean hasSinceKotlinInfo();
+ boolean hasVersionRequirement();
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- int getSinceKotlinInfo();
+ int getVersionRequirement();
}
/**
* Protobuf type {@code org.jetbrains.kotlin.serialization.TypeAlias}
@@ -18226,7 +18226,7 @@ public final class ProtoBuf {
}
case 248: {
bitField0_ |= 0x00000040;
- sinceKotlinInfo_ = input.readInt32();
+ versionRequirement_ = input.readInt32();
break;
}
}
@@ -18439,27 +18439,27 @@ public final class ProtoBuf {
return annotation_.get(index);
}
- public static final int SINCEKOTLININFO_FIELD_NUMBER = 31;
- private int sinceKotlinInfo_;
+ public static final int VERSION_REQUIREMENT_FIELD_NUMBER = 31;
+ private int versionRequirement_;
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public boolean hasSinceKotlinInfo() {
+ public boolean hasVersionRequirement() {
return ((bitField0_ & 0x00000040) == 0x00000040);
}
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public int getSinceKotlinInfo() {
- return sinceKotlinInfo_;
+ public int getVersionRequirement() {
+ return versionRequirement_;
}
private void initFields() {
@@ -18471,7 +18471,7 @@ public final class ProtoBuf {
expandedType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
expandedTypeId_ = 0;
annotation_ = java.util.Collections.emptyList();
- sinceKotlinInfo_ = 0;
+ versionRequirement_ = 0;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -18546,7 +18546,7 @@ public final class ProtoBuf {
output.writeMessage(8, annotation_.get(i));
}
if (((bitField0_ & 0x00000040) == 0x00000040)) {
- output.writeInt32(31, sinceKotlinInfo_);
+ output.writeInt32(31, versionRequirement_);
}
extensionWriter.writeUntil(200, output);
output.writeRawBytes(unknownFields);
@@ -18592,7 +18592,7 @@ public final class ProtoBuf {
}
if (((bitField0_ & 0x00000040) == 0x00000040)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
- .computeInt32Size(31, sinceKotlinInfo_);
+ .computeInt32Size(31, versionRequirement_);
}
size += extensionsSerializedSize();
size += unknownFields.size();
@@ -18704,7 +18704,7 @@ public final class ProtoBuf {
bitField0_ = (bitField0_ & ~0x00000040);
annotation_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000080);
- sinceKotlinInfo_ = 0;
+ versionRequirement_ = 0;
bitField0_ = (bitField0_ & ~0x00000100);
return this;
}
@@ -18766,7 +18766,7 @@ public final class ProtoBuf {
if (((from_bitField0_ & 0x00000100) == 0x00000100)) {
to_bitField0_ |= 0x00000040;
}
- result.sinceKotlinInfo_ = sinceKotlinInfo_;
+ result.versionRequirement_ = versionRequirement_;
result.bitField0_ = to_bitField0_;
return result;
}
@@ -18811,8 +18811,8 @@ public final class ProtoBuf {
}
}
- if (other.hasSinceKotlinInfo()) {
- setSinceKotlinInfo(other.getSinceKotlinInfo());
+ if (other.hasVersionRequirement()) {
+ setVersionRequirement(other.getVersionRequirement());
}
this.mergeExtensionFields(other);
setUnknownFields(
@@ -19393,50 +19393,50 @@ public final class ProtoBuf {
return this;
}
- private int sinceKotlinInfo_ ;
+ private int versionRequirement_ ;
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public boolean hasSinceKotlinInfo() {
+ public boolean hasVersionRequirement() {
return ((bitField0_ & 0x00000100) == 0x00000100);
}
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public int getSinceKotlinInfo() {
- return sinceKotlinInfo_;
+ public int getVersionRequirement() {
+ return versionRequirement_;
}
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public Builder setSinceKotlinInfo(int value) {
+ public Builder setVersionRequirement(int value) {
bitField0_ |= 0x00000100;
- sinceKotlinInfo_ = value;
+ versionRequirement_ = value;
return this;
}
/**
- * optional int32 sinceKotlinInfo = 31;
+ * optional int32 version_requirement = 31;
*
*
- * Index into the SinceKotlinInfoTable
+ * Index into the VersionRequirementTable
*
*/
- public Builder clearSinceKotlinInfo() {
+ public Builder clearVersionRequirement() {
bitField0_ = (bitField0_ & ~0x00000100);
- sinceKotlinInfo_ = 0;
+ versionRequirement_ = 0;
return this;
}
@@ -19819,8 +19819,8 @@ public final class ProtoBuf {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.EnumEntry)
}
- public interface SinceKotlinInfoOrBuilder extends
- // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.SinceKotlinInfo)
+ public interface VersionRequirementOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.VersionRequirement)
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
/**
@@ -19864,7 +19864,7 @@ public final class ProtoBuf {
int getVersionFull();
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfo.Level level = 3 [default = ERROR];
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirement.Level level = 3 [default = ERROR];
*
*
* Level of the reported diagnostic
@@ -19872,13 +19872,13 @@ public final class ProtoBuf {
*/
boolean hasLevel();
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfo.Level level = 3 [default = ERROR];
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirement.Level level = 3 [default = ERROR];
*
*
* Level of the reported diagnostic
*
*/
- org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo.Level getLevel();
+ org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Level getLevel();
/**
* optional int32 error_code = 4;
@@ -19915,30 +19915,30 @@ public final class ProtoBuf {
int getMessage();
}
/**
- * Protobuf type {@code org.jetbrains.kotlin.serialization.SinceKotlinInfo}
+ * Protobuf type {@code org.jetbrains.kotlin.serialization.VersionRequirement}
*/
- public static final class SinceKotlinInfo extends
+ public static final class VersionRequirement extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
- // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.SinceKotlinInfo)
- SinceKotlinInfoOrBuilder {
- // Use SinceKotlinInfo.newBuilder() to construct.
- private SinceKotlinInfo(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.VersionRequirement)
+ VersionRequirementOrBuilder {
+ // Use VersionRequirement.newBuilder() to construct.
+ private VersionRequirement(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private SinceKotlinInfo(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
+ private VersionRequirement(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
- private static final SinceKotlinInfo defaultInstance;
- public static SinceKotlinInfo getDefaultInstance() {
+ private static final VersionRequirement defaultInstance;
+ public static VersionRequirement getDefaultInstance() {
return defaultInstance;
}
- public SinceKotlinInfo getDefaultInstanceForType() {
+ public VersionRequirement getDefaultInstanceForType() {
return defaultInstance;
}
private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
- private SinceKotlinInfo(
+ private VersionRequirement(
org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
@@ -19976,7 +19976,7 @@ public final class ProtoBuf {
}
case 24: {
int rawValue = input.readEnum();
- org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo.Level value = org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo.Level.valueOf(rawValue);
+ org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Level value = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Level.valueOf(rawValue);
if (value == null) {
unknownFieldsCodedOutput.writeRawVarint32(tag);
unknownFieldsCodedOutput.writeRawVarint32(rawValue);
@@ -20014,23 +20014,23 @@ public final class ProtoBuf {
makeExtensionsImmutable();
}
}
- public static org.jetbrains.kotlin.protobuf.Parser PARSER =
- new org.jetbrains.kotlin.protobuf.AbstractParser() {
- public SinceKotlinInfo parsePartialFrom(
+ public static org.jetbrains.kotlin.protobuf.Parser PARSER =
+ new org.jetbrains.kotlin.protobuf.AbstractParser() {
+ public VersionRequirement parsePartialFrom(
org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
- return new SinceKotlinInfo(input, extensionRegistry);
+ return new VersionRequirement(input, extensionRegistry);
}
};
@java.lang.Override
- public org.jetbrains.kotlin.protobuf.Parser getParserForType() {
+ public org.jetbrains.kotlin.protobuf.Parser getParserForType() {
return PARSER;
}
/**
- * Protobuf enum {@code org.jetbrains.kotlin.serialization.SinceKotlinInfo.Level}
+ * Protobuf enum {@code org.jetbrains.kotlin.serialization.VersionRequirement.Level}
*/
public enum Level
implements org.jetbrains.kotlin.protobuf.Internal.EnumLite {
@@ -20091,7 +20091,7 @@ public final class ProtoBuf {
this.value = value;
}
- // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.SinceKotlinInfo.Level)
+ // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.VersionRequirement.Level)
}
private int bitField0_;
@@ -20148,9 +20148,9 @@ public final class ProtoBuf {
}
public static final int LEVEL_FIELD_NUMBER = 3;
- private org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo.Level level_;
+ private org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Level level_;
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfo.Level level = 3 [default = ERROR];
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirement.Level level = 3 [default = ERROR];
*
*
* Level of the reported diagnostic
@@ -20160,13 +20160,13 @@ public final class ProtoBuf {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfo.Level level = 3 [default = ERROR];
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirement.Level level = 3 [default = ERROR];
*
*
* Level of the reported diagnostic
*
*/
- public org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo.Level getLevel() {
+ public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Level getLevel() {
return level_;
}
@@ -20219,7 +20219,7 @@ public final class ProtoBuf {
private void initFields() {
version_ = 0;
versionFull_ = 0;
- level_ = org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo.Level.ERROR;
+ level_ = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Level.ERROR;
errorCode_ = 0;
message_ = 0;
}
@@ -20292,53 +20292,53 @@ public final class ProtoBuf {
return super.writeReplace();
}
- public static org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo parseFrom(
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement parseFrom(
org.jetbrains.kotlin.protobuf.ByteString data)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo parseFrom(
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement parseFrom(
org.jetbrains.kotlin.protobuf.ByteString data,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo parseFrom(byte[] data)
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement parseFrom(byte[] data)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo parseFrom(
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement parseFrom(
byte[] data,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo parseFrom(java.io.InputStream input)
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement parseFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
- public static org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo parseFrom(
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement parseFrom(
java.io.InputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
- public static org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo parseDelimitedFrom(java.io.InputStream input)
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input);
}
- public static org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo parseDelimitedFrom(
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement parseDelimitedFrom(
java.io.InputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
- public static org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo parseFrom(
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement parseFrom(
org.jetbrains.kotlin.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
- public static org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo parseFrom(
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement parseFrom(
org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
@@ -20347,21 +20347,21 @@ public final class ProtoBuf {
public static Builder newBuilder() { return Builder.create(); }
public Builder newBuilderForType() { return newBuilder(); }
- public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo prototype) {
+ public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement prototype) {
return newBuilder().mergeFrom(prototype);
}
public Builder toBuilder() { return newBuilder(this); }
/**
- * Protobuf type {@code org.jetbrains.kotlin.serialization.SinceKotlinInfo}
+ * Protobuf type {@code org.jetbrains.kotlin.serialization.VersionRequirement}
*/
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
- org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo, Builder>
+ org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement, Builder>
implements
- // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.SinceKotlinInfo)
- org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoOrBuilder {
- // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo.newBuilder()
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.VersionRequirement)
+ org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementOrBuilder {
+ // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
}
@@ -20378,7 +20378,7 @@ public final class ProtoBuf {
bitField0_ = (bitField0_ & ~0x00000001);
versionFull_ = 0;
bitField0_ = (bitField0_ & ~0x00000002);
- level_ = org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo.Level.ERROR;
+ level_ = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Level.ERROR;
bitField0_ = (bitField0_ & ~0x00000004);
errorCode_ = 0;
bitField0_ = (bitField0_ & ~0x00000008);
@@ -20391,20 +20391,20 @@ public final class ProtoBuf {
return create().mergeFrom(buildPartial());
}
- public org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo getDefaultInstanceForType() {
- return org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo.getDefaultInstance();
+ public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement getDefaultInstanceForType() {
+ return org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.getDefaultInstance();
}
- public org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo build() {
- org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo result = buildPartial();
+ public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement build() {
+ org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement result = buildPartial();
if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
return result;
}
- public org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo buildPartial() {
- org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo result = new org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo(this);
+ public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement buildPartial() {
+ org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement result = new org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement(this);
int from_bitField0_ = bitField0_;
int to_bitField0_ = 0;
if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -20431,8 +20431,8 @@ public final class ProtoBuf {
return result;
}
- public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo other) {
- if (other == org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo.getDefaultInstance()) return this;
+ public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement other) {
+ if (other == org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.getDefaultInstance()) return this;
if (other.hasVersion()) {
setVersion(other.getVersion());
}
@@ -20461,11 +20461,11 @@ public final class ProtoBuf {
org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
- org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo parsedMessage = null;
+ org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
} catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
- parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo) e.getUnfinishedMessage();
+ parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement) e.getUnfinishedMessage();
throw e;
} finally {
if (parsedMessage != null) {
@@ -20584,9 +20584,9 @@ public final class ProtoBuf {
return this;
}
- private org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo.Level level_ = org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo.Level.ERROR;
+ private org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Level level_ = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Level.ERROR;
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfo.Level level = 3 [default = ERROR];
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirement.Level level = 3 [default = ERROR];
*
*
* Level of the reported diagnostic
@@ -20596,23 +20596,23 @@ public final class ProtoBuf {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfo.Level level = 3 [default = ERROR];
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirement.Level level = 3 [default = ERROR];
*
*
* Level of the reported diagnostic
*
*/
- public org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo.Level getLevel() {
+ public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Level getLevel() {
return level_;
}
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfo.Level level = 3 [default = ERROR];
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirement.Level level = 3 [default = ERROR];
*
*
* Level of the reported diagnostic
*
*/
- public Builder setLevel(org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo.Level value) {
+ public Builder setLevel(org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Level value) {
if (value == null) {
throw new NullPointerException();
}
@@ -20622,7 +20622,7 @@ public final class ProtoBuf {
return this;
}
/**
- * optional .org.jetbrains.kotlin.serialization.SinceKotlinInfo.Level level = 3 [default = ERROR];
+ * optional .org.jetbrains.kotlin.serialization.VersionRequirement.Level level = 3 [default = ERROR];
*
*
* Level of the reported diagnostic
@@ -20630,7 +20630,7 @@ public final class ProtoBuf {
*/
public Builder clearLevel() {
bitField0_ = (bitField0_ & ~0x00000004);
- level_ = org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo.Level.ERROR;
+ level_ = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Level.ERROR;
return this;
}
@@ -20731,60 +20731,60 @@ public final class ProtoBuf {
return this;
}
- // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.SinceKotlinInfo)
+ // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.VersionRequirement)
}
static {
- defaultInstance = new SinceKotlinInfo(true);
+ defaultInstance = new VersionRequirement(true);
defaultInstance.initFields();
}
- // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.SinceKotlinInfo)
+ // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.VersionRequirement)
}
- public interface SinceKotlinInfoTableOrBuilder extends
- // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.SinceKotlinInfoTable)
+ public interface VersionRequirementTableOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.VersionRequirementTable)
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- java.util.List
- getInfoList();
+ java.util.List
+ getRequirementList();
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo getInfo(int index);
+ org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement getRequirement(int index);
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- int getInfoCount();
+ int getRequirementCount();
}
/**
- * Protobuf type {@code org.jetbrains.kotlin.serialization.SinceKotlinInfoTable}
+ * Protobuf type {@code org.jetbrains.kotlin.serialization.VersionRequirementTable}
*/
- public static final class SinceKotlinInfoTable extends
+ public static final class VersionRequirementTable extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
- // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.SinceKotlinInfoTable)
- SinceKotlinInfoTableOrBuilder {
- // Use SinceKotlinInfoTable.newBuilder() to construct.
- private SinceKotlinInfoTable(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.VersionRequirementTable)
+ VersionRequirementTableOrBuilder {
+ // Use VersionRequirementTable.newBuilder() to construct.
+ private VersionRequirementTable(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
- private SinceKotlinInfoTable(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
+ private VersionRequirementTable(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
- private static final SinceKotlinInfoTable defaultInstance;
- public static SinceKotlinInfoTable getDefaultInstance() {
+ private static final VersionRequirementTable defaultInstance;
+ public static VersionRequirementTable getDefaultInstance() {
return defaultInstance;
}
- public SinceKotlinInfoTable getDefaultInstanceForType() {
+ public VersionRequirementTable getDefaultInstanceForType() {
return defaultInstance;
}
private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
- private SinceKotlinInfoTable(
+ private VersionRequirementTable(
org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
@@ -20812,10 +20812,10 @@ public final class ProtoBuf {
}
case 10: {
if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
- info_ = new java.util.ArrayList();
+ requirement_ = new java.util.ArrayList();
mutable_bitField0_ |= 0x00000001;
}
- info_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo.PARSER, extensionRegistry));
+ requirement_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.PARSER, extensionRegistry));
break;
}
}
@@ -20827,7 +20827,7 @@ public final class ProtoBuf {
e.getMessage()).setUnfinishedMessage(this);
} finally {
if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
- info_ = java.util.Collections.unmodifiableList(info_);
+ requirement_ = java.util.Collections.unmodifiableList(requirement_);
}
try {
unknownFieldsCodedOutput.flush();
@@ -20839,58 +20839,58 @@ public final class ProtoBuf {
makeExtensionsImmutable();
}
}
- public static org.jetbrains.kotlin.protobuf.Parser PARSER =
- new org.jetbrains.kotlin.protobuf.AbstractParser() {
- public SinceKotlinInfoTable parsePartialFrom(
+ public static org.jetbrains.kotlin.protobuf.Parser PARSER =
+ new org.jetbrains.kotlin.protobuf.AbstractParser() {
+ public VersionRequirementTable parsePartialFrom(
org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
- return new SinceKotlinInfoTable(input, extensionRegistry);
+ return new VersionRequirementTable(input, extensionRegistry);
}
};
@java.lang.Override
- public org.jetbrains.kotlin.protobuf.Parser getParserForType() {
+ public org.jetbrains.kotlin.protobuf.Parser getParserForType() {
return PARSER;
}
- public static final int INFO_FIELD_NUMBER = 1;
- private java.util.List info_;
+ public static final int REQUIREMENT_FIELD_NUMBER = 1;
+ private java.util.List requirement_;
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public java.util.List getInfoList() {
- return info_;
+ public java.util.List getRequirementList() {
+ return requirement_;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public java.util.List
- getInfoOrBuilderList() {
- return info_;
+ public java.util.List
+ getRequirementOrBuilderList() {
+ return requirement_;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public int getInfoCount() {
- return info_.size();
+ public int getRequirementCount() {
+ return requirement_.size();
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo getInfo(int index) {
- return info_.get(index);
+ public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement getRequirement(int index) {
+ return requirement_.get(index);
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoOrBuilder getInfoOrBuilder(
+ public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementOrBuilder getRequirementOrBuilder(
int index) {
- return info_.get(index);
+ return requirement_.get(index);
}
private void initFields() {
- info_ = java.util.Collections.emptyList();
+ requirement_ = java.util.Collections.emptyList();
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -20905,8 +20905,8 @@ public final class ProtoBuf {
public void writeTo(org.jetbrains.kotlin.protobuf.CodedOutputStream output)
throws java.io.IOException {
getSerializedSize();
- for (int i = 0; i < info_.size(); i++) {
- output.writeMessage(1, info_.get(i));
+ for (int i = 0; i < requirement_.size(); i++) {
+ output.writeMessage(1, requirement_.get(i));
}
output.writeRawBytes(unknownFields);
}
@@ -20917,9 +20917,9 @@ public final class ProtoBuf {
if (size != -1) return size;
size = 0;
- for (int i = 0; i < info_.size(); i++) {
+ for (int i = 0; i < requirement_.size(); i++) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
- .computeMessageSize(1, info_.get(i));
+ .computeMessageSize(1, requirement_.get(i));
}
size += unknownFields.size();
memoizedSerializedSize = size;
@@ -20933,53 +20933,53 @@ public final class ProtoBuf {
return super.writeReplace();
}
- public static org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable parseFrom(
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable parseFrom(
org.jetbrains.kotlin.protobuf.ByteString data)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable parseFrom(
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable parseFrom(
org.jetbrains.kotlin.protobuf.ByteString data,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable parseFrom(byte[] data)
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable parseFrom(byte[] data)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable parseFrom(
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable parseFrom(
byte[] data,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable parseFrom(java.io.InputStream input)
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable parseFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
- public static org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable parseFrom(
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable parseFrom(
java.io.InputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
- public static org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable parseDelimitedFrom(java.io.InputStream input)
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input);
}
- public static org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable parseDelimitedFrom(
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable parseDelimitedFrom(
java.io.InputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
- public static org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable parseFrom(
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable parseFrom(
org.jetbrains.kotlin.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
- public static org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable parseFrom(
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable parseFrom(
org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
@@ -20988,21 +20988,21 @@ public final class ProtoBuf {
public static Builder newBuilder() { return Builder.create(); }
public Builder newBuilderForType() { return newBuilder(); }
- public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable prototype) {
+ public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable prototype) {
return newBuilder().mergeFrom(prototype);
}
public Builder toBuilder() { return newBuilder(this); }
/**
- * Protobuf type {@code org.jetbrains.kotlin.serialization.SinceKotlinInfoTable}
+ * Protobuf type {@code org.jetbrains.kotlin.serialization.VersionRequirementTable}
*/
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
- org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable, Builder>
+ org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable, Builder>
implements
- // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.SinceKotlinInfoTable)
- org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTableOrBuilder {
- // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable.newBuilder()
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.VersionRequirementTable)
+ org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTableOrBuilder {
+ // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
}
@@ -21015,7 +21015,7 @@ public final class ProtoBuf {
public Builder clear() {
super.clear();
- info_ = java.util.Collections.emptyList();
+ requirement_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000001);
return this;
}
@@ -21024,38 +21024,38 @@ public final class ProtoBuf {
return create().mergeFrom(buildPartial());
}
- public org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable getDefaultInstanceForType() {
- return org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable.getDefaultInstance();
+ public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable getDefaultInstanceForType() {
+ return org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.getDefaultInstance();
}
- public org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable build() {
- org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable result = buildPartial();
+ public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable build() {
+ org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable result = buildPartial();
if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
return result;
}
- public org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable buildPartial() {
- org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable result = new org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable(this);
+ public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable buildPartial() {
+ org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable result = new org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable(this);
int from_bitField0_ = bitField0_;
if (((bitField0_ & 0x00000001) == 0x00000001)) {
- info_ = java.util.Collections.unmodifiableList(info_);
+ requirement_ = java.util.Collections.unmodifiableList(requirement_);
bitField0_ = (bitField0_ & ~0x00000001);
}
- result.info_ = info_;
+ result.requirement_ = requirement_;
return result;
}
- public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable other) {
- if (other == org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable.getDefaultInstance()) return this;
- if (!other.info_.isEmpty()) {
- if (info_.isEmpty()) {
- info_ = other.info_;
+ public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable other) {
+ if (other == org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.getDefaultInstance()) return this;
+ if (!other.requirement_.isEmpty()) {
+ if (requirement_.isEmpty()) {
+ requirement_ = other.requirement_;
bitField0_ = (bitField0_ & ~0x00000001);
} else {
- ensureInfoIsMutable();
- info_.addAll(other.info_);
+ ensureRequirementIsMutable();
+ requirement_.addAll(other.requirement_);
}
}
@@ -21072,11 +21072,11 @@ public final class ProtoBuf {
org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
- org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable parsedMessage = null;
+ org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
} catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
- parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfoTable) e.getUnfinishedMessage();
+ parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable) e.getUnfinishedMessage();
throw e;
} finally {
if (parsedMessage != null) {
@@ -21087,140 +21087,140 @@ public final class ProtoBuf {
}
private int bitField0_;
- private java.util.List info_ =
+ private java.util.List requirement_ =
java.util.Collections.emptyList();
- private void ensureInfoIsMutable() {
+ private void ensureRequirementIsMutable() {
if (!((bitField0_ & 0x00000001) == 0x00000001)) {
- info_ = new java.util.ArrayList(info_);
+ requirement_ = new java.util.ArrayList(requirement_);
bitField0_ |= 0x00000001;
}
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public java.util.List getInfoList() {
- return java.util.Collections.unmodifiableList(info_);
+ public java.util.List getRequirementList() {
+ return java.util.Collections.unmodifiableList(requirement_);
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public int getInfoCount() {
- return info_.size();
+ public int getRequirementCount() {
+ return requirement_.size();
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo getInfo(int index) {
- return info_.get(index);
+ public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement getRequirement(int index) {
+ return requirement_.get(index);
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public Builder setInfo(
- int index, org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo value) {
+ public Builder setRequirement(
+ int index, org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement value) {
if (value == null) {
throw new NullPointerException();
}
- ensureInfoIsMutable();
- info_.set(index, value);
+ ensureRequirementIsMutable();
+ requirement_.set(index, value);
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public Builder setInfo(
- int index, org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo.Builder builderForValue) {
- ensureInfoIsMutable();
- info_.set(index, builderForValue.build());
+ public Builder setRequirement(
+ int index, org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Builder builderForValue) {
+ ensureRequirementIsMutable();
+ requirement_.set(index, builderForValue.build());
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public Builder addInfo(org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo value) {
+ public Builder addRequirement(org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement value) {
if (value == null) {
throw new NullPointerException();
}
- ensureInfoIsMutable();
- info_.add(value);
+ ensureRequirementIsMutable();
+ requirement_.add(value);
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public Builder addInfo(
- int index, org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo value) {
+ public Builder addRequirement(
+ int index, org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement value) {
if (value == null) {
throw new NullPointerException();
}
- ensureInfoIsMutable();
- info_.add(index, value);
+ ensureRequirementIsMutable();
+ requirement_.add(index, value);
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public Builder addInfo(
- org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo.Builder builderForValue) {
- ensureInfoIsMutable();
- info_.add(builderForValue.build());
+ public Builder addRequirement(
+ org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Builder builderForValue) {
+ ensureRequirementIsMutable();
+ requirement_.add(builderForValue.build());
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public Builder addInfo(
- int index, org.jetbrains.kotlin.serialization.ProtoBuf.SinceKotlinInfo.Builder builderForValue) {
- ensureInfoIsMutable();
- info_.add(index, builderForValue.build());
+ public Builder addRequirement(
+ int index, org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Builder builderForValue) {
+ ensureRequirementIsMutable();
+ requirement_.add(index, builderForValue.build());
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public Builder addAllInfo(
- java.lang.Iterable values) {
- ensureInfoIsMutable();
+ public Builder addAllRequirement(
+ java.lang.Iterable values) {
+ ensureRequirementIsMutable();
org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
- values, info_);
+ values, requirement_);
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public Builder clearInfo() {
- info_ = java.util.Collections.emptyList();
+ public Builder clearRequirement() {
+ requirement_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000001);
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.SinceKotlinInfo info = 1;
+ * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
*/
- public Builder removeInfo(int index) {
- ensureInfoIsMutable();
- info_.remove(index);
+ public Builder removeRequirement(int index) {
+ ensureRequirementIsMutable();
+ requirement_.remove(index);
return this;
}
- // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.SinceKotlinInfoTable)
+ // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.VersionRequirementTable)
}
static {
- defaultInstance = new SinceKotlinInfoTable(true);
+ defaultInstance = new VersionRequirementTable(true);
defaultInstance.initFields();
}
- // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.SinceKotlinInfoTable)
+ // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.VersionRequirementTable)
}
public interface PackageFragmentOrBuilder extends
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt
index 97aa46d0f89..43b4e1a2ed6 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.serialization.ClassDataWithSource
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor
-import org.jetbrains.kotlin.serialization.deserialization.descriptors.SinceKotlinInfoTable
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.VersionRequirementTable
class ClassDeserializer(private val components: DeserializationComponents) {
private val classes: (ClassKey) -> ClassDescriptor? =
@@ -61,7 +61,7 @@ class ClassDeserializer(private val components: DeserializationComponents) {
components.createContext(
fragment, nameResolver,
TypeTable(classProto.typeTable),
- SinceKotlinInfoTable.create(classProto.sinceKotlinInfoTable),
+ VersionRequirementTable.create(classProto.versionRequirementTable),
containerSource = null
)
}
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
index b72b0293fb0..61b911c57d0 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
@@ -51,7 +51,7 @@ class MemberDeserializer(private val c: DeserializationContext) {
proto,
c.nameResolver,
c.typeTable,
- c.sinceKotlinInfoTable,
+ c.versionRequirementTable,
c.containerSource
)
@@ -158,7 +158,7 @@ class MemberDeserializer(private val c: DeserializationContext) {
else Annotations.EMPTY
val function = DeserializedSimpleFunctionDescriptor(
c.containingDeclaration, /* original = */ null, annotations, c.nameResolver.getName(proto.name),
- Deserialization.memberKind(Flags.MEMBER_KIND.get(flags)), proto, c.nameResolver, c.typeTable, c.sinceKotlinInfoTable,
+ Deserialization.memberKind(Flags.MEMBER_KIND.get(flags)), proto, c.nameResolver, c.typeTable, c.versionRequirementTable,
c.containerSource
)
val local = c.childContext(function, proto.typeParameterList)
@@ -187,7 +187,7 @@ class MemberDeserializer(private val c: DeserializationContext) {
val visibility = Deserialization.visibility(Flags.VISIBILITY.get(proto.flags))
val typeAlias = DeserializedTypeAliasDescriptor(
c.storageManager, c.containingDeclaration, annotations, c.nameResolver.getName(proto.name),
- visibility, proto, c.nameResolver, c.typeTable, c.sinceKotlinInfoTable, c.containerSource
+ visibility, proto, c.nameResolver, c.typeTable, c.versionRequirementTable, c.containerSource
)
val local = c.childContext(typeAlias, proto.typeParameterList)
@@ -208,7 +208,7 @@ class MemberDeserializer(private val c: DeserializationContext) {
val classDescriptor = c.containingDeclaration as ClassDescriptor
val descriptor = DeserializedClassConstructorDescriptor(
classDescriptor, null, getAnnotations(proto, proto.flags, AnnotatedCallableKind.FUNCTION),
- isPrimary, CallableMemberDescriptor.Kind.DECLARATION, proto, c.nameResolver, c.typeTable, c.sinceKotlinInfoTable,
+ isPrimary, CallableMemberDescriptor.Kind.DECLARATION, proto, c.nameResolver, c.typeTable, c.versionRequirementTable,
c.containerSource
)
val local = c.childContext(descriptor, listOf())
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt
index c7512a3b39b..96f802cad2f 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.resolve.constants.ConstantValue
import org.jetbrains.kotlin.serialization.ProtoBuf
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
-import org.jetbrains.kotlin.serialization.deserialization.descriptors.SinceKotlinInfoTable
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.VersionRequirementTable
import org.jetbrains.kotlin.storage.StorageManager
class DeserializationComponents(
@@ -54,10 +54,10 @@ class DeserializationComponents(
descriptor: PackageFragmentDescriptor,
nameResolver: NameResolver,
typeTable: TypeTable,
- sinceKotlinInfoTable: SinceKotlinInfoTable,
+ versionRequirementTable: VersionRequirementTable,
containerSource: DeserializedContainerSource?
): DeserializationContext =
- DeserializationContext(this, nameResolver, descriptor, typeTable, sinceKotlinInfoTable, containerSource,
+ DeserializationContext(this, nameResolver, descriptor, typeTable, versionRequirementTable, containerSource,
parentTypeDeserializer = null, typeParameters = listOf())
}
@@ -67,7 +67,7 @@ class DeserializationContext(
val nameResolver: NameResolver,
val containingDeclaration: DeclarationDescriptor,
val typeTable: TypeTable,
- val sinceKotlinInfoTable: SinceKotlinInfoTable,
+ val versionRequirementTable: VersionRequirementTable,
val containerSource: DeserializedContainerSource?,
parentTypeDeserializer: TypeDeserializer?,
typeParameters: List
@@ -85,7 +85,7 @@ class DeserializationContext(
nameResolver: NameResolver = this.nameResolver,
typeTable: TypeTable = this.typeTable
) = DeserializationContext(
- components, nameResolver, descriptor, typeTable, sinceKotlinInfoTable, this.containerSource,
+ components, nameResolver, descriptor, typeTable, versionRequirementTable, this.containerSource,
parentTypeDeserializer = this.typeDeserializer, typeParameters = typeParameterProtos
)
}
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
index 0014c9e96ba..d5366a71664 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
@@ -73,8 +73,8 @@ class DeserializedClassDescriptor(
(containingDeclaration as? DeserializedClassDescriptor)?.thisAsProtoContainer
)
- val sinceKotlinInfo: SinceKotlinInfo?
- get() = SinceKotlinInfo.create(classProto, c.nameResolver, c.sinceKotlinInfoTable)
+ val versionRequirement: VersionRequirement?
+ get() = VersionRequirement.create(classProto, c.nameResolver, c.versionRequirementTable)
override val annotations =
if (!Flags.HAS_ANNOTATIONS.get(classProto.flags)) {
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberDescriptor.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberDescriptor.kt
index 2ed24264cee..be54e0826c7 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberDescriptor.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberDescriptor.kt
@@ -36,10 +36,10 @@ interface DeserializedMemberDescriptor : MemberDescriptor {
val typeTable: TypeTable
- val sinceKotlinInfoTable: SinceKotlinInfoTable
+ val versionRequirementTable: VersionRequirementTable
- val sinceKotlinInfo: SinceKotlinInfo?
- get() = SinceKotlinInfo.create(proto, nameResolver, sinceKotlinInfoTable)
+ val versionRequirement: VersionRequirement?
+ get() = VersionRequirement.create(proto, nameResolver, versionRequirementTable)
// Information about the origin of this callable's container (class or package part on JVM) or null if there's no such information.
// TODO: merge with sourceElement of containingDeclaration
@@ -68,7 +68,7 @@ class DeserializedSimpleFunctionDescriptor(
override val proto: ProtoBuf.Function,
override val nameResolver: NameResolver,
override val typeTable: TypeTable,
- override val sinceKotlinInfoTable: SinceKotlinInfoTable,
+ override val versionRequirementTable: VersionRequirementTable,
override val containerSource: DeserializedContainerSource?,
source: SourceElement? = null
) : DeserializedCallableMemberDescriptor,
@@ -86,7 +86,7 @@ class DeserializedSimpleFunctionDescriptor(
): FunctionDescriptorImpl {
return DeserializedSimpleFunctionDescriptor(
newOwner, original as SimpleFunctionDescriptor?, annotations, newName ?: name, kind,
- proto, nameResolver, typeTable, sinceKotlinInfoTable, containerSource, source
+ proto, nameResolver, typeTable, versionRequirementTable, containerSource, source
)
}
}
@@ -108,7 +108,7 @@ class DeserializedPropertyDescriptor(
override val proto: ProtoBuf.Property,
override val nameResolver: NameResolver,
override val typeTable: TypeTable,
- override val sinceKotlinInfoTable: SinceKotlinInfoTable,
+ override val versionRequirementTable: VersionRequirementTable,
override val containerSource: DeserializedContainerSource?
) : DeserializedCallableMemberDescriptor, PropertyDescriptorImpl(
containingDeclaration, original, annotations, modality, visibility, isVar, name, kind, SourceElement.NO_SOURCE,
@@ -124,7 +124,7 @@ class DeserializedPropertyDescriptor(
): PropertyDescriptorImpl {
return DeserializedPropertyDescriptor(
newOwner, original, annotations, newModality, newVisibility, isVar, newName, kind, isLateInit, isConst, isExternal,
- @Suppress("DEPRECATION") isDelegated, isExpect, proto, nameResolver, typeTable, sinceKotlinInfoTable, containerSource
+ @Suppress("DEPRECATION") isDelegated, isExpect, proto, nameResolver, typeTable, versionRequirementTable, containerSource
)
}
@@ -140,7 +140,7 @@ class DeserializedClassConstructorDescriptor(
override val proto: ProtoBuf.Constructor,
override val nameResolver: NameResolver,
override val typeTable: TypeTable,
- override val sinceKotlinInfoTable: SinceKotlinInfoTable,
+ override val versionRequirementTable: VersionRequirementTable,
override val containerSource: DeserializedContainerSource?,
source: SourceElement? = null
) : DeserializedCallableMemberDescriptor,
@@ -156,7 +156,7 @@ class DeserializedClassConstructorDescriptor(
): DeserializedClassConstructorDescriptor {
return DeserializedClassConstructorDescriptor(
newOwner as ClassDescriptor, original as ConstructorDescriptor?, annotations, isPrimary, kind,
- proto, nameResolver, typeTable, sinceKotlinInfoTable, containerSource, source
+ proto, nameResolver, typeTable, versionRequirementTable, containerSource, source
)
}
@@ -178,7 +178,7 @@ class DeserializedTypeAliasDescriptor(
override val proto: ProtoBuf.TypeAlias,
override val nameResolver: NameResolver,
override val typeTable: TypeTable,
- override val sinceKotlinInfoTable: SinceKotlinInfoTable,
+ override val versionRequirementTable: VersionRequirementTable,
override val containerSource: DeserializedContainerSource?
) : AbstractTypeAliasDescriptor(containingDeclaration, annotations, name, SourceElement.NO_SOURCE, visibility),
DeserializedMemberDescriptor {
@@ -219,7 +219,7 @@ class DeserializedTypeAliasDescriptor(
proto,
nameResolver,
typeTable,
- sinceKotlinInfoTable,
+ versionRequirementTable,
containerSource
)
substituted.initialize(declaredTypeParameters,
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt
index 7b585b775ab..338499ac26a 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt
@@ -39,7 +39,7 @@ open class DeserializedPackageMemberScope(
classNames: () -> Collection
) : DeserializedMemberScope(
components.createContext(packageDescriptor, nameResolver, TypeTable(proto.typeTable),
- SinceKotlinInfoTable.create(proto.sinceKotlinInfoTable), containerSource),
+ VersionRequirementTable.create(proto.versionRequirementTable), containerSource),
proto.functionList, proto.propertyList, proto.typeAliasList, classNames
) {
private val packageFqName = packageDescriptor.fqName
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/SinceKotlinInfo.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/VersionRequirement.kt
similarity index 73%
rename from core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/SinceKotlinInfo.kt
rename to core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/VersionRequirement.kt
index f210c0ee743..fd9c42ee2f1 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/SinceKotlinInfo.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/VersionRequirement.kt
@@ -20,18 +20,18 @@ import org.jetbrains.kotlin.protobuf.MessageLite
import org.jetbrains.kotlin.serialization.ProtoBuf
import org.jetbrains.kotlin.serialization.deserialization.NameResolver
-class SinceKotlinInfoTable private constructor(private val infos: List) {
- operator fun get(id: Int): ProtoBuf.SinceKotlinInfo? = infos.getOrNull(id)
+class VersionRequirementTable private constructor(private val infos: List) {
+ operator fun get(id: Int): ProtoBuf.VersionRequirement? = infos.getOrNull(id)
companion object {
- val EMPTY = SinceKotlinInfoTable(emptyList())
+ val EMPTY = VersionRequirementTable(emptyList())
- fun create(table: ProtoBuf.SinceKotlinInfoTable): SinceKotlinInfoTable =
- if (table.infoCount == 0) EMPTY else SinceKotlinInfoTable(table.infoList)
+ fun create(table: ProtoBuf.VersionRequirementTable): VersionRequirementTable =
+ if (table.requirementCount == 0) EMPTY else VersionRequirementTable(table.requirementList)
}
}
-class SinceKotlinInfo(
+class VersionRequirement(
val version: Version,
val level: DeprecationLevel,
val errorCode: Int?,
@@ -90,13 +90,13 @@ class SinceKotlinInfo(
"since $version $level" + (if (errorCode != null) " error $errorCode" else "") + (if (message != null) ": $message" else "")
companion object {
- fun create(proto: MessageLite, nameResolver: NameResolver, table: SinceKotlinInfoTable): SinceKotlinInfo? {
+ fun create(proto: MessageLite, nameResolver: NameResolver, table: VersionRequirementTable): VersionRequirement? {
val id = when (proto) {
- is ProtoBuf.Class -> if (proto.hasSinceKotlinInfo()) proto.sinceKotlinInfo else return null
- is ProtoBuf.Constructor -> if (proto.hasSinceKotlinInfo()) proto.sinceKotlinInfo else return null
- is ProtoBuf.Function -> if (proto.hasSinceKotlinInfo()) proto.sinceKotlinInfo else return null
- is ProtoBuf.Property -> if (proto.hasSinceKotlinInfo()) proto.sinceKotlinInfo else return null
- is ProtoBuf.TypeAlias -> if (proto.hasSinceKotlinInfo()) proto.sinceKotlinInfo else return null
+ is ProtoBuf.Class -> if (proto.hasVersionRequirement()) proto.versionRequirement else return null
+ is ProtoBuf.Constructor -> if (proto.hasVersionRequirement()) proto.versionRequirement else return null
+ is ProtoBuf.Function -> if (proto.hasVersionRequirement()) proto.versionRequirement else return null
+ is ProtoBuf.Property -> if (proto.hasVersionRequirement()) proto.versionRequirement else return null
+ is ProtoBuf.TypeAlias -> if (proto.hasVersionRequirement()) proto.versionRequirement else return null
else -> throw IllegalStateException("Unexpected declaration: ${proto::class.java}")
}
@@ -108,16 +108,16 @@ class SinceKotlinInfo(
)
val level = when (info.level!!) {
- ProtoBuf.SinceKotlinInfo.Level.WARNING -> DeprecationLevel.WARNING
- ProtoBuf.SinceKotlinInfo.Level.ERROR -> DeprecationLevel.ERROR
- ProtoBuf.SinceKotlinInfo.Level.HIDDEN -> DeprecationLevel.HIDDEN
+ ProtoBuf.VersionRequirement.Level.WARNING -> DeprecationLevel.WARNING
+ ProtoBuf.VersionRequirement.Level.ERROR -> DeprecationLevel.ERROR
+ ProtoBuf.VersionRequirement.Level.HIDDEN -> DeprecationLevel.HIDDEN
}
val errorCode = if (info.hasErrorCode()) info.errorCode else null
val message = if (info.hasMessage()) nameResolver.getString(info.message) else null
- return SinceKotlinInfo(version, level, errorCode, message)
+ return VersionRequirement(version, level, errorCode, message)
}
}
}
diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt
index e23129a0f6e..c3ed04dc0d8 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt
@@ -39,7 +39,7 @@ import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext
import org.jetbrains.kotlin.serialization.deserialization.MemberDeserializer
import org.jetbrains.kotlin.serialization.deserialization.NameResolver
import org.jetbrains.kotlin.serialization.deserialization.TypeTable
-import org.jetbrains.kotlin.serialization.deserialization.descriptors.SinceKotlinInfoTable
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.VersionRequirementTable
import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf
import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
import kotlin.jvm.internal.FunctionReference
@@ -173,7 +173,7 @@ internal fun deserializeToDescriptor(
}
val context = DeserializationContext(
- moduleData.deserialization, nameResolver, moduleData.module, typeTable, SinceKotlinInfoTable.EMPTY,
+ moduleData.deserialization, nameResolver, moduleData.module, typeTable, VersionRequirementTable.EMPTY,
containerSource = null, parentTypeDeserializer = null, typeParameters = typeParameters
)
return MemberDeserializer(context).createDescriptor(proto)