diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/api/kotlin-gradle-plugin-idea-proto.api b/libraries/tools/kotlin-gradle-plugin-idea-proto/api/kotlin-gradle-plugin-idea-proto.api
index d4d37028933..bf44fa04660 100644
--- a/libraries/tools/kotlin-gradle-plugin-idea-proto/api/kotlin-gradle-plugin-idea-proto.api
+++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/api/kotlin-gradle-plugin-idea-proto.api
@@ -6,6 +6,19 @@ public final class org/jetbrains/kotlin/gradle/idea/proto/kpm/KpmIdeaProto {
public static final fun writeTo (Lorg/jetbrains/kotlin/gradle/idea/kpm/IdeaKpmProject;Ljava/io/OutputStream;Lorg/jetbrains/kotlin/gradle/idea/serialize/IdeaKotlinSerializationContext;)V
}
+public final class org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinClasspathKt {
+ public static final fun IdeaKotlinClasspath ([B)Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinClasspath;
+ public static final fun toByteArray (Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinClasspath;)[B
+}
+
+public final class org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinClasspathSerializer : org/jetbrains/kotlin/gradle/idea/serialize/IdeaKotlinExtrasSerializer {
+ public static final field INSTANCE Lorg/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinClasspathSerializer;
+ public synthetic fun deserialize (Lorg/jetbrains/kotlin/gradle/idea/serialize/IdeaKotlinSerializationContext;[B)Ljava/lang/Object;
+ public fun deserialize (Lorg/jetbrains/kotlin/gradle/idea/serialize/IdeaKotlinSerializationContext;[B)Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinClasspath;
+ public synthetic fun serialize (Lorg/jetbrains/kotlin/gradle/idea/serialize/IdeaKotlinSerializationContext;Ljava/lang/Object;)[B
+ public fun serialize (Lorg/jetbrains/kotlin/gradle/idea/serialize/IdeaKotlinSerializationContext;Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinClasspath;)[B
+}
+
public final class org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinDependency {
public static final fun IdeaKotlinDependency (Lorg/jetbrains/kotlin/gradle/idea/serialize/IdeaKotlinSerializationContext;[B)Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependency;
public static final fun toByteArray (Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependency;Lorg/jetbrains/kotlin/gradle/idea/serialize/IdeaKotlinSerializationContext;)[B
diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinClasspathProto.java b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinClasspathProto.java
new file mode 100644
index 00000000000..dc8f36604bc
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinClasspathProto.java
@@ -0,0 +1,589 @@
+// Generated by the protocol buffer compiler. DO NOT EDIT!
+// source: proto_tcs.proto
+
+package org.jetbrains.kotlin.gradle.idea.proto.generated.tcs;
+
+/**
+ * Protobuf type {@code org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto}
+ */
+public final class IdeaKotlinClasspathProto extends
+ com.google.protobuf.GeneratedMessageV3 implements
+ // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto)
+ IdeaKotlinClasspathProtoOrBuilder {
+private static final long serialVersionUID = 0L;
+ // Use IdeaKotlinClasspathProto.newBuilder() to construct.
+ private IdeaKotlinClasspathProto(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+ super(builder);
+ }
+ private IdeaKotlinClasspathProto() {
+ files_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+ }
+
+ @java.lang.Override
+ @SuppressWarnings({"unused"})
+ protected java.lang.Object newInstance(
+ UnusedPrivateParameter unused) {
+ return new IdeaKotlinClasspathProto();
+ }
+
+ @java.lang.Override
+ public final com.google.protobuf.UnknownFieldSet
+ getUnknownFields() {
+ return this.unknownFields;
+ }
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ProtoTcs.internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinClasspathProto_descriptor;
+ }
+
+ @java.lang.Override
+ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ProtoTcs.internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinClasspathProto_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto.class, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto.Builder.class);
+ }
+
+ public static final int FILES_FIELD_NUMBER = 1;
+ private com.google.protobuf.LazyStringList files_;
+ /**
+ * repeated string files = 1;
+ * @return A list containing the files.
+ */
+ public com.google.protobuf.ProtocolStringList
+ getFilesList() {
+ return files_;
+ }
+ /**
+ * repeated string files = 1;
+ * @return The count of files.
+ */
+ public int getFilesCount() {
+ return files_.size();
+ }
+ /**
+ * repeated string files = 1;
+ * @param index The index of the element to return.
+ * @return The files at the given index.
+ */
+ public java.lang.String getFiles(int index) {
+ return files_.get(index);
+ }
+ /**
+ * repeated string files = 1;
+ * @param index The index of the value to return.
+ * @return The bytes of the files at the given index.
+ */
+ public com.google.protobuf.ByteString
+ getFilesBytes(int index) {
+ return files_.getByteString(index);
+ }
+
+ private byte memoizedIsInitialized = -1;
+ @java.lang.Override
+ public final boolean isInitialized() {
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
+
+ memoizedIsInitialized = 1;
+ return true;
+ }
+
+ @java.lang.Override
+ public void writeTo(com.google.protobuf.CodedOutputStream output)
+ throws java.io.IOException {
+ for (int i = 0; i < files_.size(); i++) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 1, files_.getRaw(i));
+ }
+ getUnknownFields().writeTo(output);
+ }
+
+ @java.lang.Override
+ public int getSerializedSize() {
+ int size = memoizedSize;
+ if (size != -1) return size;
+
+ size = 0;
+ {
+ int dataSize = 0;
+ for (int i = 0; i < files_.size(); i++) {
+ dataSize += computeStringSizeNoTag(files_.getRaw(i));
+ }
+ size += dataSize;
+ size += 1 * getFilesList().size();
+ }
+ size += getUnknownFields().getSerializedSize();
+ memoizedSize = size;
+ return size;
+ }
+
+ @java.lang.Override
+ public boolean equals(final java.lang.Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto)) {
+ return super.equals(obj);
+ }
+ org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto other = (org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto) obj;
+
+ if (!getFilesList()
+ .equals(other.getFilesList())) return false;
+ if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+ return true;
+ }
+
+ @java.lang.Override
+ public int hashCode() {
+ if (memoizedHashCode != 0) {
+ return memoizedHashCode;
+ }
+ int hash = 41;
+ hash = (19 * hash) + getDescriptor().hashCode();
+ if (getFilesCount() > 0) {
+ hash = (37 * hash) + FILES_FIELD_NUMBER;
+ hash = (53 * hash) + getFilesList().hashCode();
+ }
+ hash = (29 * hash) + getUnknownFields().hashCode();
+ memoizedHashCode = hash;
+ return hash;
+ }
+
+ public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto parseFrom(
+ java.nio.ByteBuffer data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto parseFrom(
+ java.nio.ByteBuffer data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto parseFrom(
+ com.google.protobuf.ByteString data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto parseFrom(
+ com.google.protobuf.ByteString data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto parseFrom(byte[] data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto parseFrom(
+ byte[] data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto parseFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input);
+ }
+ public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto parseFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input, extensionRegistry);
+ }
+ public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto parseDelimitedFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseDelimitedWithIOException(PARSER, input);
+ }
+ public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto parseDelimitedFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+ }
+ public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto parseFrom(
+ com.google.protobuf.CodedInputStream input)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input);
+ }
+ public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto parseFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input, extensionRegistry);
+ }
+
+ @java.lang.Override
+ public Builder newBuilderForType() { return newBuilder(); }
+ public static Builder newBuilder() {
+ return DEFAULT_INSTANCE.toBuilder();
+ }
+ public static Builder newBuilder(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto prototype) {
+ return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+ }
+ @java.lang.Override
+ public Builder toBuilder() {
+ return this == DEFAULT_INSTANCE
+ ? new Builder() : new Builder().mergeFrom(this);
+ }
+
+ @java.lang.Override
+ protected Builder newBuilderForType(
+ com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+ Builder builder = new Builder(parent);
+ return builder;
+ }
+ /**
+ * Protobuf type {@code org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto}
+ */
+ public static final class Builder extends
+ com.google.protobuf.GeneratedMessageV3.Builder implements
+ // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto)
+ org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProtoOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ProtoTcs.internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinClasspathProto_descriptor;
+ }
+
+ @java.lang.Override
+ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ProtoTcs.internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinClasspathProto_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto.class, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto.Builder.class);
+ }
+
+ // Construct using org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto.newBuilder()
+ private Builder() {
+
+ }
+
+ private Builder(
+ com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+ super(parent);
+
+ }
+ @java.lang.Override
+ public Builder clear() {
+ super.clear();
+ files_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+ bitField0_ = (bitField0_ & ~0x00000001);
+ return this;
+ }
+
+ @java.lang.Override
+ public com.google.protobuf.Descriptors.Descriptor
+ getDescriptorForType() {
+ return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ProtoTcs.internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinClasspathProto_descriptor;
+ }
+
+ @java.lang.Override
+ public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto getDefaultInstanceForType() {
+ return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto.getDefaultInstance();
+ }
+
+ @java.lang.Override
+ public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto build() {
+ org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto result = buildPartial();
+ if (!result.isInitialized()) {
+ throw newUninitializedMessageException(result);
+ }
+ return result;
+ }
+
+ @java.lang.Override
+ public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto buildPartial() {
+ org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto result = new org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto(this);
+ int from_bitField0_ = bitField0_;
+ if (((bitField0_ & 0x00000001) != 0)) {
+ files_ = files_.getUnmodifiableView();
+ bitField0_ = (bitField0_ & ~0x00000001);
+ }
+ result.files_ = files_;
+ onBuilt();
+ return result;
+ }
+
+ @java.lang.Override
+ public Builder clone() {
+ return super.clone();
+ }
+ @java.lang.Override
+ public Builder setField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ java.lang.Object value) {
+ return super.setField(field, value);
+ }
+ @java.lang.Override
+ public Builder clearField(
+ com.google.protobuf.Descriptors.FieldDescriptor field) {
+ return super.clearField(field);
+ }
+ @java.lang.Override
+ public Builder clearOneof(
+ com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+ return super.clearOneof(oneof);
+ }
+ @java.lang.Override
+ public Builder setRepeatedField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ int index, java.lang.Object value) {
+ return super.setRepeatedField(field, index, value);
+ }
+ @java.lang.Override
+ public Builder addRepeatedField(
+ com.google.protobuf.Descriptors.FieldDescriptor field,
+ java.lang.Object value) {
+ return super.addRepeatedField(field, value);
+ }
+ @java.lang.Override
+ public Builder mergeFrom(com.google.protobuf.Message other) {
+ if (other instanceof org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto) {
+ return mergeFrom((org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto)other);
+ } else {
+ super.mergeFrom(other);
+ return this;
+ }
+ }
+
+ public Builder mergeFrom(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto other) {
+ if (other == org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto.getDefaultInstance()) return this;
+ if (!other.files_.isEmpty()) {
+ if (files_.isEmpty()) {
+ files_ = other.files_;
+ bitField0_ = (bitField0_ & ~0x00000001);
+ } else {
+ ensureFilesIsMutable();
+ files_.addAll(other.files_);
+ }
+ onChanged();
+ }
+ this.mergeUnknownFields(other.getUnknownFields());
+ onChanged();
+ return this;
+ }
+
+ @java.lang.Override
+ public final boolean isInitialized() {
+ return true;
+ }
+
+ @java.lang.Override
+ public Builder mergeFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ if (extensionRegistry == null) {
+ throw new java.lang.NullPointerException();
+ }
+ try {
+ boolean done = false;
+ while (!done) {
+ int tag = input.readTag();
+ switch (tag) {
+ case 0:
+ done = true;
+ break;
+ case 10: {
+ java.lang.String s = input.readStringRequireUtf8();
+ ensureFilesIsMutable();
+ files_.add(s);
+ break;
+ } // case 10
+ default: {
+ if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+ done = true; // was an endgroup tag
+ }
+ break;
+ } // default:
+ } // switch (tag)
+ } // while (!done)
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ throw e.unwrapIOException();
+ } finally {
+ onChanged();
+ } // finally
+ return this;
+ }
+ private int bitField0_;
+
+ private com.google.protobuf.LazyStringList files_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+ private void ensureFilesIsMutable() {
+ if (!((bitField0_ & 0x00000001) != 0)) {
+ files_ = new com.google.protobuf.LazyStringArrayList(files_);
+ bitField0_ |= 0x00000001;
+ }
+ }
+ /**
+ * repeated string files = 1;
+ * @return A list containing the files.
+ */
+ public com.google.protobuf.ProtocolStringList
+ getFilesList() {
+ return files_.getUnmodifiableView();
+ }
+ /**
+ * repeated string files = 1;
+ * @return The count of files.
+ */
+ public int getFilesCount() {
+ return files_.size();
+ }
+ /**
+ * repeated string files = 1;
+ * @param index The index of the element to return.
+ * @return The files at the given index.
+ */
+ public java.lang.String getFiles(int index) {
+ return files_.get(index);
+ }
+ /**
+ * repeated string files = 1;
+ * @param index The index of the value to return.
+ * @return The bytes of the files at the given index.
+ */
+ public com.google.protobuf.ByteString
+ getFilesBytes(int index) {
+ return files_.getByteString(index);
+ }
+ /**
+ * repeated string files = 1;
+ * @param index The index to set the value at.
+ * @param value The files to set.
+ * @return This builder for chaining.
+ */
+ public Builder setFiles(
+ int index, java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ ensureFilesIsMutable();
+ files_.set(index, value);
+ onChanged();
+ return this;
+ }
+ /**
+ * repeated string files = 1;
+ * @param value The files to add.
+ * @return This builder for chaining.
+ */
+ public Builder addFiles(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ ensureFilesIsMutable();
+ files_.add(value);
+ onChanged();
+ return this;
+ }
+ /**
+ * repeated string files = 1;
+ * @param values The files to add.
+ * @return This builder for chaining.
+ */
+ public Builder addAllFiles(
+ java.lang.Iterable values) {
+ ensureFilesIsMutable();
+ com.google.protobuf.AbstractMessageLite.Builder.addAll(
+ values, files_);
+ onChanged();
+ return this;
+ }
+ /**
+ * repeated string files = 1;
+ * @return This builder for chaining.
+ */
+ public Builder clearFiles() {
+ files_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+ bitField0_ = (bitField0_ & ~0x00000001);
+ onChanged();
+ return this;
+ }
+ /**
+ * repeated string files = 1;
+ * @param value The bytes of the files to add.
+ * @return This builder for chaining.
+ */
+ public Builder addFilesBytes(
+ com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+ ensureFilesIsMutable();
+ files_.add(value);
+ onChanged();
+ return this;
+ }
+ @java.lang.Override
+ public final Builder setUnknownFields(
+ final com.google.protobuf.UnknownFieldSet unknownFields) {
+ return super.setUnknownFields(unknownFields);
+ }
+
+ @java.lang.Override
+ public final Builder mergeUnknownFields(
+ final com.google.protobuf.UnknownFieldSet unknownFields) {
+ return super.mergeUnknownFields(unknownFields);
+ }
+
+
+ // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto)
+ }
+
+ // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto)
+ private static final org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto DEFAULT_INSTANCE;
+ static {
+ DEFAULT_INSTANCE = new org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto();
+ }
+
+ public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto getDefaultInstance() {
+ return DEFAULT_INSTANCE;
+ }
+
+ private static final com.google.protobuf.Parser
+ PARSER = new com.google.protobuf.AbstractParser() {
+ @java.lang.Override
+ public IdeaKotlinClasspathProto parsePartialFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ Builder builder = newBuilder();
+ try {
+ builder.mergeFrom(input, extensionRegistry);
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ throw e.setUnfinishedMessage(builder.buildPartial());
+ } catch (com.google.protobuf.UninitializedMessageException e) {
+ throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+ } catch (java.io.IOException e) {
+ throw new com.google.protobuf.InvalidProtocolBufferException(e)
+ .setUnfinishedMessage(builder.buildPartial());
+ }
+ return builder.buildPartial();
+ }
+ };
+
+ public static com.google.protobuf.Parser parser() {
+ return PARSER;
+ }
+
+ @java.lang.Override
+ public com.google.protobuf.Parser getParserForType() {
+ return PARSER;
+ }
+
+ @java.lang.Override
+ public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto getDefaultInstanceForType() {
+ return DEFAULT_INSTANCE;
+ }
+
+}
+
diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinClasspathProtoOrBuilder.java b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinClasspathProtoOrBuilder.java
new file mode 100644
index 00000000000..054e3ecd662
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinClasspathProtoOrBuilder.java
@@ -0,0 +1,34 @@
+// Generated by the protocol buffer compiler. DO NOT EDIT!
+// source: proto_tcs.proto
+
+package org.jetbrains.kotlin.gradle.idea.proto.generated.tcs;
+
+public interface IdeaKotlinClasspathProtoOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto)
+ com.google.protobuf.MessageOrBuilder {
+
+ /**
+ * repeated string files = 1;
+ * @return A list containing the files.
+ */
+ java.util.List
+ getFilesList();
+ /**
+ * repeated string files = 1;
+ * @return The count of files.
+ */
+ int getFilesCount();
+ /**
+ * repeated string files = 1;
+ * @param index The index of the element to return.
+ * @return The files at the given index.
+ */
+ java.lang.String getFiles(int index);
+ /**
+ * repeated string files = 1;
+ * @param index The index of the value to return.
+ * @return The bytes of the files at the given index.
+ */
+ com.google.protobuf.ByteString
+ getFilesBytes(int index);
+}
diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactCoordinatesProto.java b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactCoordinatesProto.java
deleted file mode 100644
index 8d51b9068b7..00000000000
--- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactCoordinatesProto.java
+++ /dev/null
@@ -1,759 +0,0 @@
-// Generated by the protocol buffer compiler. DO NOT EDIT!
-// source: proto_tcs.proto
-
-package org.jetbrains.kotlin.gradle.idea.proto.generated.tcs;
-
-/**
- * Protobuf type {@code org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto}
- */
-public final class IdeaKotlinProjectArtifactCoordinatesProto extends
- com.google.protobuf.GeneratedMessageV3 implements
- // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto)
- IdeaKotlinProjectArtifactCoordinatesProtoOrBuilder {
-private static final long serialVersionUID = 0L;
- // Use IdeaKotlinProjectArtifactCoordinatesProto.newBuilder() to construct.
- private IdeaKotlinProjectArtifactCoordinatesProto(com.google.protobuf.GeneratedMessageV3.Builder builder) {
- super(builder);
- }
- private IdeaKotlinProjectArtifactCoordinatesProto() {
- artifactFile_ = "";
- }
-
- @java.lang.Override
- @SuppressWarnings({"unused"})
- protected java.lang.Object newInstance(
- UnusedPrivateParameter unused) {
- return new IdeaKotlinProjectArtifactCoordinatesProto();
- }
-
- @java.lang.Override
- public final com.google.protobuf.UnknownFieldSet
- getUnknownFields() {
- return this.unknownFields;
- }
- public static final com.google.protobuf.Descriptors.Descriptor
- getDescriptor() {
- return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ProtoTcs.internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactCoordinatesProto_descriptor;
- }
-
- @java.lang.Override
- protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
- internalGetFieldAccessorTable() {
- return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ProtoTcs.internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactCoordinatesProto_fieldAccessorTable
- .ensureFieldAccessorsInitialized(
- org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.class, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.Builder.class);
- }
-
- private int bitField0_;
- public static final int PROJECT_FIELD_NUMBER = 1;
- private org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project_;
- /**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1;
- * @return Whether the project field is set.
- */
- @java.lang.Override
- public boolean hasProject() {
- return ((bitField0_ & 0x00000001) != 0);
- }
- /**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1;
- * @return The project.
- */
- @java.lang.Override
- public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto getProject() {
- return project_ == null ? org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.getDefaultInstance() : project_;
- }
- /**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1;
- */
- @java.lang.Override
- public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProtoOrBuilder getProjectOrBuilder() {
- return project_ == null ? org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.getDefaultInstance() : project_;
- }
-
- public static final int ARTIFACT_FILE_FIELD_NUMBER = 2;
- private volatile java.lang.Object artifactFile_;
- /**
- * optional string artifact_file = 2;
- * @return Whether the artifactFile field is set.
- */
- @java.lang.Override
- public boolean hasArtifactFile() {
- return ((bitField0_ & 0x00000002) != 0);
- }
- /**
- * optional string artifact_file = 2;
- * @return The artifactFile.
- */
- @java.lang.Override
- public java.lang.String getArtifactFile() {
- java.lang.Object ref = artifactFile_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
- } else {
- com.google.protobuf.ByteString bs =
- (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- artifactFile_ = s;
- return s;
- }
- }
- /**
- * optional string artifact_file = 2;
- * @return The bytes for artifactFile.
- */
- @java.lang.Override
- public com.google.protobuf.ByteString
- getArtifactFileBytes() {
- java.lang.Object ref = artifactFile_;
- if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
- artifactFile_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
-
- private byte memoizedIsInitialized = -1;
- @java.lang.Override
- public final boolean isInitialized() {
- byte isInitialized = memoizedIsInitialized;
- if (isInitialized == 1) return true;
- if (isInitialized == 0) return false;
-
- memoizedIsInitialized = 1;
- return true;
- }
-
- @java.lang.Override
- public void writeTo(com.google.protobuf.CodedOutputStream output)
- throws java.io.IOException {
- if (((bitField0_ & 0x00000001) != 0)) {
- output.writeMessage(1, getProject());
- }
- if (((bitField0_ & 0x00000002) != 0)) {
- com.google.protobuf.GeneratedMessageV3.writeString(output, 2, artifactFile_);
- }
- getUnknownFields().writeTo(output);
- }
-
- @java.lang.Override
- public int getSerializedSize() {
- int size = memoizedSize;
- if (size != -1) return size;
-
- size = 0;
- if (((bitField0_ & 0x00000001) != 0)) {
- size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(1, getProject());
- }
- if (((bitField0_ & 0x00000002) != 0)) {
- size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, artifactFile_);
- }
- size += getUnknownFields().getSerializedSize();
- memoizedSize = size;
- return size;
- }
-
- @java.lang.Override
- public boolean equals(final java.lang.Object obj) {
- if (obj == this) {
- return true;
- }
- if (!(obj instanceof org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto)) {
- return super.equals(obj);
- }
- org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto other = (org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto) obj;
-
- if (hasProject() != other.hasProject()) return false;
- if (hasProject()) {
- if (!getProject()
- .equals(other.getProject())) return false;
- }
- if (hasArtifactFile() != other.hasArtifactFile()) return false;
- if (hasArtifactFile()) {
- if (!getArtifactFile()
- .equals(other.getArtifactFile())) return false;
- }
- if (!getUnknownFields().equals(other.getUnknownFields())) return false;
- return true;
- }
-
- @java.lang.Override
- public int hashCode() {
- if (memoizedHashCode != 0) {
- return memoizedHashCode;
- }
- int hash = 41;
- hash = (19 * hash) + getDescriptor().hashCode();
- if (hasProject()) {
- hash = (37 * hash) + PROJECT_FIELD_NUMBER;
- hash = (53 * hash) + getProject().hashCode();
- }
- if (hasArtifactFile()) {
- hash = (37 * hash) + ARTIFACT_FILE_FIELD_NUMBER;
- hash = (53 * hash) + getArtifactFile().hashCode();
- }
- hash = (29 * hash) + getUnknownFields().hashCode();
- memoizedHashCode = hash;
- return hash;
- }
-
- public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto parseFrom(
- java.nio.ByteBuffer data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data);
- }
- public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto parseFrom(
- java.nio.ByteBuffer data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data, extensionRegistry);
- }
- public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data);
- }
- public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data, extensionRegistry);
- }
- public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data);
- }
- public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto parseFrom(
- byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data, extensionRegistry);
- }
- public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto parseFrom(java.io.InputStream input)
- throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3
- .parseWithIOException(PARSER, input);
- }
- public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto parseFrom(
- java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3
- .parseWithIOException(PARSER, input, extensionRegistry);
- }
- public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto parseDelimitedFrom(java.io.InputStream input)
- throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3
- .parseDelimitedWithIOException(PARSER, input);
- }
- public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto parseDelimitedFrom(
- java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3
- .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
- }
- public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto parseFrom(
- com.google.protobuf.CodedInputStream input)
- throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3
- .parseWithIOException(PARSER, input);
- }
- public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- return com.google.protobuf.GeneratedMessageV3
- .parseWithIOException(PARSER, input, extensionRegistry);
- }
-
- @java.lang.Override
- public Builder newBuilderForType() { return newBuilder(); }
- public static Builder newBuilder() {
- return DEFAULT_INSTANCE.toBuilder();
- }
- public static Builder newBuilder(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto prototype) {
- return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
- }
- @java.lang.Override
- public Builder toBuilder() {
- return this == DEFAULT_INSTANCE
- ? new Builder() : new Builder().mergeFrom(this);
- }
-
- @java.lang.Override
- protected Builder newBuilderForType(
- com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
- Builder builder = new Builder(parent);
- return builder;
- }
- /**
- * Protobuf type {@code org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto}
- */
- public static final class Builder extends
- com.google.protobuf.GeneratedMessageV3.Builder implements
- // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto)
- org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProtoOrBuilder {
- public static final com.google.protobuf.Descriptors.Descriptor
- getDescriptor() {
- return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ProtoTcs.internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactCoordinatesProto_descriptor;
- }
-
- @java.lang.Override
- protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
- internalGetFieldAccessorTable() {
- return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ProtoTcs.internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactCoordinatesProto_fieldAccessorTable
- .ensureFieldAccessorsInitialized(
- org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.class, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.Builder.class);
- }
-
- // Construct using org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.newBuilder()
- private Builder() {
- maybeForceBuilderInitialization();
- }
-
- private Builder(
- com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
- super(parent);
- maybeForceBuilderInitialization();
- }
- private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessageV3
- .alwaysUseFieldBuilders) {
- getProjectFieldBuilder();
- }
- }
- @java.lang.Override
- public Builder clear() {
- super.clear();
- if (projectBuilder_ == null) {
- project_ = null;
- } else {
- projectBuilder_.clear();
- }
- bitField0_ = (bitField0_ & ~0x00000001);
- artifactFile_ = "";
- bitField0_ = (bitField0_ & ~0x00000002);
- return this;
- }
-
- @java.lang.Override
- public com.google.protobuf.Descriptors.Descriptor
- getDescriptorForType() {
- return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ProtoTcs.internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactCoordinatesProto_descriptor;
- }
-
- @java.lang.Override
- public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto getDefaultInstanceForType() {
- return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.getDefaultInstance();
- }
-
- @java.lang.Override
- public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto build() {
- org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto result = buildPartial();
- if (!result.isInitialized()) {
- throw newUninitializedMessageException(result);
- }
- return result;
- }
-
- @java.lang.Override
- public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto buildPartial() {
- org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto result = new org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto(this);
- int from_bitField0_ = bitField0_;
- int to_bitField0_ = 0;
- if (((from_bitField0_ & 0x00000001) != 0)) {
- if (projectBuilder_ == null) {
- result.project_ = project_;
- } else {
- result.project_ = projectBuilder_.build();
- }
- to_bitField0_ |= 0x00000001;
- }
- if (((from_bitField0_ & 0x00000002) != 0)) {
- to_bitField0_ |= 0x00000002;
- }
- result.artifactFile_ = artifactFile_;
- result.bitField0_ = to_bitField0_;
- onBuilt();
- return result;
- }
-
- @java.lang.Override
- public Builder clone() {
- return super.clone();
- }
- @java.lang.Override
- public Builder setField(
- com.google.protobuf.Descriptors.FieldDescriptor field,
- java.lang.Object value) {
- return super.setField(field, value);
- }
- @java.lang.Override
- public Builder clearField(
- com.google.protobuf.Descriptors.FieldDescriptor field) {
- return super.clearField(field);
- }
- @java.lang.Override
- public Builder clearOneof(
- com.google.protobuf.Descriptors.OneofDescriptor oneof) {
- return super.clearOneof(oneof);
- }
- @java.lang.Override
- public Builder setRepeatedField(
- com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, java.lang.Object value) {
- return super.setRepeatedField(field, index, value);
- }
- @java.lang.Override
- public Builder addRepeatedField(
- com.google.protobuf.Descriptors.FieldDescriptor field,
- java.lang.Object value) {
- return super.addRepeatedField(field, value);
- }
- @java.lang.Override
- public Builder mergeFrom(com.google.protobuf.Message other) {
- if (other instanceof org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto) {
- return mergeFrom((org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto)other);
- } else {
- super.mergeFrom(other);
- return this;
- }
- }
-
- public Builder mergeFrom(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto other) {
- if (other == org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.getDefaultInstance()) return this;
- if (other.hasProject()) {
- mergeProject(other.getProject());
- }
- if (other.hasArtifactFile()) {
- bitField0_ |= 0x00000002;
- artifactFile_ = other.artifactFile_;
- onChanged();
- }
- this.mergeUnknownFields(other.getUnknownFields());
- onChanged();
- return this;
- }
-
- @java.lang.Override
- public final boolean isInitialized() {
- return true;
- }
-
- @java.lang.Override
- public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- if (extensionRegistry == null) {
- throw new java.lang.NullPointerException();
- }
- try {
- boolean done = false;
- while (!done) {
- int tag = input.readTag();
- switch (tag) {
- case 0:
- done = true;
- break;
- case 10: {
- input.readMessage(
- getProjectFieldBuilder().getBuilder(),
- extensionRegistry);
- bitField0_ |= 0x00000001;
- break;
- } // case 10
- case 18: {
- artifactFile_ = input.readStringRequireUtf8();
- bitField0_ |= 0x00000002;
- break;
- } // case 18
- default: {
- if (!super.parseUnknownField(input, extensionRegistry, tag)) {
- done = true; // was an endgroup tag
- }
- break;
- } // default:
- } // switch (tag)
- } // while (!done)
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
- throw e.unwrapIOException();
- } finally {
- onChanged();
- } // finally
- return this;
- }
- private int bitField0_;
-
- private org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project_;
- private com.google.protobuf.SingleFieldBuilderV3<
- org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.Builder, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProtoOrBuilder> projectBuilder_;
- /**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1;
- * @return Whether the project field is set.
- */
- public boolean hasProject() {
- return ((bitField0_ & 0x00000001) != 0);
- }
- /**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1;
- * @return The project.
- */
- public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto getProject() {
- if (projectBuilder_ == null) {
- return project_ == null ? org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.getDefaultInstance() : project_;
- } else {
- return projectBuilder_.getMessage();
- }
- }
- /**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1;
- */
- public Builder setProject(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto value) {
- if (projectBuilder_ == null) {
- if (value == null) {
- throw new NullPointerException();
- }
- project_ = value;
- onChanged();
- } else {
- projectBuilder_.setMessage(value);
- }
- bitField0_ |= 0x00000001;
- return this;
- }
- /**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1;
- */
- public Builder setProject(
- org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.Builder builderForValue) {
- if (projectBuilder_ == null) {
- project_ = builderForValue.build();
- onChanged();
- } else {
- projectBuilder_.setMessage(builderForValue.build());
- }
- bitField0_ |= 0x00000001;
- return this;
- }
- /**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1;
- */
- public Builder mergeProject(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto value) {
- if (projectBuilder_ == null) {
- if (((bitField0_ & 0x00000001) != 0) &&
- project_ != null &&
- project_ != org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.getDefaultInstance()) {
- project_ =
- org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.newBuilder(project_).mergeFrom(value).buildPartial();
- } else {
- project_ = value;
- }
- onChanged();
- } else {
- projectBuilder_.mergeFrom(value);
- }
- bitField0_ |= 0x00000001;
- return this;
- }
- /**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1;
- */
- public Builder clearProject() {
- if (projectBuilder_ == null) {
- project_ = null;
- onChanged();
- } else {
- projectBuilder_.clear();
- }
- bitField0_ = (bitField0_ & ~0x00000001);
- return this;
- }
- /**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1;
- */
- public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.Builder getProjectBuilder() {
- bitField0_ |= 0x00000001;
- onChanged();
- return getProjectFieldBuilder().getBuilder();
- }
- /**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1;
- */
- public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProtoOrBuilder getProjectOrBuilder() {
- if (projectBuilder_ != null) {
- return projectBuilder_.getMessageOrBuilder();
- } else {
- return project_ == null ?
- org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.getDefaultInstance() : project_;
- }
- }
- /**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1;
- */
- private com.google.protobuf.SingleFieldBuilderV3<
- org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.Builder, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProtoOrBuilder>
- getProjectFieldBuilder() {
- if (projectBuilder_ == null) {
- projectBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
- org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.Builder, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProtoOrBuilder>(
- getProject(),
- getParentForChildren(),
- isClean());
- project_ = null;
- }
- return projectBuilder_;
- }
-
- private java.lang.Object artifactFile_ = "";
- /**
- * optional string artifact_file = 2;
- * @return Whether the artifactFile field is set.
- */
- public boolean hasArtifactFile() {
- return ((bitField0_ & 0x00000002) != 0);
- }
- /**
- * optional string artifact_file = 2;
- * @return The artifactFile.
- */
- public java.lang.String getArtifactFile() {
- java.lang.Object ref = artifactFile_;
- if (!(ref instanceof java.lang.String)) {
- com.google.protobuf.ByteString bs =
- (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- artifactFile_ = s;
- return s;
- } else {
- return (java.lang.String) ref;
- }
- }
- /**
- * optional string artifact_file = 2;
- * @return The bytes for artifactFile.
- */
- public com.google.protobuf.ByteString
- getArtifactFileBytes() {
- java.lang.Object ref = artifactFile_;
- if (ref instanceof String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
- artifactFile_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
- }
- /**
- * optional string artifact_file = 2;
- * @param value The artifactFile to set.
- * @return This builder for chaining.
- */
- public Builder setArtifactFile(
- java.lang.String value) {
- if (value == null) {
- throw new NullPointerException();
- }
- bitField0_ |= 0x00000002;
- artifactFile_ = value;
- onChanged();
- return this;
- }
- /**
- * optional string artifact_file = 2;
- * @return This builder for chaining.
- */
- public Builder clearArtifactFile() {
- bitField0_ = (bitField0_ & ~0x00000002);
- artifactFile_ = getDefaultInstance().getArtifactFile();
- onChanged();
- return this;
- }
- /**
- * optional string artifact_file = 2;
- * @param value The bytes for artifactFile to set.
- * @return This builder for chaining.
- */
- public Builder setArtifactFileBytes(
- com.google.protobuf.ByteString value) {
- if (value == null) {
- throw new NullPointerException();
- }
- checkByteStringIsUtf8(value);
- bitField0_ |= 0x00000002;
- artifactFile_ = value;
- onChanged();
- return this;
- }
- @java.lang.Override
- public final Builder setUnknownFields(
- final com.google.protobuf.UnknownFieldSet unknownFields) {
- return super.setUnknownFields(unknownFields);
- }
-
- @java.lang.Override
- public final Builder mergeUnknownFields(
- final com.google.protobuf.UnknownFieldSet unknownFields) {
- return super.mergeUnknownFields(unknownFields);
- }
-
-
- // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto)
- }
-
- // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto)
- private static final org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto DEFAULT_INSTANCE;
- static {
- DEFAULT_INSTANCE = new org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto();
- }
-
- public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto getDefaultInstance() {
- return DEFAULT_INSTANCE;
- }
-
- private static final com.google.protobuf.Parser
- PARSER = new com.google.protobuf.AbstractParser() {
- @java.lang.Override
- public IdeaKotlinProjectArtifactCoordinatesProto parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- Builder builder = newBuilder();
- try {
- builder.mergeFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
- throw e.setUnfinishedMessage(builder.buildPartial());
- } catch (com.google.protobuf.UninitializedMessageException e) {
- throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
- } catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(e)
- .setUnfinishedMessage(builder.buildPartial());
- }
- return builder.buildPartial();
- }
- };
-
- public static com.google.protobuf.Parser parser() {
- return PARSER;
- }
-
- @java.lang.Override
- public com.google.protobuf.Parser getParserForType() {
- return PARSER;
- }
-
- @java.lang.Override
- public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto getDefaultInstanceForType() {
- return DEFAULT_INSTANCE;
- }
-
-}
-
diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactCoordinatesProtoOrBuilder.java b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactCoordinatesProtoOrBuilder.java
deleted file mode 100644
index 499ba8681aa..00000000000
--- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactCoordinatesProtoOrBuilder.java
+++ /dev/null
@@ -1,41 +0,0 @@
-// Generated by the protocol buffer compiler. DO NOT EDIT!
-// source: proto_tcs.proto
-
-package org.jetbrains.kotlin.gradle.idea.proto.generated.tcs;
-
-public interface IdeaKotlinProjectArtifactCoordinatesProtoOrBuilder extends
- // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto)
- com.google.protobuf.MessageOrBuilder {
-
- /**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1;
- * @return Whether the project field is set.
- */
- boolean hasProject();
- /**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1;
- * @return The project.
- */
- org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto getProject();
- /**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1;
- */
- org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProtoOrBuilder getProjectOrBuilder();
-
- /**
- * optional string artifact_file = 2;
- * @return Whether the artifactFile field is set.
- */
- boolean hasArtifactFile();
- /**
- * optional string artifact_file = 2;
- * @return The artifactFile.
- */
- java.lang.String getArtifactFile();
- /**
- * optional string artifact_file = 2;
- * @return The bytes for artifactFile.
- */
- com.google.protobuf.ByteString
- getArtifactFileBytes();
-}
diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactDependencyProto.java b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactDependencyProto.java
index 47d2e8720cb..64cad75b76f 100644
--- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactDependencyProto.java
+++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactDependencyProto.java
@@ -98,9 +98,9 @@ private static final long serialVersionUID = 0L;
}
public static final int COORDINATES_FIELD_NUMBER = 3;
- private org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates_;
+ private org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto coordinates_;
/**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3;
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto coordinates = 3;
* @return Whether the coordinates field is set.
*/
@java.lang.Override
@@ -108,19 +108,19 @@ private static final long serialVersionUID = 0L;
return ((bitField0_ & 0x00000004) != 0);
}
/**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3;
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto coordinates = 3;
* @return The coordinates.
*/
@java.lang.Override
- public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto getCoordinates() {
- return coordinates_ == null ? org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.getDefaultInstance() : coordinates_;
+ public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto getCoordinates() {
+ return coordinates_ == null ? org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.getDefaultInstance() : coordinates_;
}
/**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3;
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto coordinates = 3;
*/
@java.lang.Override
- public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProtoOrBuilder getCoordinatesOrBuilder() {
- return coordinates_ == null ? org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.getDefaultInstance() : coordinates_;
+ public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProtoOrBuilder getCoordinatesOrBuilder() {
+ return coordinates_ == null ? org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.getDefaultInstance() : coordinates_;
}
private byte memoizedIsInitialized = -1;
@@ -717,31 +717,31 @@ private static final long serialVersionUID = 0L;
return this;
}
- private org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates_;
+ private org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto coordinates_;
private com.google.protobuf.SingleFieldBuilderV3<
- org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.Builder, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProtoOrBuilder> coordinatesBuilder_;
+ org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.Builder, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProtoOrBuilder> coordinatesBuilder_;
/**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3;
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto coordinates = 3;
* @return Whether the coordinates field is set.
*/
public boolean hasCoordinates() {
return ((bitField0_ & 0x00000004) != 0);
}
/**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3;
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto coordinates = 3;
* @return The coordinates.
*/
- public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto getCoordinates() {
+ public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto getCoordinates() {
if (coordinatesBuilder_ == null) {
- return coordinates_ == null ? org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.getDefaultInstance() : coordinates_;
+ return coordinates_ == null ? org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.getDefaultInstance() : coordinates_;
} else {
return coordinatesBuilder_.getMessage();
}
}
/**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3;
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto coordinates = 3;
*/
- public Builder setCoordinates(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto value) {
+ public Builder setCoordinates(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto value) {
if (coordinatesBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
@@ -755,10 +755,10 @@ private static final long serialVersionUID = 0L;
return this;
}
/**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3;
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto coordinates = 3;
*/
public Builder setCoordinates(
- org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.Builder builderForValue) {
+ org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.Builder builderForValue) {
if (coordinatesBuilder_ == null) {
coordinates_ = builderForValue.build();
onChanged();
@@ -769,15 +769,15 @@ private static final long serialVersionUID = 0L;
return this;
}
/**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3;
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto coordinates = 3;
*/
- public Builder mergeCoordinates(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto value) {
+ public Builder mergeCoordinates(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto value) {
if (coordinatesBuilder_ == null) {
if (((bitField0_ & 0x00000004) != 0) &&
coordinates_ != null &&
- coordinates_ != org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.getDefaultInstance()) {
+ coordinates_ != org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.getDefaultInstance()) {
coordinates_ =
- org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.newBuilder(coordinates_).mergeFrom(value).buildPartial();
+ org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.newBuilder(coordinates_).mergeFrom(value).buildPartial();
} else {
coordinates_ = value;
}
@@ -789,7 +789,7 @@ private static final long serialVersionUID = 0L;
return this;
}
/**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3;
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto coordinates = 3;
*/
public Builder clearCoordinates() {
if (coordinatesBuilder_ == null) {
@@ -802,33 +802,33 @@ private static final long serialVersionUID = 0L;
return this;
}
/**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3;
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto coordinates = 3;
*/
- public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.Builder getCoordinatesBuilder() {
+ public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.Builder getCoordinatesBuilder() {
bitField0_ |= 0x00000004;
onChanged();
return getCoordinatesFieldBuilder().getBuilder();
}
/**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3;
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto coordinates = 3;
*/
- public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProtoOrBuilder getCoordinatesOrBuilder() {
+ public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProtoOrBuilder getCoordinatesOrBuilder() {
if (coordinatesBuilder_ != null) {
return coordinatesBuilder_.getMessageOrBuilder();
} else {
return coordinates_ == null ?
- org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.getDefaultInstance() : coordinates_;
+ org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.getDefaultInstance() : coordinates_;
}
}
/**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3;
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto coordinates = 3;
*/
private com.google.protobuf.SingleFieldBuilderV3<
- org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.Builder, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProtoOrBuilder>
+ org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.Builder, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProtoOrBuilder>
getCoordinatesFieldBuilder() {
if (coordinatesBuilder_ == null) {
coordinatesBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
- org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.Builder, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProtoOrBuilder>(
+ org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.Builder, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProtoOrBuilder>(
getCoordinates(),
getParentForChildren(),
isClean());
diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactDependencyProtoOrBuilder.java b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactDependencyProtoOrBuilder.java
index 7fa116a77ff..ee6d101957d 100644
--- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactDependencyProtoOrBuilder.java
+++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactDependencyProtoOrBuilder.java
@@ -39,17 +39,17 @@ public interface IdeaKotlinProjectArtifactDependencyProtoOrBuilder extends
org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto.Type getType();
/**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3;
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto coordinates = 3;
* @return Whether the coordinates field is set.
*/
boolean hasCoordinates();
/**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3;
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto coordinates = 3;
* @return The coordinates.
*/
- org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto getCoordinates();
+ org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto getCoordinates();
/**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3;
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto coordinates = 3;
*/
- org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProtoOrBuilder getCoordinatesOrBuilder();
+ org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProtoOrBuilder getCoordinatesOrBuilder();
}
diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinResolvedBinaryDependencyProto.java b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinResolvedBinaryDependencyProto.java
index 89e7364cbc0..8a7ab4b9e33 100644
--- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinResolvedBinaryDependencyProto.java
+++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinResolvedBinaryDependencyProto.java
@@ -17,7 +17,6 @@ private static final long serialVersionUID = 0L;
}
private IdeaKotlinResolvedBinaryDependencyProto() {
binaryType_ = "";
- binaryFile_ = "";
}
@java.lang.Override
@@ -144,50 +143,30 @@ private static final long serialVersionUID = 0L;
}
}
- public static final int BINARY_FILE_FIELD_NUMBER = 4;
- private volatile java.lang.Object binaryFile_;
+ public static final int CLASSPATH_FIELD_NUMBER = 4;
+ private org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto classpath_;
/**
- * optional string binary_file = 4;
- * @return Whether the binaryFile field is set.
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto classpath = 4;
+ * @return Whether the classpath field is set.
*/
@java.lang.Override
- public boolean hasBinaryFile() {
+ public boolean hasClasspath() {
return ((bitField0_ & 0x00000008) != 0);
}
/**
- * optional string binary_file = 4;
- * @return The binaryFile.
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto classpath = 4;
+ * @return The classpath.
*/
@java.lang.Override
- public java.lang.String getBinaryFile() {
- java.lang.Object ref = binaryFile_;
- if (ref instanceof java.lang.String) {
- return (java.lang.String) ref;
- } else {
- com.google.protobuf.ByteString bs =
- (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- binaryFile_ = s;
- return s;
- }
+ public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto getClasspath() {
+ return classpath_ == null ? org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto.getDefaultInstance() : classpath_;
}
/**
- * optional string binary_file = 4;
- * @return The bytes for binaryFile.
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto classpath = 4;
*/
@java.lang.Override
- public com.google.protobuf.ByteString
- getBinaryFileBytes() {
- java.lang.Object ref = binaryFile_;
- if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
- binaryFile_ = b;
- return b;
- } else {
- return (com.google.protobuf.ByteString) ref;
- }
+ public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProtoOrBuilder getClasspathOrBuilder() {
+ return classpath_ == null ? org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto.getDefaultInstance() : classpath_;
}
private byte memoizedIsInitialized = -1;
@@ -214,7 +193,7 @@ private static final long serialVersionUID = 0L;
com.google.protobuf.GeneratedMessageV3.writeString(output, 3, binaryType_);
}
if (((bitField0_ & 0x00000008) != 0)) {
- com.google.protobuf.GeneratedMessageV3.writeString(output, 4, binaryFile_);
+ output.writeMessage(4, getClasspath());
}
getUnknownFields().writeTo(output);
}
@@ -237,7 +216,8 @@ private static final long serialVersionUID = 0L;
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, binaryType_);
}
if (((bitField0_ & 0x00000008) != 0)) {
- size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, binaryFile_);
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(4, getClasspath());
}
size += getUnknownFields().getSerializedSize();
memoizedSize = size;
@@ -269,10 +249,10 @@ private static final long serialVersionUID = 0L;
if (!getBinaryType()
.equals(other.getBinaryType())) return false;
}
- if (hasBinaryFile() != other.hasBinaryFile()) return false;
- if (hasBinaryFile()) {
- if (!getBinaryFile()
- .equals(other.getBinaryFile())) return false;
+ if (hasClasspath() != other.hasClasspath()) return false;
+ if (hasClasspath()) {
+ if (!getClasspath()
+ .equals(other.getClasspath())) return false;
}
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
return true;
@@ -297,9 +277,9 @@ private static final long serialVersionUID = 0L;
hash = (37 * hash) + BINARY_TYPE_FIELD_NUMBER;
hash = (53 * hash) + getBinaryType().hashCode();
}
- if (hasBinaryFile()) {
- hash = (37 * hash) + BINARY_FILE_FIELD_NUMBER;
- hash = (53 * hash) + getBinaryFile().hashCode();
+ if (hasClasspath()) {
+ hash = (37 * hash) + CLASSPATH_FIELD_NUMBER;
+ hash = (53 * hash) + getClasspath().hashCode();
}
hash = (29 * hash) + getUnknownFields().hashCode();
memoizedHashCode = hash;
@@ -431,6 +411,7 @@ private static final long serialVersionUID = 0L;
.alwaysUseFieldBuilders) {
getExtrasFieldBuilder();
getCoordinatesFieldBuilder();
+ getClasspathFieldBuilder();
}
}
@java.lang.Override
@@ -450,7 +431,11 @@ private static final long serialVersionUID = 0L;
bitField0_ = (bitField0_ & ~0x00000002);
binaryType_ = "";
bitField0_ = (bitField0_ & ~0x00000004);
- binaryFile_ = "";
+ if (classpathBuilder_ == null) {
+ classpath_ = null;
+ } else {
+ classpathBuilder_.clear();
+ }
bitField0_ = (bitField0_ & ~0x00000008);
return this;
}
@@ -501,9 +486,13 @@ private static final long serialVersionUID = 0L;
}
result.binaryType_ = binaryType_;
if (((from_bitField0_ & 0x00000008) != 0)) {
+ if (classpathBuilder_ == null) {
+ result.classpath_ = classpath_;
+ } else {
+ result.classpath_ = classpathBuilder_.build();
+ }
to_bitField0_ |= 0x00000008;
}
- result.binaryFile_ = binaryFile_;
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@@ -564,10 +553,8 @@ private static final long serialVersionUID = 0L;
binaryType_ = other.binaryType_;
onChanged();
}
- if (other.hasBinaryFile()) {
- bitField0_ |= 0x00000008;
- binaryFile_ = other.binaryFile_;
- onChanged();
+ if (other.hasClasspath()) {
+ mergeClasspath(other.getClasspath());
}
this.mergeUnknownFields(other.getUnknownFields());
onChanged();
@@ -615,7 +602,9 @@ private static final long serialVersionUID = 0L;
break;
} // case 26
case 34: {
- binaryFile_ = input.readStringRequireUtf8();
+ input.readMessage(
+ getClasspathFieldBuilder().getBuilder(),
+ extensionRegistry);
bitField0_ |= 0x00000008;
break;
} // case 34
@@ -959,88 +948,125 @@ private static final long serialVersionUID = 0L;
return this;
}
- private java.lang.Object binaryFile_ = "";
+ private org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto classpath_;
+ private com.google.protobuf.SingleFieldBuilderV3<
+ org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto.Builder, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProtoOrBuilder> classpathBuilder_;
/**
- * optional string binary_file = 4;
- * @return Whether the binaryFile field is set.
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto classpath = 4;
+ * @return Whether the classpath field is set.
*/
- public boolean hasBinaryFile() {
+ public boolean hasClasspath() {
return ((bitField0_ & 0x00000008) != 0);
}
/**
- * optional string binary_file = 4;
- * @return The binaryFile.
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto classpath = 4;
+ * @return The classpath.
*/
- public java.lang.String getBinaryFile() {
- java.lang.Object ref = binaryFile_;
- if (!(ref instanceof java.lang.String)) {
- com.google.protobuf.ByteString bs =
- (com.google.protobuf.ByteString) ref;
- java.lang.String s = bs.toStringUtf8();
- binaryFile_ = s;
- return s;
+ public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto getClasspath() {
+ if (classpathBuilder_ == null) {
+ return classpath_ == null ? org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto.getDefaultInstance() : classpath_;
} else {
- return (java.lang.String) ref;
+ return classpathBuilder_.getMessage();
}
}
/**
- * optional string binary_file = 4;
- * @return The bytes for binaryFile.
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto classpath = 4;
*/
- public com.google.protobuf.ByteString
- getBinaryFileBytes() {
- java.lang.Object ref = binaryFile_;
- if (ref instanceof String) {
- com.google.protobuf.ByteString b =
- com.google.protobuf.ByteString.copyFromUtf8(
- (java.lang.String) ref);
- binaryFile_ = b;
- return b;
+ public Builder setClasspath(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto value) {
+ if (classpathBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ classpath_ = value;
+ onChanged();
} else {
- return (com.google.protobuf.ByteString) ref;
+ classpathBuilder_.setMessage(value);
}
- }
- /**
- * optional string binary_file = 4;
- * @param value The binaryFile to set.
- * @return This builder for chaining.
- */
- public Builder setBinaryFile(
- java.lang.String value) {
- if (value == null) {
- throw new NullPointerException();
- }
- bitField0_ |= 0x00000008;
- binaryFile_ = value;
- onChanged();
- return this;
- }
- /**
- * optional string binary_file = 4;
- * @return This builder for chaining.
- */
- public Builder clearBinaryFile() {
- bitField0_ = (bitField0_ & ~0x00000008);
- binaryFile_ = getDefaultInstance().getBinaryFile();
- onChanged();
- return this;
- }
- /**
- * optional string binary_file = 4;
- * @param value The bytes for binaryFile to set.
- * @return This builder for chaining.
- */
- public Builder setBinaryFileBytes(
- com.google.protobuf.ByteString value) {
- if (value == null) {
- throw new NullPointerException();
- }
- checkByteStringIsUtf8(value);
bitField0_ |= 0x00000008;
- binaryFile_ = value;
- onChanged();
return this;
}
+ /**
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto classpath = 4;
+ */
+ public Builder setClasspath(
+ org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto.Builder builderForValue) {
+ if (classpathBuilder_ == null) {
+ classpath_ = builderForValue.build();
+ onChanged();
+ } else {
+ classpathBuilder_.setMessage(builderForValue.build());
+ }
+ bitField0_ |= 0x00000008;
+ return this;
+ }
+ /**
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto classpath = 4;
+ */
+ public Builder mergeClasspath(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto value) {
+ if (classpathBuilder_ == null) {
+ if (((bitField0_ & 0x00000008) != 0) &&
+ classpath_ != null &&
+ classpath_ != org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto.getDefaultInstance()) {
+ classpath_ =
+ org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto.newBuilder(classpath_).mergeFrom(value).buildPartial();
+ } else {
+ classpath_ = value;
+ }
+ onChanged();
+ } else {
+ classpathBuilder_.mergeFrom(value);
+ }
+ bitField0_ |= 0x00000008;
+ return this;
+ }
+ /**
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto classpath = 4;
+ */
+ public Builder clearClasspath() {
+ if (classpathBuilder_ == null) {
+ classpath_ = null;
+ onChanged();
+ } else {
+ classpathBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000008);
+ return this;
+ }
+ /**
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto classpath = 4;
+ */
+ public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto.Builder getClasspathBuilder() {
+ bitField0_ |= 0x00000008;
+ onChanged();
+ return getClasspathFieldBuilder().getBuilder();
+ }
+ /**
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto classpath = 4;
+ */
+ public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProtoOrBuilder getClasspathOrBuilder() {
+ if (classpathBuilder_ != null) {
+ return classpathBuilder_.getMessageOrBuilder();
+ } else {
+ return classpath_ == null ?
+ org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto.getDefaultInstance() : classpath_;
+ }
+ }
+ /**
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto classpath = 4;
+ */
+ private com.google.protobuf.SingleFieldBuilderV3<
+ org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto.Builder, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProtoOrBuilder>
+ getClasspathFieldBuilder() {
+ if (classpathBuilder_ == null) {
+ classpathBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+ org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto.Builder, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProtoOrBuilder>(
+ getClasspath(),
+ getParentForChildren(),
+ isClean());
+ classpath_ = null;
+ }
+ return classpathBuilder_;
+ }
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinResolvedBinaryDependencyProtoOrBuilder.java b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinResolvedBinaryDependencyProtoOrBuilder.java
index 6f1e8f00d24..afe2e688a93 100644
--- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinResolvedBinaryDependencyProtoOrBuilder.java
+++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinResolvedBinaryDependencyProtoOrBuilder.java
@@ -55,19 +55,17 @@ public interface IdeaKotlinResolvedBinaryDependencyProtoOrBuilder extends
getBinaryTypeBytes();
/**
- * optional string binary_file = 4;
- * @return Whether the binaryFile field is set.
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto classpath = 4;
+ * @return Whether the classpath field is set.
*/
- boolean hasBinaryFile();
+ boolean hasClasspath();
/**
- * optional string binary_file = 4;
- * @return The binaryFile.
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto classpath = 4;
+ * @return The classpath.
*/
- java.lang.String getBinaryFile();
+ org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto getClasspath();
/**
- * optional string binary_file = 4;
- * @return The bytes for binaryFile.
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto classpath = 4;
*/
- com.google.protobuf.ByteString
- getBinaryFileBytes();
+ org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProtoOrBuilder getClasspathOrBuilder();
}
diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/ProtoTcs.java b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/ProtoTcs.java
index 0b5263c6e7c..52413b5e9ea 100644
--- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/ProtoTcs.java
+++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/ProtoTcs.java
@@ -34,6 +34,11 @@ public final class ProtoTcs {
static final
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinResolvedBinaryDependencyProto_fieldAccessorTable;
+ static final com.google.protobuf.Descriptors.Descriptor
+ internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinClasspathProto_descriptor;
+ static final
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinClasspathProto_fieldAccessorTable;
static final com.google.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactDependencyProto_descriptor;
static final
@@ -54,11 +59,6 @@ public final class ProtoTcs {
static final
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinSourceCoordinatesProto_fieldAccessorTable;
- static final com.google.protobuf.Descriptors.Descriptor
- internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactCoordinatesProto_descriptor;
- static final
- com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
- internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactCoordinatesProto_fieldAccessorTable;
public static com.google.protobuf.Descriptors.FileDescriptor
getDescriptor() {
@@ -102,46 +102,43 @@ public final class ProtoTcs {
"es\030\002 \001(\0132V.org.jetbrains.kotlin.gradle.i" +
"dea.proto.generated.tcs.IdeaKotlinBinary" +
"CoordinatesProtoH\001\210\001\001\022\022\n\005cause\030\003 \001(\tH\002\210\001" +
- "\001B\t\n\007_extrasB\016\n\014_coordinatesB\010\n\006_cause\"\342" +
- "\002\n\'IdeaKotlinResolvedBinaryDependencyPro" +
+ "\001B\t\n\007_extrasB\016\n\014_coordinatesB\010\n\006_cause\"\256" +
+ "\003\n\'IdeaKotlinResolvedBinaryDependencyPro" +
"to\022V\n\006extras\030\001 \001(\0132A.org.jetbrains.kotli" +
"n.gradle.idea.proto.generated.IdeaExtras" +
"ProtoH\000\210\001\001\022p\n\013coordinates\030\002 \001(\0132V.org.je" +
"tbrains.kotlin.gradle.idea.proto.generat" +
"ed.tcs.IdeaKotlinBinaryCoordinatesProtoH" +
- "\001\210\001\001\022\030\n\013binary_type\030\003 \001(\tH\002\210\001\001\022\030\n\013binary" +
- "_file\030\004 \001(\tH\003\210\001\001B\t\n\007_extrasB\016\n\014_coordina" +
- "tesB\016\n\014_binary_typeB\016\n\014_binary_file\"\220\003\n(" +
- "IdeaKotlinProjectArtifactDependencyProto" +
- "\022V\n\006extras\030\001 \001(\0132A.org.jetbrains.kotlin." +
- "gradle.idea.proto.generated.IdeaExtrasPr" +
- "otoH\000\210\001\001\022m\n\004type\030\002 \001(\0162Z.org.jetbrains.k" +
- "otlin.gradle.idea.proto.generated.tcs.Id" +
- "eaKotlinSourceDependencyProto.TypeH\001\210\001\001\022" +
- "y\n\013coordinates\030\003 \001(\0132_.org.jetbrains.kot" +
- "lin.gradle.idea.proto.generated.tcs.Idea" +
- "KotlinProjectArtifactCoordinatesProtoH\002\210" +
- "\001\001B\t\n\007_extrasB\007\n\005_typeB\016\n\014_coordinates\"\237" +
- "\001\n!IdeaKotlinProjectCoordinatesProto\022\025\n\010" +
- "build_id\030\001 \001(\tH\000\210\001\001\022\031\n\014project_path\030\002 \001(" +
- "\tH\001\210\001\001\022\031\n\014project_name\030\003 \001(\tH\002\210\001\001B\013\n\t_bu" +
- "ild_idB\017\n\r_project_pathB\017\n\r_project_name" +
- "\"\264\001\n IdeaKotlinBinaryCoordinatesProto\022\022\n" +
- "\005group\030\001 \001(\tH\000\210\001\001\022\023\n\006module\030\002 \001(\tH\001\210\001\001\022\024" +
- "\n\007version\030\003 \001(\tH\002\210\001\001\022\034\n\017source_set_name\030" +
- "\004 \001(\tH\003\210\001\001B\010\n\006_groupB\t\n\007_moduleB\n\n\010_vers" +
- "ionB\022\n\020_source_set_name\"\317\001\n IdeaKotlinSo" +
- "urceCoordinatesProto\022m\n\007project\030\001 \001(\0132W." +
- "org.jetbrains.kotlin.gradle.idea.proto.g" +
- "enerated.tcs.IdeaKotlinProjectCoordinate" +
- "sProtoH\000\210\001\001\022\034\n\017source_set_name\030\002 \001(\tH\001\210\001" +
- "\001B\n\n\010_projectB\022\n\020_source_set_name\"\324\001\n)Id" +
- "eaKotlinProjectArtifactCoordinatesProto\022" +
- "m\n\007project\030\001 \001(\0132W.org.jetbrains.kotlin." +
- "gradle.idea.proto.generated.tcs.IdeaKotl" +
- "inProjectCoordinatesProtoH\000\210\001\001\022\032\n\rartifa" +
- "ct_file\030\002 \001(\tH\001\210\001\001B\n\n\010_projectB\020\n\016_artif" +
- "act_fileB\002P\001b\006proto3"
+ "\001\210\001\001\022\030\n\013binary_type\030\003 \001(\tH\002\210\001\001\022f\n\tclassp" +
+ "ath\030\004 \001(\0132N.org.jetbrains.kotlin.gradle." +
+ "idea.proto.generated.tcs.IdeaKotlinClass" +
+ "pathProtoH\003\210\001\001B\t\n\007_extrasB\016\n\014_coordinate" +
+ "sB\016\n\014_binary_typeB\014\n\n_classpath\")\n\030IdeaK" +
+ "otlinClasspathProto\022\r\n\005files\030\001 \003(\t\"\210\003\n(I" +
+ "deaKotlinProjectArtifactDependencyProto\022" +
+ "V\n\006extras\030\001 \001(\0132A.org.jetbrains.kotlin.g" +
+ "radle.idea.proto.generated.IdeaExtrasPro" +
+ "toH\000\210\001\001\022m\n\004type\030\002 \001(\0162Z.org.jetbrains.ko" +
+ "tlin.gradle.idea.proto.generated.tcs.Ide" +
+ "aKotlinSourceDependencyProto.TypeH\001\210\001\001\022q" +
+ "\n\013coordinates\030\003 \001(\0132W.org.jetbrains.kotl" +
+ "in.gradle.idea.proto.generated.tcs.IdeaK" +
+ "otlinProjectCoordinatesProtoH\002\210\001\001B\t\n\007_ex" +
+ "trasB\007\n\005_typeB\016\n\014_coordinates\"\237\001\n!IdeaKo" +
+ "tlinProjectCoordinatesProto\022\025\n\010build_id\030" +
+ "\001 \001(\tH\000\210\001\001\022\031\n\014project_path\030\002 \001(\tH\001\210\001\001\022\031\n" +
+ "\014project_name\030\003 \001(\tH\002\210\001\001B\013\n\t_build_idB\017\n" +
+ "\r_project_pathB\017\n\r_project_name\"\264\001\n Idea" +
+ "KotlinBinaryCoordinatesProto\022\022\n\005group\030\001 " +
+ "\001(\tH\000\210\001\001\022\023\n\006module\030\002 \001(\tH\001\210\001\001\022\024\n\007version" +
+ "\030\003 \001(\tH\002\210\001\001\022\034\n\017source_set_name\030\004 \001(\tH\003\210\001" +
+ "\001B\010\n\006_groupB\t\n\007_moduleB\n\n\010_versionB\022\n\020_s" +
+ "ource_set_name\"\317\001\n IdeaKotlinSourceCoord" +
+ "inatesProto\022m\n\007project\030\001 \001(\0132W.org.jetbr" +
+ "ains.kotlin.gradle.idea.proto.generated." +
+ "tcs.IdeaKotlinProjectCoordinatesProtoH\000\210" +
+ "\001\001\022\034\n\017source_set_name\030\002 \001(\tH\001\210\001\001B\n\n\010_pro" +
+ "jectB\022\n\020_source_set_nameB\002P\001b\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
@@ -171,37 +168,37 @@ public final class ProtoTcs {
internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinResolvedBinaryDependencyProto_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinResolvedBinaryDependencyProto_descriptor,
- new java.lang.String[] { "Extras", "Coordinates", "BinaryType", "BinaryFile", "Extras", "Coordinates", "BinaryType", "BinaryFile", });
- internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactDependencyProto_descriptor =
+ new java.lang.String[] { "Extras", "Coordinates", "BinaryType", "Classpath", "Extras", "Coordinates", "BinaryType", "Classpath", });
+ internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinClasspathProto_descriptor =
getDescriptor().getMessageTypes().get(4);
+ internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinClasspathProto_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+ internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinClasspathProto_descriptor,
+ new java.lang.String[] { "Files", });
+ internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactDependencyProto_descriptor =
+ getDescriptor().getMessageTypes().get(5);
internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactDependencyProto_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactDependencyProto_descriptor,
new java.lang.String[] { "Extras", "Type", "Coordinates", "Extras", "Type", "Coordinates", });
internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectCoordinatesProto_descriptor =
- getDescriptor().getMessageTypes().get(5);
+ getDescriptor().getMessageTypes().get(6);
internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectCoordinatesProto_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectCoordinatesProto_descriptor,
new java.lang.String[] { "BuildId", "ProjectPath", "ProjectName", "BuildId", "ProjectPath", "ProjectName", });
internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinBinaryCoordinatesProto_descriptor =
- getDescriptor().getMessageTypes().get(6);
+ getDescriptor().getMessageTypes().get(7);
internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinBinaryCoordinatesProto_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinBinaryCoordinatesProto_descriptor,
new java.lang.String[] { "Group", "Module", "Version", "SourceSetName", "Group", "Module", "Version", "SourceSetName", });
internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinSourceCoordinatesProto_descriptor =
- getDescriptor().getMessageTypes().get(7);
+ getDescriptor().getMessageTypes().get(8);
internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinSourceCoordinatesProto_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinSourceCoordinatesProto_descriptor,
new java.lang.String[] { "Project", "SourceSetName", "Project", "SourceSetName", });
- internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactCoordinatesProto_descriptor =
- getDescriptor().getMessageTypes().get(8);
- internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactCoordinatesProto_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactCoordinatesProto_descriptor,
- new java.lang.String[] { "Project", "ArtifactFile", "Project", "ArtifactFile", });
org.jetbrains.kotlin.gradle.idea.proto.generated.ProtoExtras.getDescriptor();
}
diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinClasspathProtoKt.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinClasspathProtoKt.kt
new file mode 100644
index 00000000000..c22f982d888
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinClasspathProtoKt.kt
@@ -0,0 +1,99 @@
+//Generated by the protocol buffer compiler. DO NOT EDIT!
+// source: proto_tcs.proto
+
+package org.jetbrains.kotlin.gradle.idea.proto.generated.tcs;
+
+@kotlin.jvm.JvmName("-initializeideaKotlinClasspathProto")
+inline fun ideaKotlinClasspathProto(block: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProtoKt.Dsl.() -> kotlin.Unit): org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto =
+ org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProtoKt.Dsl._create(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto.newBuilder()).apply { block() }._build()
+object IdeaKotlinClasspathProtoKt {
+ @kotlin.OptIn(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)
+ @com.google.protobuf.kotlin.ProtoDslMarker
+ class Dsl private constructor(
+ private val _builder: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto.Builder
+ ) {
+ companion object {
+ @kotlin.jvm.JvmSynthetic
+ @kotlin.PublishedApi
+ internal fun _create(builder: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto.Builder): Dsl = Dsl(builder)
+ }
+
+ @kotlin.jvm.JvmSynthetic
+ @kotlin.PublishedApi
+ internal fun _build(): org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto = _builder.build()
+
+ /**
+ * An uninstantiable, behaviorless type to represent the field in
+ * generics.
+ */
+ @kotlin.OptIn(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)
+ class FilesProxy private constructor() : com.google.protobuf.kotlin.DslProxy()
+ /**
+ * repeated string files = 1;
+ * @return A list containing the files.
+ */
+ val files: com.google.protobuf.kotlin.DslList
+ @kotlin.jvm.JvmSynthetic
+ get() = com.google.protobuf.kotlin.DslList(
+ _builder.getFilesList()
+ )
+ /**
+ * repeated string files = 1;
+ * @param value The files to add.
+ */
+ @kotlin.jvm.JvmSynthetic
+ @kotlin.jvm.JvmName("addFiles")
+ fun com.google.protobuf.kotlin.DslList.add(value: kotlin.String) {
+ _builder.addFiles(value)
+ }
+ /**
+ * repeated string files = 1;
+ * @param value The files to add.
+ */
+ @kotlin.jvm.JvmSynthetic
+ @kotlin.jvm.JvmName("plusAssignFiles")
+ @Suppress("NOTHING_TO_INLINE")
+ inline operator fun com.google.protobuf.kotlin.DslList.plusAssign(value: kotlin.String) {
+ add(value)
+ }
+ /**
+ * repeated string files = 1;
+ * @param values The files to add.
+ */
+ @kotlin.jvm.JvmSynthetic
+ @kotlin.jvm.JvmName("addAllFiles")
+ fun com.google.protobuf.kotlin.DslList.addAll(values: kotlin.collections.Iterable) {
+ _builder.addAllFiles(values)
+ }
+ /**
+ * repeated string files = 1;
+ * @param values The files to add.
+ */
+ @kotlin.jvm.JvmSynthetic
+ @kotlin.jvm.JvmName("plusAssignAllFiles")
+ @Suppress("NOTHING_TO_INLINE")
+ inline operator fun com.google.protobuf.kotlin.DslList.plusAssign(values: kotlin.collections.Iterable) {
+ addAll(values)
+ }
+ /**
+ * repeated string files = 1;
+ * @param index The index to set the value at.
+ * @param value The files to set.
+ */
+ @kotlin.jvm.JvmSynthetic
+ @kotlin.jvm.JvmName("setFiles")
+ operator fun com.google.protobuf.kotlin.DslList.set(index: kotlin.Int, value: kotlin.String) {
+ _builder.setFiles(index, value)
+ }/**
+ * repeated string files = 1;
+ */
+ @kotlin.jvm.JvmSynthetic
+ @kotlin.jvm.JvmName("clearFiles")
+ fun com.google.protobuf.kotlin.DslList.clear() {
+ _builder.clearFiles()
+ }}
+}
+@kotlin.jvm.JvmSynthetic
+inline fun org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto.copy(block: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProtoKt.Dsl.() -> kotlin.Unit): org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto =
+ org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProtoKt.Dsl._create(this.toBuilder()).apply { block() }._build()
+
diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactCoordinatesProtoKt.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactCoordinatesProtoKt.kt
deleted file mode 100644
index d0e45598652..00000000000
--- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactCoordinatesProtoKt.kt
+++ /dev/null
@@ -1,82 +0,0 @@
-//Generated by the protocol buffer compiler. DO NOT EDIT!
-// source: proto_tcs.proto
-
-package org.jetbrains.kotlin.gradle.idea.proto.generated.tcs;
-
-@kotlin.jvm.JvmName("-initializeideaKotlinProjectArtifactCoordinatesProto")
-inline fun ideaKotlinProjectArtifactCoordinatesProto(block: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProtoKt.Dsl.() -> kotlin.Unit): org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto =
- org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProtoKt.Dsl._create(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.newBuilder()).apply { block() }._build()
-object IdeaKotlinProjectArtifactCoordinatesProtoKt {
- @kotlin.OptIn(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)
- @com.google.protobuf.kotlin.ProtoDslMarker
- class Dsl private constructor(
- private val _builder: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.Builder
- ) {
- companion object {
- @kotlin.jvm.JvmSynthetic
- @kotlin.PublishedApi
- internal fun _create(builder: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.Builder): Dsl = Dsl(builder)
- }
-
- @kotlin.jvm.JvmSynthetic
- @kotlin.PublishedApi
- internal fun _build(): org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto = _builder.build()
-
- /**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1;
- */
- var project: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto
- @JvmName("getProject")
- get() = _builder.getProject()
- @JvmName("setProject")
- set(value) {
- _builder.setProject(value)
- }
- /**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1;
- */
- fun clearProject() {
- _builder.clearProject()
- }
- /**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1;
- * @return Whether the project field is set.
- */
- fun hasProject(): kotlin.Boolean {
- return _builder.hasProject()
- }
- val IdeaKotlinProjectArtifactCoordinatesProtoKt.Dsl.projectOrNull: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto?
- get() = _builder.projectOrNull
-
- /**
- * optional string artifact_file = 2;
- */
- var artifactFile: kotlin.String
- @JvmName("getArtifactFile")
- get() = _builder.getArtifactFile()
- @JvmName("setArtifactFile")
- set(value) {
- _builder.setArtifactFile(value)
- }
- /**
- * optional string artifact_file = 2;
- */
- fun clearArtifactFile() {
- _builder.clearArtifactFile()
- }
- /**
- * optional string artifact_file = 2;
- * @return Whether the artifactFile field is set.
- */
- fun hasArtifactFile(): kotlin.Boolean {
- return _builder.hasArtifactFile()
- }
- }
-}
-@kotlin.jvm.JvmSynthetic
-inline fun org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.copy(block: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProtoKt.Dsl.() -> kotlin.Unit): org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto =
- org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProtoKt.Dsl._create(this.toBuilder()).apply { block() }._build()
-
-val org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProtoOrBuilder.projectOrNull: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto?
- get() = if (hasProject()) getProject() else null
-
diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactDependencyProtoKt.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactDependencyProtoKt.kt
index 226013562be..81bb4f9cc81 100644
--- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactDependencyProtoKt.kt
+++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactDependencyProtoKt.kt
@@ -73,9 +73,9 @@ object IdeaKotlinProjectArtifactDependencyProtoKt {
}
/**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3;
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto coordinates = 3;
*/
- var coordinates: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto
+ var coordinates: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto
@JvmName("getCoordinates")
get() = _builder.getCoordinates()
@JvmName("setCoordinates")
@@ -83,19 +83,19 @@ object IdeaKotlinProjectArtifactDependencyProtoKt {
_builder.setCoordinates(value)
}
/**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3;
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto coordinates = 3;
*/
fun clearCoordinates() {
_builder.clearCoordinates()
}
/**
- * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3;
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto coordinates = 3;
* @return Whether the coordinates field is set.
*/
fun hasCoordinates(): kotlin.Boolean {
return _builder.hasCoordinates()
}
- val IdeaKotlinProjectArtifactDependencyProtoKt.Dsl.coordinatesOrNull: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto?
+ val IdeaKotlinProjectArtifactDependencyProtoKt.Dsl.coordinatesOrNull: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto?
get() = _builder.coordinatesOrNull
}
}
@@ -106,6 +106,6 @@ inline fun org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjec
val org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProtoOrBuilder.extrasOrNull: org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto?
get() = if (hasExtras()) getExtras() else null
-val org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProtoOrBuilder.coordinatesOrNull: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto?
+val org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProtoOrBuilder.coordinatesOrNull: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto?
get() = if (hasCoordinates()) getCoordinates() else null
diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinResolvedBinaryDependencyProtoKt.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinResolvedBinaryDependencyProtoKt.kt
index a3643f508a8..e98ef49e35c 100644
--- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinResolvedBinaryDependencyProtoKt.kt
+++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinResolvedBinaryDependencyProtoKt.kt
@@ -99,28 +99,30 @@ object IdeaKotlinResolvedBinaryDependencyProtoKt {
}
/**
- * optional string binary_file = 4;
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto classpath = 4;
*/
- var binaryFile: kotlin.String
- @JvmName("getBinaryFile")
- get() = _builder.getBinaryFile()
- @JvmName("setBinaryFile")
+ var classpath: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto
+ @JvmName("getClasspath")
+ get() = _builder.getClasspath()
+ @JvmName("setClasspath")
set(value) {
- _builder.setBinaryFile(value)
+ _builder.setClasspath(value)
}
/**
- * optional string binary_file = 4;
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto classpath = 4;
*/
- fun clearBinaryFile() {
- _builder.clearBinaryFile()
+ fun clearClasspath() {
+ _builder.clearClasspath()
}
/**
- * optional string binary_file = 4;
- * @return Whether the binaryFile field is set.
+ * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto classpath = 4;
+ * @return Whether the classpath field is set.
*/
- fun hasBinaryFile(): kotlin.Boolean {
- return _builder.hasBinaryFile()
+ fun hasClasspath(): kotlin.Boolean {
+ return _builder.hasClasspath()
}
+ val IdeaKotlinResolvedBinaryDependencyProtoKt.Dsl.classpathOrNull: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto?
+ get() = _builder.classpathOrNull
}
}
@kotlin.jvm.JvmSynthetic
@@ -133,3 +135,6 @@ val org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinResolvedBinar
val org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinResolvedBinaryDependencyProtoOrBuilder.coordinatesOrNull: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinBinaryCoordinatesProto?
get() = if (hasCoordinates()) getCoordinates() else null
+val org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinResolvedBinaryDependencyProtoOrBuilder.classpathOrNull: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto?
+ get() = if (hasClasspath()) getClasspath() else null
+
diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinClasspath.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinClasspath.kt
new file mode 100644
index 00000000000..eae5f155248
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinClasspath.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle.idea.proto.tcs
+
+import com.google.protobuf.InvalidProtocolBufferException
+import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinClasspathProto
+import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ideaKotlinClasspathProto
+import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinExtrasSerializer
+import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext
+import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinClasspath
+import java.io.File
+
+internal fun IdeaKotlinClasspath.toProto(): IdeaKotlinClasspathProto? {
+ if (isEmpty()) return null
+ return ideaKotlinClasspathProto {
+ forEach { file -> files.add(file.absolutePath) }
+ }
+}
+
+internal fun IdeaKotlinClasspathProto.toIdeaKotlinClasspath(): IdeaKotlinClasspath =
+ IdeaKotlinClasspath(filesList.map(::File))
+
+
+fun IdeaKotlinClasspath.toByteArray(): ByteArray = toProto()?.toByteArray() ?: byteArrayOf()
+
+fun IdeaKotlinClasspath(data: ByteArray): IdeaKotlinClasspath? {
+ return try {
+ if (data.isEmpty()) return IdeaKotlinClasspath()
+ IdeaKotlinClasspathProto.parseFrom(data).toIdeaKotlinClasspath()
+ } catch (exception: InvalidProtocolBufferException) {
+ return null
+ }
+}
+
+object IdeaKotlinClasspathSerializer : IdeaKotlinExtrasSerializer {
+ override fun serialize(context: IdeaKotlinSerializationContext, value: IdeaKotlinClasspath): ByteArray {
+ return value.toByteArray()
+ }
+
+ override fun deserialize(context: IdeaKotlinSerializationContext, data: ByteArray): IdeaKotlinClasspath? {
+ return try {
+ if (data.isEmpty()) return IdeaKotlinClasspath()
+ IdeaKotlinClasspathProto.parseFrom(data).toIdeaKotlinClasspath()
+ } catch (exception: InvalidProtocolBufferException) {
+ context.logger.error("Failed to deserialize ${IdeaKotlinClasspath::class.java.simpleName}", exception)
+ return null
+ }
+ }
+}
diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinProjectArtifactCoordinates.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinProjectArtifactCoordinates.kt
deleted file mode 100644
index 73951516d1a..00000000000
--- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinProjectArtifactCoordinates.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.gradle.idea.proto.tcs
-
-import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto
-import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ideaKotlinProjectArtifactCoordinatesProto
-import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinProjectArtifactCoordinates
-import java.io.File
-
-internal fun IdeaKotlinProjectArtifactCoordinatesProto(
- coordinates: IdeaKotlinProjectArtifactCoordinates
-): IdeaKotlinProjectArtifactCoordinatesProto {
- return ideaKotlinProjectArtifactCoordinatesProto {
- this.project = IdeaKotlinProjectCoordinatesProto(coordinates.project)
- this.artifactFile = coordinates.artifactFile.path
- }
-}
-
-internal fun IdeaKotlinProjectArtifactCoordinates(proto: IdeaKotlinProjectArtifactCoordinatesProto): IdeaKotlinProjectArtifactCoordinates {
- return IdeaKotlinProjectArtifactCoordinates(
- project = IdeaKotlinProjectCoordinates(proto.project),
- artifactFile = File(proto.artifactFile)
- )
-}
diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinProjectArtifactDependency.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinProjectArtifactDependency.kt
index 103327c47fc..2180b2c1a3f 100644
--- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinProjectArtifactDependency.kt
+++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinProjectArtifactDependency.kt
@@ -19,7 +19,7 @@ internal fun IdeaKotlinSerializationContext.IdeaKotlinProjectArtifactDependencyP
return ideaKotlinProjectArtifactDependencyProto {
this.extras = IdeaExtrasProto(dependency.extras)
this.type = dependency.type.toProto()
- this.coordinates = IdeaKotlinProjectArtifactCoordinatesProto(dependency.coordinates)
+ this.coordinates = IdeaKotlinProjectCoordinatesProto(dependency.coordinates)
}
}
@@ -29,6 +29,6 @@ internal fun IdeaKotlinSerializationContext.IdeaKotlinProjectArtifactDependency(
return IdeaKotlinProjectArtifactDependency(
extras = Extras(proto.extras).toMutableExtras(),
type = IdeaKotlinSourceDependencyType(proto.type),
- coordinates = IdeaKotlinProjectArtifactCoordinates(proto.coordinates),
+ coordinates = IdeaKotlinProjectCoordinates(proto.coordinates),
)
}
diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinResolvedBinaryDependency.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinResolvedBinaryDependency.kt
index 67d6ce0fbe8..eec014b3b3a 100644
--- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinResolvedBinaryDependency.kt
+++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinResolvedBinaryDependency.kt
@@ -10,9 +10,9 @@ import org.jetbrains.kotlin.gradle.idea.proto.IdeaExtrasProto
import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinResolvedBinaryDependencyProto
import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ideaKotlinResolvedBinaryDependencyProto
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext
+import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinClasspath
import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinResolvedBinaryDependency
import org.jetbrains.kotlin.tooling.core.toMutableExtras
-import java.io.File
internal fun IdeaKotlinSerializationContext.IdeaKotlinResolvedBinaryDependencyProto(
dependency: IdeaKotlinResolvedBinaryDependency
@@ -20,7 +20,7 @@ internal fun IdeaKotlinSerializationContext.IdeaKotlinResolvedBinaryDependencyPr
return ideaKotlinResolvedBinaryDependencyProto {
this.extras = IdeaExtrasProto(dependency.extras)
this.binaryType = dependency.binaryType
- this.binaryFile = dependency.binaryFile.path
+ dependency.classpath.toProto()?.let { this.classpath = it }
dependency.coordinates?.let { this.coordinates = IdeaKotlinBinaryCoordinatesProto(it) }
}
}
@@ -31,7 +31,7 @@ internal fun IdeaKotlinSerializationContext.IdeaKotlinResolvedBinaryDependency(
return IdeaKotlinResolvedBinaryDependency(
extras = Extras(proto.extras).toMutableExtras(),
binaryType = proto.binaryType,
- binaryFile = File(proto.binaryFile),
+ classpath = if(proto.hasClasspath()) proto.classpath.toIdeaKotlinClasspath() else IdeaKotlinClasspath(),
coordinates = if (proto.hasCoordinates()) IdeaKotlinBinaryCoordinates(proto.coordinates) else null
)
}
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/proto/proto_tcs.proto b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/proto/proto_tcs.proto
index e72f0b8e348..52337e4a5fb 100644
--- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/proto/proto_tcs.proto
+++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/proto/proto_tcs.proto
@@ -35,13 +35,17 @@ message IdeaKotlinResolvedBinaryDependencyProto {
optional IdeaExtrasProto extras = 1;
optional IdeaKotlinBinaryCoordinatesProto coordinates = 2;
optional string binary_type = 3;
- optional string binary_file = 4;
+ optional IdeaKotlinClasspathProto classpath = 4;
+}
+
+message IdeaKotlinClasspathProto {
+ repeated string files = 1;
}
message IdeaKotlinProjectArtifactDependencyProto {
optional IdeaExtrasProto extras = 1;
optional IdeaKotlinSourceDependencyProto.Type type = 2;
- optional IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3;
+ optional IdeaKotlinProjectCoordinatesProto coordinates = 3;
}
message IdeaKotlinProjectCoordinatesProto {
@@ -61,8 +65,3 @@ message IdeaKotlinSourceCoordinatesProto {
optional IdeaKotlinProjectCoordinatesProto project = 1;
optional string source_set_name = 2;
}
-
-message IdeaKotlinProjectArtifactCoordinatesProto {
- optional IdeaKotlinProjectCoordinatesProto project = 1;
- optional string artifact_file = 2;
-}
diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinClasspathSerializationTest.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinClasspathSerializationTest.kt
new file mode 100644
index 00000000000..b19e4e357b1
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinClasspathSerializationTest.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle.idea.proto.tcs
+
+import org.jetbrains.kotlin.gradle.idea.proto.AbstractSerializationTest
+import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinClasspath
+import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.TestIdeaKotlinInstances
+import kotlin.test.Test
+import kotlin.test.fail
+
+class IdeaKotlinClasspathSerializationTest : AbstractSerializationTest() {
+ override fun serialize(value: IdeaKotlinClasspath): ByteArray {
+ return value.toByteArray()
+ }
+
+ override fun deserialize(data: ByteArray): IdeaKotlinClasspath {
+ return IdeaKotlinClasspath(data) ?: fail("Failed to deserialize IdeaKotlinClasspath")
+ }
+
+ @Test
+ fun `test - simpleClasspath`() = testSerialization(TestIdeaKotlinInstances.simpleClasspath)
+
+ @Test
+ fun `test - emptyClasspath`() = testSerialization(TestIdeaKotlinInstances.emptyClasspath)
+}
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinDependencyBackwardsCompatibilityTest.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinDependencyBackwardsCompatibilityTest.kt
index 9ad6fa9e137..eae5be9decc 100644
--- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinDependencyBackwardsCompatibilityTest.kt
+++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinDependencyBackwardsCompatibilityTest.kt
@@ -7,10 +7,7 @@ package org.jetbrains.kotlin.gradle.idea.proto.tcs
import org.jetbrains.kotlin.gradle.idea.proto.classLoaderForBackwardsCompatibleClasses
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationLogger
-import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinProjectArtifactDependency
-import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinResolvedBinaryDependency
-import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceDependency
-import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinUnresolvedBinaryDependency
+import org.jetbrains.kotlin.gradle.idea.tcs.*
import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.TestIdeaKotlinDependencySerializer
import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.TestIdeaKotlinInstances
import org.jetbrains.kotlin.gradle.idea.testFixtures.utils.copy
@@ -42,7 +39,7 @@ class IdeaKotlinDependencyBackwardsCompatibilityTest {
assertEquals(dependency.coordinates, deserializedCopied.coordinates)
assertEquals(dependency.binaryType, deserializedCopied.binaryType)
- assertEquals(dependency.binaryFile, deserializedCopied.binaryFile)
+ assertEquals(dependency.classpath, deserializedCopied.classpath)
assertEquals(dependency.extras, deserializedCopied.extras)
}
@@ -69,6 +66,27 @@ class IdeaKotlinDependencyBackwardsCompatibilityTest {
assertEquals(dependency.coordinates, deserializedCopied.coordinates)
assertEquals(dependency.extras, deserializedCopied.extras)
}
+
+ @Test
+ fun `test - empty classpath`() {
+ val classpath = TestIdeaKotlinInstances.emptyClasspath
+ val binary = TestIdeaKotlinDependencySerializer().serialize(classpath)
+ val deserialized = deserializeIdeaKotlinDependencyWithBackwardsCompatibleClasses(binary)
+ val copied = deserialized.copy()
+
+ assertEquals(classpath.toSet(), copied.toSet())
+ }
+
+ @Test
+ fun `test - simple classpath`() {
+ val classpath = TestIdeaKotlinInstances.simpleClasspath
+ val binary = TestIdeaKotlinDependencySerializer().serialize(classpath)
+ val deserialized = deserializeIdeaKotlinDependencyWithBackwardsCompatibleClasses(binary)
+ val copied = deserialized.copy()
+
+ assertEquals(classpath.toSet(), copied.toSet())
+ }
+
}
private fun deserializeIdeaKotlinDependencyWithBackwardsCompatibleClasses(project: ByteArray): Any {
diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinDependencyForwardCompatibilityTest.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinDependencyForwardCompatibilityTest.kt
index d38eee42daa..1d764ec1c34 100644
--- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinDependencyForwardCompatibilityTest.kt
+++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinDependencyForwardCompatibilityTest.kt
@@ -34,7 +34,7 @@ class IdeaKotlinDependencyForwardCompatibilityTest {
assertEquals(TestIdeaKotlinInstances.simpleResolvedBinaryDependency.coordinates, deserialized.coordinates)
assertEquals(TestIdeaKotlinInstances.simpleResolvedBinaryDependency.binaryType, deserialized.binaryType)
- assertEquals(TestIdeaKotlinInstances.simpleResolvedBinaryDependency.binaryFile, deserialized.binaryFile)
+ assertEquals(TestIdeaKotlinInstances.simpleResolvedBinaryDependency.classpath, deserialized.classpath)
assertEquals(TestIdeaKotlinInstances.simpleResolvedBinaryDependency.extras, deserialized.extras)
}
diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinResolvedBinaryDependencySerializationTest.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinResolvedBinaryDependencySerializationTest.kt
index e13dfc148a1..be55aff57fc 100644
--- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinResolvedBinaryDependencySerializationTest.kt
+++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinResolvedBinaryDependencySerializationTest.kt
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.gradle.idea.proto.tcs
import org.jetbrains.kotlin.gradle.idea.proto.AbstractSerializationTest
import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinResolvedBinaryDependencyProto
+import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinClasspath
import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinResolvedBinaryDependency
import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.TestIdeaKotlinInstances
import org.jetbrains.kotlin.tooling.core.extrasKeyOf
@@ -26,7 +27,7 @@ class IdeaKotlinResolvedBinaryDependencySerializationTest : AbstractSerializatio
fun `sample 0`() = testSerialization(
IdeaKotlinResolvedBinaryDependency(
binaryType = "myBinaryType",
- binaryFile = File("myBinaryFile"),
+ classpath = IdeaKotlinClasspath(File("myBinaryFile")),
extras = mutableExtrasOf(extrasKeyOf() withValue "myStringExtras"),
coordinates = TestIdeaKotlinInstances.simpleBinaryCoordinates
)
@@ -36,7 +37,7 @@ class IdeaKotlinResolvedBinaryDependencySerializationTest : AbstractSerializatio
fun `sample 1`() = testSerialization(
IdeaKotlinResolvedBinaryDependency(
binaryType = "myBinaryType",
- binaryFile = File("myBinaryFile"),
+ classpath = IdeaKotlinClasspath(File("myBinaryFile")),
extras = mutableExtrasOf(),
coordinates = null
)
diff --git a/libraries/tools/kotlin-gradle-plugin-idea/api/kotlin-gradle-plugin-idea.api b/libraries/tools/kotlin-gradle-plugin-idea/api/kotlin-gradle-plugin-idea.api
index e9e7b45ffc4..c1318f71afb 100644
--- a/libraries/tools/kotlin-gradle-plugin-idea/api/kotlin-gradle-plugin-idea.api
+++ b/libraries/tools/kotlin-gradle-plugin-idea/api/kotlin-gradle-plugin-idea.api
@@ -318,29 +318,51 @@ public final class org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryCoordina
}
public abstract class org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryDependency : org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependency {
+ public static final field Companion Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryDependency$Companion;
+ public static final field KOTLIN_COMPILE_BINARY_TYPE Ljava/lang/String;
public abstract fun getCoordinates ()Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryCoordinates;
}
+public final class org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryDependency$Companion {
+}
+
public final class org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryDependencyKt {
- public static final fun isClasspathBinaryType (Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinResolvedBinaryDependency;)Z
- public static final fun isDocumentationBinaryType (Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinResolvedBinaryDependency;)Z
- public static final fun isSourcesBinaryType (Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinResolvedBinaryDependency;)Z
+ public static final fun isKotlinCompileBinaryType (Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinResolvedBinaryDependency;)Z
+}
+
+public final class org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinClasspath : java/io/Serializable, java/util/Set, kotlin/jvm/internal/markers/KMutableSet {
+ public synthetic fun (Ljava/util/Set;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+ public fun add (Ljava/io/File;)Z
+ public synthetic fun add (Ljava/lang/Object;)Z
+ public fun addAll (Ljava/util/Collection;)Z
+ public fun clear ()V
+ public fun contains (Ljava/io/File;)Z
+ public final fun contains (Ljava/lang/Object;)Z
+ public fun containsAll (Ljava/util/Collection;)Z
+ public fun equals (Ljava/lang/Object;)Z
+ public fun getSize ()I
+ public fun hashCode ()I
+ public fun isEmpty ()Z
+ public fun iterator ()Ljava/util/Iterator;
+ public fun remove (Ljava/io/File;)Z
+ public final fun remove (Ljava/lang/Object;)Z
+ public fun removeAll (Ljava/util/Collection;)Z
+ public fun retainAll (Ljava/util/Collection;)Z
+ public final fun size ()I
+ public fun toArray ()[Ljava/lang/Object;
+ public fun toArray ([Ljava/lang/Object;)[Ljava/lang/Object;
+}
+
+public final class org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinClasspathKt {
+ public static final fun IdeaKotlinClasspath ()Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinClasspath;
+ public static final fun IdeaKotlinClasspath (Ljava/lang/Iterable;)Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinClasspath;
+ public static final fun IdeaKotlinClasspath ([Ljava/io/File;)Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinClasspath;
}
public abstract interface class org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependency : java/io/Serializable, org/jetbrains/kotlin/tooling/core/HasMutableExtras {
- public static final field CLASSPATH_BINARY_TYPE Ljava/lang/String;
- public static final field Companion Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependency$Companion;
- public static final field DOCUMENTATION_BINARY_TYPE Ljava/lang/String;
- public static final field SOURCES_BINARY_TYPE Ljava/lang/String;
public abstract fun getCoordinates ()Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependencyCoordinates;
}
-public final class org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependency$Companion {
- public static final field CLASSPATH_BINARY_TYPE Ljava/lang/String;
- public static final field DOCUMENTATION_BINARY_TYPE Ljava/lang/String;
- public static final field SOURCES_BINARY_TYPE Ljava/lang/String;
-}
-
public abstract interface class org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependencyCoordinates : java/io/Serializable {
}
@@ -353,32 +375,18 @@ public abstract interface annotation class org/jetbrains/kotlin/gradle/idea/tcs/
public abstract interface annotation class org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinModel : java/lang/annotation/Annotation {
}
-public final class org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactCoordinates : org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependencyCoordinates {
- public static final field serialVersionUID J
- public fun (Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectCoordinates;Ljava/io/File;)V
- public final fun component1 ()Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectCoordinates;
- public final fun component2 ()Ljava/io/File;
- public final fun copy (Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectCoordinates;Ljava/io/File;)Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactCoordinates;
- public static synthetic fun copy$default (Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactCoordinates;Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectCoordinates;Ljava/io/File;ILjava/lang/Object;)Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactCoordinates;
- public fun equals (Ljava/lang/Object;)Z
- public final fun getArtifactFile ()Ljava/io/File;
- public final fun getProject ()Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectCoordinates;
- public fun hashCode ()I
- public fun toString ()Ljava/lang/String;
-}
-
public final class org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactDependency : org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependency {
public static final field serialVersionUID J
- public fun (Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinSourceDependency$Type;Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactCoordinates;Lorg/jetbrains/kotlin/tooling/core/MutableExtras;)V
- public synthetic fun (Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinSourceDependency$Type;Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactCoordinates;Lorg/jetbrains/kotlin/tooling/core/MutableExtras;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ public fun (Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinSourceDependency$Type;Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectCoordinates;Lorg/jetbrains/kotlin/tooling/core/MutableExtras;)V
+ public synthetic fun (Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinSourceDependency$Type;Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectCoordinates;Lorg/jetbrains/kotlin/tooling/core/MutableExtras;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun component1 ()Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinSourceDependency$Type;
- public final fun component2 ()Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactCoordinates;
+ public final fun component2 ()Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectCoordinates;
public final fun component3 ()Lorg/jetbrains/kotlin/tooling/core/MutableExtras;
- public final fun copy (Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinSourceDependency$Type;Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactCoordinates;Lorg/jetbrains/kotlin/tooling/core/MutableExtras;)Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactDependency;
- public static synthetic fun copy$default (Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactDependency;Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinSourceDependency$Type;Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactCoordinates;Lorg/jetbrains/kotlin/tooling/core/MutableExtras;ILjava/lang/Object;)Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactDependency;
+ public final fun copy (Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinSourceDependency$Type;Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectCoordinates;Lorg/jetbrains/kotlin/tooling/core/MutableExtras;)Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactDependency;
+ public static synthetic fun copy$default (Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactDependency;Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinSourceDependency$Type;Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectCoordinates;Lorg/jetbrains/kotlin/tooling/core/MutableExtras;ILjava/lang/Object;)Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactDependency;
public fun equals (Ljava/lang/Object;)Z
public synthetic fun getCoordinates ()Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependencyCoordinates;
- public fun getCoordinates ()Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactCoordinates;
+ public fun getCoordinates ()Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectCoordinates;
public synthetic fun getExtras ()Lorg/jetbrains/kotlin/tooling/core/Extras;
public fun getExtras ()Lorg/jetbrains/kotlin/tooling/core/MutableExtras;
public final fun getType ()Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinSourceDependency$Type;
@@ -387,7 +395,7 @@ public final class org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifac
public fun toString ()Ljava/lang/String;
}
-public final class org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectCoordinates : java/io/Serializable {
+public final class org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectCoordinates : java/io/Serializable, org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependencyCoordinates {
public static final field serialVersionUID J
public fun (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
public final fun component1 ()Ljava/lang/String;
@@ -405,17 +413,17 @@ public final class org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectCoordin
public final class org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinResolvedBinaryDependency : org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryDependency {
public static final field serialVersionUID J
- public fun (Ljava/lang/String;Ljava/io/File;Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryCoordinates;Lorg/jetbrains/kotlin/tooling/core/MutableExtras;)V
- public synthetic fun (Ljava/lang/String;Ljava/io/File;Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryCoordinates;Lorg/jetbrains/kotlin/tooling/core/MutableExtras;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ public fun (Ljava/lang/String;Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinClasspath;Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryCoordinates;Lorg/jetbrains/kotlin/tooling/core/MutableExtras;)V
+ public synthetic fun (Ljava/lang/String;Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinClasspath;Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryCoordinates;Lorg/jetbrains/kotlin/tooling/core/MutableExtras;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun component1 ()Ljava/lang/String;
- public final fun component2 ()Ljava/io/File;
+ public final fun component2 ()Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinClasspath;
public final fun component3 ()Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryCoordinates;
public final fun component4 ()Lorg/jetbrains/kotlin/tooling/core/MutableExtras;
- public final fun copy (Ljava/lang/String;Ljava/io/File;Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryCoordinates;Lorg/jetbrains/kotlin/tooling/core/MutableExtras;)Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinResolvedBinaryDependency;
- public static synthetic fun copy$default (Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinResolvedBinaryDependency;Ljava/lang/String;Ljava/io/File;Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryCoordinates;Lorg/jetbrains/kotlin/tooling/core/MutableExtras;ILjava/lang/Object;)Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinResolvedBinaryDependency;
+ public final fun copy (Ljava/lang/String;Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinClasspath;Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryCoordinates;Lorg/jetbrains/kotlin/tooling/core/MutableExtras;)Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinResolvedBinaryDependency;
+ public static synthetic fun copy$default (Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinResolvedBinaryDependency;Ljava/lang/String;Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinClasspath;Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryCoordinates;Lorg/jetbrains/kotlin/tooling/core/MutableExtras;ILjava/lang/Object;)Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinResolvedBinaryDependency;
public fun equals (Ljava/lang/Object;)Z
- public final fun getBinaryFile ()Ljava/io/File;
public final fun getBinaryType ()Ljava/lang/String;
+ public final fun getClasspath ()Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinClasspath;
public fun getCoordinates ()Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryCoordinates;
public synthetic fun getCoordinates ()Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependencyCoordinates;
public synthetic fun getExtras ()Lorg/jetbrains/kotlin/tooling/core/Extras;
@@ -541,3 +549,15 @@ public final class org/jetbrains/kotlin/gradle/idea/tcs/extras/PrimitiveExtrasKt
public static final fun setNativeStdlib (Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryDependency;Z)V
}
+public final class org/jetbrains/kotlin/gradle/idea/tcs/extras/ProjectArtifactClasspathExtrasKt {
+ public static final fun getArtifactsClasspath (Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactDependency;)Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinClasspath;
+ public static final fun getProjectArtifactsClasspathKey ()Lorg/jetbrains/kotlin/tooling/core/Extras$Key;
+}
+
+public final class org/jetbrains/kotlin/gradle/idea/tcs/extras/SourcesAndDocumentationExtrasKt {
+ public static final fun getDocumentationClasspath (Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryDependency;)Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinClasspath;
+ public static final fun getDocumentationClasspathKey ()Lorg/jetbrains/kotlin/tooling/core/Extras$Key;
+ public static final fun getSourcesClasspath (Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryDependency;)Lorg/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinClasspath;
+ public static final fun getSourcesClasspathKey ()Lorg/jetbrains/kotlin/tooling/core/Extras$Key;
+}
+
diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryDependency.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryDependency.kt
index 9c8c7523223..4d55bfa3f6c 100644
--- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryDependency.kt
+++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinBinaryDependency.kt
@@ -7,15 +7,18 @@ package org.jetbrains.kotlin.gradle.idea.tcs
import org.jetbrains.kotlin.tooling.core.MutableExtras
import org.jetbrains.kotlin.tooling.core.mutableExtrasOf
-import java.io.File
sealed class IdeaKotlinBinaryDependency : IdeaKotlinDependency {
abstract override val coordinates: IdeaKotlinBinaryCoordinates?
+
+ companion object {
+ const val KOTLIN_COMPILE_BINARY_TYPE = "KOTLIN_COMPILE"
+ }
}
data class IdeaKotlinResolvedBinaryDependency(
val binaryType: String,
- val binaryFile: File,
+ val classpath: IdeaKotlinClasspath,
override val coordinates: IdeaKotlinBinaryCoordinates?,
override val extras: MutableExtras = mutableExtrasOf()
) : IdeaKotlinBinaryDependency() {
@@ -34,11 +37,5 @@ data class IdeaKotlinUnresolvedBinaryDependency(
}
}
-val IdeaKotlinResolvedBinaryDependency.isClasspathBinaryType
- get() = this.binaryType == IdeaKotlinDependency.CLASSPATH_BINARY_TYPE
-
-val IdeaKotlinResolvedBinaryDependency.isSourcesBinaryType
- get() = this.binaryType == IdeaKotlinDependency.SOURCES_BINARY_TYPE
-
-val IdeaKotlinResolvedBinaryDependency.isDocumentationBinaryType
- get() = this.binaryType == IdeaKotlinDependency.DOCUMENTATION_BINARY_TYPE
+val IdeaKotlinResolvedBinaryDependency.isKotlinCompileBinaryType
+ get() = this.binaryType == IdeaKotlinBinaryDependency.KOTLIN_COMPILE_BINARY_TYPE
diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinClasspath.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinClasspath.kt
new file mode 100644
index 00000000000..5dbf66899d2
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinClasspath.kt
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle.idea.tcs
+
+import java.io.File
+import java.io.Serializable
+
+fun IdeaKotlinClasspath(files: Iterable): IdeaKotlinClasspath = IdeaKotlinClasspath.from(files)
+
+fun IdeaKotlinClasspath(vararg files: File): IdeaKotlinClasspath = IdeaKotlinClasspath.from(files.toList())
+
+fun IdeaKotlinClasspath(): IdeaKotlinClasspath = IdeaKotlinClasspath.empty()
+
+@IdeaKotlinModel
+class IdeaKotlinClasspath private constructor(private val files: MutableSet = mutableSetOf()) : MutableSet, Serializable {
+ override val size: Int
+ get() = files.size
+
+ override fun add(element: File): Boolean {
+ return files.add(normalise(element))
+ }
+
+ override fun addAll(elements: Collection): Boolean {
+ return files.addAll(elements.map(::normalise))
+ }
+
+ override fun clear() {
+ files.clear()
+ }
+
+ override fun contains(element: File): Boolean {
+ return files.contains(normalise(element))
+ }
+
+ override fun containsAll(elements: Collection): Boolean {
+ return files.containsAll(elements.map(::normalise).toSet())
+ }
+
+ override fun isEmpty(): Boolean {
+ return files.isEmpty()
+ }
+
+ override fun iterator(): MutableIterator {
+ return files.iterator()
+ }
+
+ override fun remove(element: File): Boolean {
+ return files.remove(normalise(element))
+ }
+
+ override fun removeAll(elements: Collection): Boolean {
+ return files.removeAll(elements.map(::normalise).toSet())
+ }
+
+ override fun retainAll(elements: Collection): Boolean {
+ return files.retainAll(elements.map(::normalise).toSet())
+ }
+
+ override fun equals(other: Any?): Boolean {
+ if (other !is IdeaKotlinClasspath) return false
+ return files == other.files
+ }
+
+ override fun hashCode(): Int {
+ return files.hashCode()
+ }
+
+ internal companion object {
+ private const val serialVersionUID = 0L
+
+ fun normalise(file: File): File {
+ return file.absoluteFile.normalize()
+ }
+
+ fun from(files: Iterable): IdeaKotlinClasspath {
+ return IdeaKotlinClasspath(files.map(::normalise).toMutableSet())
+ }
+
+ fun from(file: File): IdeaKotlinClasspath {
+ return IdeaKotlinClasspath(mutableSetOf(normalise(file)))
+ }
+
+ fun empty() = IdeaKotlinClasspath(mutableSetOf())
+ }
+}
diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependency.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependency.kt
index f5456c31ad7..ca03df0257d 100644
--- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependency.kt
+++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependency.kt
@@ -11,10 +11,4 @@ import java.io.Serializable
@IdeaKotlinModel
sealed interface IdeaKotlinDependency : Serializable, HasMutableExtras {
val coordinates: IdeaKotlinDependencyCoordinates?
-
- companion object {
- const val CLASSPATH_BINARY_TYPE = "org.jetbrains.kotlin.gradle.idea.tcs.IdeDependency.classpathBinaryType"
- const val SOURCES_BINARY_TYPE = "org.jetbrains.kotlin.gradle.idea.tcs.IdeDependency.sourcesBinaryType"
- const val DOCUMENTATION_BINARY_TYPE = "org.jetbrains.kotlin.gradle.idea.tcs.IdeDependency.documentationBinaryType"
- }
}
diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependencyCoordinates.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependencyCoordinates.kt
index 940f52761d9..6045aa63cd2 100644
--- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependencyCoordinates.kt
+++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinDependencyCoordinates.kt
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.gradle.idea.tcs
-import java.io.File
import java.io.Serializable
@IdeaKotlinModel
@@ -26,6 +25,21 @@ data class IdeaKotlinBinaryCoordinates(
}
}
+@IdeaKotlinModel
+data class IdeaKotlinProjectCoordinates(
+ val buildId: String,
+ val projectPath: String,
+ val projectName: String
+) : Serializable, IdeaKotlinDependencyCoordinates {
+ override fun toString(): String {
+ return "${buildId.takeIf { it != ":" }?.plus(":").orEmpty()}$projectPath"
+ }
+
+ internal companion object {
+ const val serialVersionUID = 0L
+ }
+}
+
data class IdeaKotlinSourceCoordinates(
val project: IdeaKotlinProjectCoordinates,
val sourceSetName: String
@@ -43,17 +57,3 @@ data class IdeaKotlinSourceCoordinates(
const val serialVersionUID = 0L
}
}
-
-data class IdeaKotlinProjectArtifactCoordinates(
- val project: IdeaKotlinProjectCoordinates,
- val artifactFile: File
-) : IdeaKotlinDependencyCoordinates {
-
- override fun toString(): String {
- return "$project${File.pathSeparator}$artifactFile"
- }
-
- internal companion object {
- const val serialVersionUID = 0L
- }
-}
diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactDependency.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactDependency.kt
index 4ad8da0d764..1824867c63e 100644
--- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactDependency.kt
+++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactDependency.kt
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.tooling.core.*
data class IdeaKotlinProjectArtifactDependency(
val type: IdeaKotlinSourceDependency.Type,
- override val coordinates: IdeaKotlinProjectArtifactCoordinates,
+ override val coordinates: IdeaKotlinProjectCoordinates,
override val extras: MutableExtras = mutableExtrasOf()
) : IdeaKotlinDependency {
@@ -22,7 +22,7 @@ data class IdeaKotlinProjectArtifactDependency(
type = type,
extras = extras.toMutableExtras(),
coordinates = IdeaKotlinSourceCoordinates(
- project = coordinates.project,
+ project = coordinates,
sourceSetName = sourceSetName
)
)
diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectCoordinates.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectCoordinates.kt
deleted file mode 100644
index 710eb4c308b..00000000000
--- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectCoordinates.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.gradle.idea.tcs
-
-import java.io.Serializable
-
-@IdeaKotlinModel
-data class IdeaKotlinProjectCoordinates(
- val buildId: String,
- val projectPath: String,
- val projectName: String
-) : Serializable {
- override fun toString(): String {
- return "${buildId.takeIf { it != ":" }?.plus(":").orEmpty()}$projectPath"
- }
-
- internal companion object {
- const val serialVersionUID = 0L
- }
-}
diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/extras/primitiveExtras.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/extras/primitiveExtras.kt
index 039d2f4dc11..1f99d98a94e 100644
--- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/extras/primitiveExtras.kt
+++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/extras/primitiveExtras.kt
@@ -40,4 +40,4 @@ val isCommonizedKey = extrasKeyOf("isCommonized")
/**
* Marks dependencies produced by the commonizer
*/
-var IdeaKotlinBinaryDependency.isCommonized by isCommonizedKey.readWriteProperty.notNull(false)
\ No newline at end of file
+var IdeaKotlinBinaryDependency.isCommonized by isCommonizedKey.readWriteProperty.notNull(false)
diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/extras/projectArtifactClasspathExtras.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/extras/projectArtifactClasspathExtras.kt
new file mode 100644
index 00000000000..6888fe5b154
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/extras/projectArtifactClasspathExtras.kt
@@ -0,0 +1,15 @@
+/*
+ * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle.idea.tcs.extras
+
+import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinClasspath
+import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinProjectArtifactDependency
+import org.jetbrains.kotlin.tooling.core.extrasKeyOf
+import org.jetbrains.kotlin.tooling.core.lazyProperty
+
+val projectArtifactsClasspathKey = extrasKeyOf("artifactsClasspath")
+
+val IdeaKotlinProjectArtifactDependency.artifactsClasspath by projectArtifactsClasspathKey.lazyProperty { IdeaKotlinClasspath() }
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/extras/sourcesAndDocumentationExtras.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/extras/sourcesAndDocumentationExtras.kt
new file mode 100644
index 00000000000..2e32890f8e6
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/extras/sourcesAndDocumentationExtras.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle.idea.tcs.extras
+
+import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinBinaryDependency
+import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinClasspath
+import org.jetbrains.kotlin.tooling.core.extrasKeyOf
+import org.jetbrains.kotlin.tooling.core.lazyProperty
+
+/* Sources (-sources.jar) */
+
+val sourcesClasspathKey = extrasKeyOf("sourcesClasspath")
+
+/**
+ * Contains all resolved -sources.jar artifacts associated with this dependency
+ */
+val IdeaKotlinBinaryDependency.sourcesClasspath by sourcesClasspathKey.lazyProperty { IdeaKotlinClasspath() }
+
+/* Documentation (-javadoc.jar) */
+
+val documentationClasspathKey = extrasKeyOf("documentationClasspath")
+
+/**
+ * Contains all resolved -javadoc.jar artifacts associated with this dependency
+ */
+val IdeaKotlinBinaryDependency.documentationClasspath by documentationClasspathKey.lazyProperty { IdeaKotlinClasspath() }
diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/test/tcs/IdeaKotlinClasspathTest.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/test/tcs/IdeaKotlinClasspathTest.kt
new file mode 100644
index 00000000000..cd283aeb7eb
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin-idea/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/test/tcs/IdeaKotlinClasspathTest.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle.idea.test.tcs
+
+import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinClasspath
+import java.io.File
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertNotEquals
+import kotlin.test.assertTrue
+
+class IdeaKotlinClasspathTest {
+
+ @Test
+ fun `test - equals`() {
+ val first = IdeaKotlinClasspath()
+ val second = IdeaKotlinClasspath()
+
+ assertEquals(first, second)
+
+ first.add(File("a"))
+ assertNotEquals(first, second)
+
+ second.add(File("a").absoluteFile)
+ assertEquals(first, second)
+
+ assertEquals(first, IdeaKotlinClasspath(File("a")))
+ }
+
+ @Test
+ fun `test - stores files absolute`() {
+ val classpath = IdeaKotlinClasspath()
+ classpath.add(File("test"))
+
+ assertNotEquals(classpath.toSet(), setOf(File("test")))
+ assertEquals(classpath.toSet(), setOf(File("test").absoluteFile))
+ }
+
+ @Test
+ fun `test - contains file - relative and absolute`() {
+ val classpath = IdeaKotlinClasspath()
+ classpath.add(File("test"))
+
+ assertTrue(File("test") in classpath)
+ assertTrue(File("test").absoluteFile in classpath)
+ }
+
+ @Test
+ fun `test - remove file - relative and absolute`() {
+ val classpath = IdeaKotlinClasspath()
+ classpath.add(File("test"))
+
+ assertTrue(classpath.isNotEmpty())
+ classpath.remove(File("test"))
+ assertTrue(classpath.isEmpty())
+
+ classpath.add(File("test"))
+ assertTrue(classpath.isNotEmpty())
+ classpath.remove(File("test").absoluteFile)
+ assertTrue(classpath.isEmpty())
+ }
+}
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/tcs/IdeaKotlinProjectArtifactDependencyMatcher.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/tcs/IdeaKotlinProjectArtifactDependencyMatcher.kt
index bcf65a35119..4a86b61a5af 100644
--- a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/tcs/IdeaKotlinProjectArtifactDependencyMatcher.kt
+++ b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/tcs/IdeaKotlinProjectArtifactDependencyMatcher.kt
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.gradle.idea.testFixtures.tcs
import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency
import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinProjectArtifactDependency
import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceDependency
+import org.jetbrains.kotlin.gradle.idea.tcs.extras.artifactsClasspath
import java.io.File
internal class IdeaKotlinProjectArtifactDependencyMatcher(
@@ -22,9 +23,9 @@ internal class IdeaKotlinProjectArtifactDependencyMatcher(
override fun matches(dependency: IdeaKotlinDependency): Boolean {
if (dependency !is IdeaKotlinProjectArtifactDependency) return false
return dependency.type == type &&
- dependency.coordinates.project.buildId == buildId &&
- dependency.coordinates.project.projectPath == projectPath &&
- artifactFilePath.matches(dependency.coordinates.artifactFile)
+ dependency.coordinates.buildId == buildId &&
+ dependency.coordinates.projectPath == projectPath &&
+ dependency.artifactsClasspath.any { artifactFilePath.matches(it) }
}
}
diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/tcs/TestIdeaKotlinInstances.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/tcs/TestIdeaKotlinInstances.kt
index d00c50d6fc9..069034b08e1 100644
--- a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/tcs/TestIdeaKotlinInstances.kt
+++ b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/tcs/TestIdeaKotlinInstances.kt
@@ -37,21 +37,19 @@ object TestIdeaKotlinInstances {
sourceSetName = "mySourceSetName"
)
-
- val simpleProjectArtifactCoordinates = IdeaKotlinProjectArtifactCoordinates(
- project = simpleProjectCoordinates,
- artifactFile = File("myArtifactFile.klib")
- )
-
val simpleUnresolvedBinaryDependency = IdeaKotlinUnresolvedBinaryDependency(
cause = "myCause",
coordinates = simpleBinaryCoordinates,
extras = extrasWithIntAndStrings.toMutableExtras()
)
+ val simpleClasspath = IdeaKotlinClasspath(setOf(File("myFirstFile.klib"), File("mySecondFile.jar").absoluteFile))
+
+ val emptyClasspath = IdeaKotlinClasspath()
+
val simpleResolvedBinaryDependency = IdeaKotlinResolvedBinaryDependency(
- binaryType = IdeaKotlinDependency.CLASSPATH_BINARY_TYPE,
- binaryFile = File("myBinaryFile.klib"),
+ binaryType = IdeaKotlinBinaryDependency.KOTLIN_COMPILE_BINARY_TYPE,
+ classpath = simpleClasspath,
coordinates = simpleBinaryCoordinates,
extras = extrasWithIntAndStrings.toMutableExtras()
)
@@ -63,8 +61,8 @@ object TestIdeaKotlinInstances {
)
val simpleProjectArtifactDependency = IdeaKotlinProjectArtifactDependency(
- coordinates = simpleProjectArtifactCoordinates,
+ coordinates = simpleProjectCoordinates,
type = IdeaKotlinSourceDependency.Type.Regular,
extras = extrasWithIntAndStrings.toMutableExtras()
)
-}
\ No newline at end of file
+}