diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmSourceDirectoryProto.java b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmContentRootProto.java similarity index 85% rename from libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmSourceDirectoryProto.java rename to libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmContentRootProto.java index 99882b2998f..afd02754181 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmSourceDirectoryProto.java +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmContentRootProto.java @@ -4,18 +4,18 @@ package org.jetbrains.kotlin.kpm.idea.proto; /** - * Protobuf type {@code org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto} + * Protobuf type {@code org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto} */ -final class IdeaKpmSourceDirectoryProto extends +final class IdeaKpmContentRootProto extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto) - IdeaKpmSourceDirectoryProtoOrBuilder { + // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto) + IdeaKpmContentRootProtoOrBuilder { private static final long serialVersionUID = 0L; - // Use IdeaKpmSourceDirectoryProto.newBuilder() to construct. - private IdeaKpmSourceDirectoryProto(com.google.protobuf.GeneratedMessageV3.Builder builder) { + // Use IdeaKpmContentRootProto.newBuilder() to construct. + private IdeaKpmContentRootProto(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private IdeaKpmSourceDirectoryProto() { + private IdeaKpmContentRootProto() { absolutePath_ = ""; type_ = ""; } @@ -24,7 +24,7 @@ private static final long serialVersionUID = 0L; @SuppressWarnings({"unused"}) protected java.lang.Object newInstance( UnusedPrivateParameter unused) { - return new IdeaKpmSourceDirectoryProto(); + return new IdeaKpmContentRootProto(); } @java.lang.Override @@ -32,7 +32,7 @@ private static final long serialVersionUID = 0L; getUnknownFields() { return this.unknownFields; } - private IdeaKpmSourceDirectoryProto( + private IdeaKpmContentRootProto( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -97,15 +97,15 @@ private static final long serialVersionUID = 0L; } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.jetbrains.kotlin.kpm.idea.proto.ProtoIdeaKpm.internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmSourceDirectoryProto_descriptor; + return org.jetbrains.kotlin.kpm.idea.proto.ProtoIdeaKpm.internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmContentRootProto_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.jetbrains.kotlin.kpm.idea.proto.ProtoIdeaKpm.internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmSourceDirectoryProto_fieldAccessorTable + return org.jetbrains.kotlin.kpm.idea.proto.ProtoIdeaKpm.internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmContentRootProto_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto.class, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto.Builder.class); + org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto.class, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto.Builder.class); } private int bitField0_; @@ -279,10 +279,10 @@ private static final long serialVersionUID = 0L; if (obj == this) { return true; } - if (!(obj instanceof org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto)) { + if (!(obj instanceof org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto)) { return super.equals(obj); } - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto other = (org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto) obj; + org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto other = (org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto) obj; if (hasExtras() != other.hasExtras()) return false; if (hasExtras()) { @@ -327,69 +327,69 @@ private static final long serialVersionUID = 0L; return hash; } - public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto parseFrom( + public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto parseFrom( + public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto 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.kpm.idea.proto.IdeaKpmSourceDirectoryProto parseFrom( + public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto parseFrom( + public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto 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.kpm.idea.proto.IdeaKpmSourceDirectoryProto parseFrom(byte[] data) + public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto parseFrom( + public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto parseFrom(java.io.InputStream input) + public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto parseFrom( + public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto 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.kpm.idea.proto.IdeaKpmSourceDirectoryProto parseDelimitedFrom(java.io.InputStream input) + public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto parseDelimitedFrom( + public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto 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.kpm.idea.proto.IdeaKpmSourceDirectoryProto parseFrom( + public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto parseFrom( + public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -402,7 +402,7 @@ private static final long serialVersionUID = 0L; public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto prototype) { + public static Builder newBuilder(org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -418,26 +418,26 @@ private static final long serialVersionUID = 0L; return builder; } /** - * Protobuf type {@code org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto} + * Protobuf type {@code org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto) - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProtoOrBuilder { + // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto) + org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProtoOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.jetbrains.kotlin.kpm.idea.proto.ProtoIdeaKpm.internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmSourceDirectoryProto_descriptor; + return org.jetbrains.kotlin.kpm.idea.proto.ProtoIdeaKpm.internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmContentRootProto_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.jetbrains.kotlin.kpm.idea.proto.ProtoIdeaKpm.internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmSourceDirectoryProto_fieldAccessorTable + return org.jetbrains.kotlin.kpm.idea.proto.ProtoIdeaKpm.internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmContentRootProto_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto.class, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto.Builder.class); + org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto.class, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto.Builder.class); } - // Construct using org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto.newBuilder() + // Construct using org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -472,17 +472,17 @@ private static final long serialVersionUID = 0L; @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.jetbrains.kotlin.kpm.idea.proto.ProtoIdeaKpm.internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmSourceDirectoryProto_descriptor; + return org.jetbrains.kotlin.kpm.idea.proto.ProtoIdeaKpm.internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmContentRootProto_descriptor; } @java.lang.Override - public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto getDefaultInstanceForType() { - return org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto.getDefaultInstance(); + public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto getDefaultInstanceForType() { + return org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto.getDefaultInstance(); } @java.lang.Override - public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto build() { - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto result = buildPartial(); + public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto build() { + org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -490,8 +490,8 @@ private static final long serialVersionUID = 0L; } @java.lang.Override - public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto buildPartial() { - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto result = new org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto(this); + public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto buildPartial() { + org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto result = new org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { @@ -549,16 +549,16 @@ private static final long serialVersionUID = 0L; } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto) { - return mergeFrom((org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto)other); + if (other instanceof org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto) { + return mergeFrom((org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto other) { - if (other == org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto.getDefaultInstance()) return this; + public Builder mergeFrom(org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto other) { + if (other == org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto.getDefaultInstance()) return this; if (other.hasExtras()) { mergeExtras(other.getExtras()); } @@ -587,11 +587,11 @@ private static final long serialVersionUID = 0L; com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto parsedMessage = null; + org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto) e.getUnfinishedMessage(); + parsedMessage = (org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -900,41 +900,41 @@ private static final long serialVersionUID = 0L; } - // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto) + // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto) } - // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto) - private static final org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto) + private static final org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto(); + DEFAULT_INSTANCE = new org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto(); } - public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto getDefaultInstance() { + public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public IdeaKpmSourceDirectoryProto parsePartialFrom( + public IdeaKpmContentRootProto parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new IdeaKpmSourceDirectoryProto(input, extensionRegistry); + return new IdeaKpmContentRootProto(input, extensionRegistry); } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto getDefaultInstanceForType() { + public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmSourceDirectoryProtoOrBuilder.java b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmContentRootProtoOrBuilder.java similarity index 93% rename from libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmSourceDirectoryProtoOrBuilder.java rename to libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmContentRootProtoOrBuilder.java index 7891e4ea87a..2409db30169 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmSourceDirectoryProtoOrBuilder.java +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmContentRootProtoOrBuilder.java @@ -3,8 +3,8 @@ package org.jetbrains.kotlin.kpm.idea.proto; -interface IdeaKpmSourceDirectoryProtoOrBuilder extends - // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto) +interface IdeaKpmContentRootProtoOrBuilder extends + // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto) com.google.protobuf.MessageOrBuilder { /** diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmFragmentProto.java b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmFragmentProto.java index df8a56996da..e64c032028f 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmFragmentProto.java +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmFragmentProto.java @@ -111,11 +111,11 @@ private static final long serialVersionUID = 0L; } case 50: { if (!((mutable_bitField0_ & 0x00000020) != 0)) { - sourceDirectories_ = new java.util.ArrayList(); + sourceDirectories_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000020; } sourceDirectories_.add( - input.readMessage(org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto.parser(), extensionRegistry)); + input.readMessage(org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto.parser(), extensionRegistry)); break; } default: { @@ -319,41 +319,41 @@ private static final long serialVersionUID = 0L; } public static final int SOURCE_DIRECTORIES_FIELD_NUMBER = 6; - private java.util.List sourceDirectories_; + private java.util.List sourceDirectories_; /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ @java.lang.Override - public java.util.List getSourceDirectoriesList() { + public java.util.List getSourceDirectoriesList() { return sourceDirectories_; } /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ @java.lang.Override - public java.util.List + public java.util.List getSourceDirectoriesOrBuilderList() { return sourceDirectories_; } /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ @java.lang.Override public int getSourceDirectoriesCount() { return sourceDirectories_.size(); } /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ @java.lang.Override - public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto getSourceDirectories(int index) { + public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto getSourceDirectories(int index) { return sourceDirectories_.get(index); } /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ @java.lang.Override - public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProtoOrBuilder getSourceDirectoriesOrBuilder( + public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProtoOrBuilder getSourceDirectoriesOrBuilder( int index) { return sourceDirectories_.get(index); } @@ -1754,22 +1754,22 @@ private static final long serialVersionUID = 0L; return dependenciesBuilder_; } - private java.util.List sourceDirectories_ = + private java.util.List sourceDirectories_ = java.util.Collections.emptyList(); private void ensureSourceDirectoriesIsMutable() { if (!((bitField0_ & 0x00000020) != 0)) { - sourceDirectories_ = new java.util.ArrayList(sourceDirectories_); + sourceDirectories_ = new java.util.ArrayList(sourceDirectories_); bitField0_ |= 0x00000020; } } private com.google.protobuf.RepeatedFieldBuilderV3< - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto.Builder, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProtoOrBuilder> sourceDirectoriesBuilder_; + org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto.Builder, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProtoOrBuilder> sourceDirectoriesBuilder_; /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ - public java.util.List getSourceDirectoriesList() { + public java.util.List getSourceDirectoriesList() { if (sourceDirectoriesBuilder_ == null) { return java.util.Collections.unmodifiableList(sourceDirectories_); } else { @@ -1777,7 +1777,7 @@ private static final long serialVersionUID = 0L; } } /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ public int getSourceDirectoriesCount() { if (sourceDirectoriesBuilder_ == null) { @@ -1787,9 +1787,9 @@ private static final long serialVersionUID = 0L; } } /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ - public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto getSourceDirectories(int index) { + public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto getSourceDirectories(int index) { if (sourceDirectoriesBuilder_ == null) { return sourceDirectories_.get(index); } else { @@ -1797,10 +1797,10 @@ private static final long serialVersionUID = 0L; } } /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ public Builder setSourceDirectories( - int index, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto value) { + int index, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto value) { if (sourceDirectoriesBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1814,10 +1814,10 @@ private static final long serialVersionUID = 0L; return this; } /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ public Builder setSourceDirectories( - int index, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto.Builder builderForValue) { + int index, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto.Builder builderForValue) { if (sourceDirectoriesBuilder_ == null) { ensureSourceDirectoriesIsMutable(); sourceDirectories_.set(index, builderForValue.build()); @@ -1828,9 +1828,9 @@ private static final long serialVersionUID = 0L; return this; } /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ - public Builder addSourceDirectories(org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto value) { + public Builder addSourceDirectories(org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto value) { if (sourceDirectoriesBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1844,10 +1844,10 @@ private static final long serialVersionUID = 0L; return this; } /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ public Builder addSourceDirectories( - int index, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto value) { + int index, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto value) { if (sourceDirectoriesBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1861,10 +1861,10 @@ private static final long serialVersionUID = 0L; return this; } /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ public Builder addSourceDirectories( - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto.Builder builderForValue) { + org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto.Builder builderForValue) { if (sourceDirectoriesBuilder_ == null) { ensureSourceDirectoriesIsMutable(); sourceDirectories_.add(builderForValue.build()); @@ -1875,10 +1875,10 @@ private static final long serialVersionUID = 0L; return this; } /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ public Builder addSourceDirectories( - int index, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto.Builder builderForValue) { + int index, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto.Builder builderForValue) { if (sourceDirectoriesBuilder_ == null) { ensureSourceDirectoriesIsMutable(); sourceDirectories_.add(index, builderForValue.build()); @@ -1889,10 +1889,10 @@ private static final long serialVersionUID = 0L; return this; } /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ public Builder addAllSourceDirectories( - java.lang.Iterable values) { + java.lang.Iterable values) { if (sourceDirectoriesBuilder_ == null) { ensureSourceDirectoriesIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll( @@ -1904,7 +1904,7 @@ private static final long serialVersionUID = 0L; return this; } /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ public Builder clearSourceDirectories() { if (sourceDirectoriesBuilder_ == null) { @@ -1917,7 +1917,7 @@ private static final long serialVersionUID = 0L; return this; } /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ public Builder removeSourceDirectories(int index) { if (sourceDirectoriesBuilder_ == null) { @@ -1930,16 +1930,16 @@ private static final long serialVersionUID = 0L; return this; } /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ - public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto.Builder getSourceDirectoriesBuilder( + public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto.Builder getSourceDirectoriesBuilder( int index) { return getSourceDirectoriesFieldBuilder().getBuilder(index); } /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ - public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProtoOrBuilder getSourceDirectoriesOrBuilder( + public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProtoOrBuilder getSourceDirectoriesOrBuilder( int index) { if (sourceDirectoriesBuilder_ == null) { return sourceDirectories_.get(index); } else { @@ -1947,9 +1947,9 @@ private static final long serialVersionUID = 0L; } } /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ - public java.util.List + public java.util.List getSourceDirectoriesOrBuilderList() { if (sourceDirectoriesBuilder_ != null) { return sourceDirectoriesBuilder_.getMessageOrBuilderList(); @@ -1958,33 +1958,33 @@ private static final long serialVersionUID = 0L; } } /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ - public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto.Builder addSourceDirectoriesBuilder() { + public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto.Builder addSourceDirectoriesBuilder() { return getSourceDirectoriesFieldBuilder().addBuilder( - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto.getDefaultInstance()); + org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto.getDefaultInstance()); } /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ - public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto.Builder addSourceDirectoriesBuilder( + public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto.Builder addSourceDirectoriesBuilder( int index) { return getSourceDirectoriesFieldBuilder().addBuilder( - index, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto.getDefaultInstance()); + index, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto.getDefaultInstance()); } /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ - public java.util.List + public java.util.List getSourceDirectoriesBuilderList() { return getSourceDirectoriesFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilderV3< - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto.Builder, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProtoOrBuilder> + org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto.Builder, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProtoOrBuilder> getSourceDirectoriesFieldBuilder() { if (sourceDirectoriesBuilder_ == null) { sourceDirectoriesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto.Builder, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProtoOrBuilder>( + org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto.Builder, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProtoOrBuilder>( sourceDirectories_, ((bitField0_ & 0x00000020) != 0), getParentForChildren(), diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmFragmentProtoOrBuilder.java b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmFragmentProtoOrBuilder.java index ef45d870f80..5058fa135ef 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmFragmentProtoOrBuilder.java +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmFragmentProtoOrBuilder.java @@ -101,26 +101,26 @@ interface IdeaKpmFragmentProtoOrBuilder extends int index); /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ - java.util.List + java.util.List getSourceDirectoriesList(); /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto getSourceDirectories(int index); + org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto getSourceDirectories(int index); /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ int getSourceDirectoriesCount(); /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ - java.util.List + java.util.List getSourceDirectoriesOrBuilderList(); /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProtoOrBuilder getSourceDirectoriesOrBuilder( + org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProtoOrBuilder getSourceDirectoriesOrBuilder( int index); } diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmResourceDirectoryProto.java b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmResourceDirectoryProto.java deleted file mode 100644 index a4bf9f6c0f7..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmResourceDirectoryProto.java +++ /dev/null @@ -1,780 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: proto_idea_kpm.proto - -package org.jetbrains.kotlin.kpm.idea.proto; - -/** - * Protobuf type {@code org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto} - */ -final class IdeaKpmResourceDirectoryProto extends - com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto) - IdeaKpmResourceDirectoryProtoOrBuilder { -private static final long serialVersionUID = 0L; - // Use IdeaKpmResourceDirectoryProto.newBuilder() to construct. - private IdeaKpmResourceDirectoryProto(com.google.protobuf.GeneratedMessageV3.Builder builder) { - super(builder); - } - private IdeaKpmResourceDirectoryProto() { - absolutePath_ = ""; - } - - @java.lang.Override - @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( - UnusedPrivateParameter unused) { - return new IdeaKpmResourceDirectoryProto(); - } - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private IdeaKpmResourceDirectoryProto( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto.Builder subBuilder = null; - if (((bitField0_ & 0x00000001) != 0)) { - subBuilder = extras_.toBuilder(); - } - extras_ = input.readMessage(org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(extras_); - extras_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000001; - break; - } - case 18: { - java.lang.String s = input.readStringRequireUtf8(); - bitField0_ |= 0x00000002; - absolutePath_ = s; - break; - } - default: { - if (!parseUnknownField( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.kotlin.kpm.idea.proto.ProtoIdeaKpm.internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmResourceDirectoryProto_descriptor; - } - - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.kotlin.kpm.idea.proto.ProtoIdeaKpm.internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmResourceDirectoryProto_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto.class, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto.Builder.class); - } - - private int bitField0_; - public static final int EXTRAS_FIELD_NUMBER = 1; - private org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto extras_; - /** - * optional .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto extras = 1; - * @return Whether the extras field is set. - */ - @java.lang.Override - public boolean hasExtras() { - return ((bitField0_ & 0x00000001) != 0); - } - /** - * optional .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto extras = 1; - * @return The extras. - */ - @java.lang.Override - public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto getExtras() { - return extras_ == null ? org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto.getDefaultInstance() : extras_; - } - /** - * optional .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto extras = 1; - */ - @java.lang.Override - public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProtoOrBuilder getExtrasOrBuilder() { - return extras_ == null ? org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto.getDefaultInstance() : extras_; - } - - public static final int ABSOLUTE_PATH_FIELD_NUMBER = 2; - private volatile java.lang.Object absolutePath_; - /** - * optional string absolute_path = 2; - * @return Whether the absolutePath field is set. - */ - @java.lang.Override - public boolean hasAbsolutePath() { - return ((bitField0_ & 0x00000002) != 0); - } - /** - * optional string absolute_path = 2; - * @return The absolutePath. - */ - @java.lang.Override - public java.lang.String getAbsolutePath() { - java.lang.Object ref = absolutePath_; - 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(); - absolutePath_ = s; - return s; - } - } - /** - * optional string absolute_path = 2; - * @return The bytes for absolutePath. - */ - @java.lang.Override - public com.google.protobuf.ByteString - getAbsolutePathBytes() { - java.lang.Object ref = absolutePath_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - absolutePath_ = 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, getExtras()); - } - if (((bitField0_ & 0x00000002) != 0)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 2, absolutePath_); - } - unknownFields.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, getExtras()); - } - if (((bitField0_ & 0x00000002) != 0)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, absolutePath_); - } - size += unknownFields.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.kpm.idea.proto.IdeaKpmResourceDirectoryProto)) { - return super.equals(obj); - } - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto other = (org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto) obj; - - if (hasExtras() != other.hasExtras()) return false; - if (hasExtras()) { - if (!getExtras() - .equals(other.getExtras())) return false; - } - if (hasAbsolutePath() != other.hasAbsolutePath()) return false; - if (hasAbsolutePath()) { - if (!getAbsolutePath() - .equals(other.getAbsolutePath())) return false; - } - if (!unknownFields.equals(other.unknownFields)) return false; - return true; - } - - @java.lang.Override - public int hashCode() { - if (memoizedHashCode != 0) { - return memoizedHashCode; - } - int hash = 41; - hash = (19 * hash) + getDescriptor().hashCode(); - if (hasExtras()) { - hash = (37 * hash) + EXTRAS_FIELD_NUMBER; - hash = (53 * hash) + getExtras().hashCode(); - } - if (hasAbsolutePath()) { - hash = (37 * hash) + ABSOLUTE_PATH_FIELD_NUMBER; - hash = (53 * hash) + getAbsolutePath().hashCode(); - } - hash = (29 * hash) + unknownFields.hashCode(); - memoizedHashCode = hash; - return hash; - } - - public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto parseFrom( - java.nio.ByteBuffer data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto 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.kpm.idea.proto.IdeaKpmResourceDirectoryProto parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto 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.kpm.idea.proto.IdeaKpmResourceDirectoryProto parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto parseFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); - } - public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto 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.kpm.idea.proto.IdeaKpmResourceDirectoryProto parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input); - } - public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto 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.kpm.idea.proto.IdeaKpmResourceDirectoryProto parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); - } - public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto 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.kpm.idea.proto.IdeaKpmResourceDirectoryProto 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.kpm.idea.proto.IdeaKpmResourceDirectoryProto} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto) - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProtoOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.kotlin.kpm.idea.proto.ProtoIdeaKpm.internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmResourceDirectoryProto_descriptor; - } - - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.kotlin.kpm.idea.proto.ProtoIdeaKpm.internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmResourceDirectoryProto_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto.class, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto.Builder.class); - } - - // Construct using org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3 - .alwaysUseFieldBuilders) { - getExtrasFieldBuilder(); - } - } - @java.lang.Override - public Builder clear() { - super.clear(); - if (extrasBuilder_ == null) { - extras_ = null; - } else { - extrasBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000001); - absolutePath_ = ""; - bitField0_ = (bitField0_ & ~0x00000002); - return this; - } - - @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return org.jetbrains.kotlin.kpm.idea.proto.ProtoIdeaKpm.internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmResourceDirectoryProto_descriptor; - } - - @java.lang.Override - public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto getDefaultInstanceForType() { - return org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto.getDefaultInstance(); - } - - @java.lang.Override - public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto build() { - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - @java.lang.Override - public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto buildPartial() { - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto result = new org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) != 0)) { - if (extrasBuilder_ == null) { - result.extras_ = extras_; - } else { - result.extras_ = extrasBuilder_.build(); - } - to_bitField0_ |= 0x00000001; - } - if (((from_bitField0_ & 0x00000002) != 0)) { - to_bitField0_ |= 0x00000002; - } - result.absolutePath_ = absolutePath_; - 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.kpm.idea.proto.IdeaKpmResourceDirectoryProto) { - return mergeFrom((org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto other) { - if (other == org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto.getDefaultInstance()) return this; - if (other.hasExtras()) { - mergeExtras(other.getExtras()); - } - if (other.hasAbsolutePath()) { - bitField0_ |= 0x00000002; - absolutePath_ = other.absolutePath_; - onChanged(); - } - this.mergeUnknownFields(other.unknownFields); - 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 { - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto) e.getUnfinishedMessage(); - throw e.unwrapIOException(); - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - private org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto extras_; - private com.google.protobuf.SingleFieldBuilderV3< - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto.Builder, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProtoOrBuilder> extrasBuilder_; - /** - * optional .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto extras = 1; - * @return Whether the extras field is set. - */ - public boolean hasExtras() { - return ((bitField0_ & 0x00000001) != 0); - } - /** - * optional .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto extras = 1; - * @return The extras. - */ - public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto getExtras() { - if (extrasBuilder_ == null) { - return extras_ == null ? org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto.getDefaultInstance() : extras_; - } else { - return extrasBuilder_.getMessage(); - } - } - /** - * optional .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto extras = 1; - */ - public Builder setExtras(org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto value) { - if (extrasBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - extras_ = value; - onChanged(); - } else { - extrasBuilder_.setMessage(value); - } - bitField0_ |= 0x00000001; - return this; - } - /** - * optional .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto extras = 1; - */ - public Builder setExtras( - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto.Builder builderForValue) { - if (extrasBuilder_ == null) { - extras_ = builderForValue.build(); - onChanged(); - } else { - extrasBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000001; - return this; - } - /** - * optional .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto extras = 1; - */ - public Builder mergeExtras(org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto value) { - if (extrasBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0) && - extras_ != null && - extras_ != org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto.getDefaultInstance()) { - extras_ = - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto.newBuilder(extras_).mergeFrom(value).buildPartial(); - } else { - extras_ = value; - } - onChanged(); - } else { - extrasBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000001; - return this; - } - /** - * optional .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto extras = 1; - */ - public Builder clearExtras() { - if (extrasBuilder_ == null) { - extras_ = null; - onChanged(); - } else { - extrasBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000001); - return this; - } - /** - * optional .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto extras = 1; - */ - public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto.Builder getExtrasBuilder() { - bitField0_ |= 0x00000001; - onChanged(); - return getExtrasFieldBuilder().getBuilder(); - } - /** - * optional .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto extras = 1; - */ - public org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProtoOrBuilder getExtrasOrBuilder() { - if (extrasBuilder_ != null) { - return extrasBuilder_.getMessageOrBuilder(); - } else { - return extras_ == null ? - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto.getDefaultInstance() : extras_; - } - } - /** - * optional .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto extras = 1; - */ - private com.google.protobuf.SingleFieldBuilderV3< - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto.Builder, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProtoOrBuilder> - getExtrasFieldBuilder() { - if (extrasBuilder_ == null) { - extrasBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto.Builder, org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProtoOrBuilder>( - getExtras(), - getParentForChildren(), - isClean()); - extras_ = null; - } - return extrasBuilder_; - } - - private java.lang.Object absolutePath_ = ""; - /** - * optional string absolute_path = 2; - * @return Whether the absolutePath field is set. - */ - public boolean hasAbsolutePath() { - return ((bitField0_ & 0x00000002) != 0); - } - /** - * optional string absolute_path = 2; - * @return The absolutePath. - */ - public java.lang.String getAbsolutePath() { - java.lang.Object ref = absolutePath_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - absolutePath_ = s; - return s; - } else { - return (java.lang.String) ref; - } - } - /** - * optional string absolute_path = 2; - * @return The bytes for absolutePath. - */ - public com.google.protobuf.ByteString - getAbsolutePathBytes() { - java.lang.Object ref = absolutePath_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - absolutePath_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * optional string absolute_path = 2; - * @param value The absolutePath to set. - * @return This builder for chaining. - */ - public Builder setAbsolutePath( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; - absolutePath_ = value; - onChanged(); - return this; - } - /** - * optional string absolute_path = 2; - * @return This builder for chaining. - */ - public Builder clearAbsolutePath() { - bitField0_ = (bitField0_ & ~0x00000002); - absolutePath_ = getDefaultInstance().getAbsolutePath(); - onChanged(); - return this; - } - /** - * optional string absolute_path = 2; - * @param value The bytes for absolutePath to set. - * @return This builder for chaining. - */ - public Builder setAbsolutePathBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - bitField0_ |= 0x00000002; - absolutePath_ = 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.kpm.idea.proto.IdeaKpmResourceDirectoryProto) - } - - // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto) - private static final org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto DEFAULT_INSTANCE; - static { - DEFAULT_INSTANCE = new org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto(); - } - - public static org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto getDefaultInstance() { - return DEFAULT_INSTANCE; - } - - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override - public IdeaKpmResourceDirectoryProto parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new IdeaKpmResourceDirectoryProto(input, extensionRegistry); - } - }; - - 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.kpm.idea.proto.IdeaKpmResourceDirectoryProto getDefaultInstanceForType() { - return DEFAULT_INSTANCE; - } - -} - diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmResourceDirectoryProtoOrBuilder.java b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmResourceDirectoryProtoOrBuilder.java deleted file mode 100644 index b9d24f5650d..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmResourceDirectoryProtoOrBuilder.java +++ /dev/null @@ -1,41 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: proto_idea_kpm.proto - -package org.jetbrains.kotlin.kpm.idea.proto; - -interface IdeaKpmResourceDirectoryProtoOrBuilder extends - // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto) - com.google.protobuf.MessageOrBuilder { - - /** - * optional .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto extras = 1; - * @return Whether the extras field is set. - */ - boolean hasExtras(); - /** - * optional .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto extras = 1; - * @return The extras. - */ - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto getExtras(); - /** - * optional .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto extras = 1; - */ - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProtoOrBuilder getExtrasOrBuilder(); - - /** - * optional string absolute_path = 2; - * @return Whether the absolutePath field is set. - */ - boolean hasAbsolutePath(); - /** - * optional string absolute_path = 2; - * @return The absolutePath. - */ - java.lang.String getAbsolutePath(); - /** - * optional string absolute_path = 2; - * @return The bytes for absolutePath. - */ - com.google.protobuf.ByteString - getAbsolutePathBytes(); -} diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/ProtoIdeaKpm.java b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/ProtoIdeaKpm.java index d34fac66504..7b99f34967c 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/ProtoIdeaKpm.java +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/kpm/idea/proto/ProtoIdeaKpm.java @@ -25,15 +25,10 @@ final class ProtoIdeaKpm { com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmLanguageSettingsProto_fieldAccessorTable; static final com.google.protobuf.Descriptors.Descriptor - internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmSourceDirectoryProto_descriptor; + internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmContentRootProto_descriptor; static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmSourceDirectoryProto_fieldAccessorTable; - static final com.google.protobuf.Descriptors.Descriptor - internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmResourceDirectoryProto_descriptor; - static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmResourceDirectoryProto_fieldAccessorTable; + internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmContentRootProto_fieldAccessorTable; static final com.google.protobuf.Descriptors.Descriptor internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmBinaryCoordinatesProto_descriptor; static final @@ -160,157 +155,153 @@ final class ProtoIdeaKpm { "ments\030\006 \003(\t\022!\n\031compiler_plugin_classpath" + "\030\007 \003(\t\022\032\n\022free_compiler_args\030\010 \003(\tB\023\n\021_l" + "anguage_versionB\016\n\014_api_versionB\026\n\024_is_p" + - "rogressive_mode\"\300\001\n\033IdeaKpmSourceDirecto" + - "ryProto\022L\n\006extras\030\001 \001(\01327.org.jetbrains." + - "kotlin.kpm.idea.proto.IdeaKpmExtrasProto" + - "H\000\210\001\001\022\032\n\rabsolute_path\030\002 \001(\tH\001\210\001\001\022\021\n\004typ" + - "e\030\003 \001(\tH\002\210\001\001B\t\n\007_extrasB\020\n\016_absolute_pat" + - "hB\007\n\005_type\"\246\001\n\035IdeaKpmResourceDirectoryP" + - "roto\022L\n\006extras\030\001 \001(\01327.org.jetbrains.kot" + - "lin.kpm.idea.proto.IdeaKpmExtrasProtoH\000\210" + - "\001\001\022\032\n\rabsolute_path\030\002 \001(\tH\001\210\001\001B\t\n\007_extra" + - "sB\020\n\016_absolute_path\"\363\001\n\035IdeaKpmBinaryCoo" + - "rdinatesProto\022\022\n\005group\030\001 \001(\tH\000\210\001\001\022\023\n\006mod" + - "ule\030\002 \001(\tH\001\210\001\001\022\024\n\007version\030\003 \001(\tH\002\210\001\001\022\037\n\022" + - "kotlin_module_name\030\004 \001(\tH\003\210\001\001\022!\n\024kotlin_" + - "fragment_name\030\005 \001(\tH\004\210\001\001B\010\n\006_groupB\t\n\007_m" + - "oduleB\n\n\010_versionB\025\n\023_kotlin_module_name" + - "B\027\n\025_kotlin_fragment_name\"\263\001\n\037IdeaKpmFra" + - "gmentCoordinatesProto\022W\n\006module\030\001 \001(\0132B." + - "org.jetbrains.kotlin.kpm.idea.proto.Idea" + - "KpmModuleCoordinatesProtoH\000\210\001\001\022\032\n\rfragme" + - "nt_name\030\002 \001(\tH\001\210\001\001B\t\n\007_moduleB\020\n\016_fragme" + - "nt_name\"\360\002\n\026IdeaKpmDependencyProto\022s\n\034un" + - "resolved_binary_dependency\030\001 \001(\0132K.org.j" + - "etbrains.kotlin.kpm.idea.proto.IdeaKpmUn" + - "resolvedBinaryDependencyProtoH\000\022o\n\032resol" + - "ved_binary_dependency\030\002 \001(\0132I.org.jetbra" + - "ins.kotlin.kpm.idea.proto.IdeaKpmResolve" + - "dBinaryDependencyProtoH\000\022b\n\023fragment_dep" + - "endency\030\003 \001(\0132C.org.jetbrains.kotlin.kpm" + - ".idea.proto.IdeaKpmFragmentDependencyPro" + - "toH\000B\014\n\ndependency\"\215\002\n&IdeaKpmUnresolved" + - "BinaryDependencyProto\022L\n\006extras\030\001 \001(\01327." + - "org.jetbrains.kotlin.kpm.idea.proto.Idea" + - "KpmExtrasProtoH\000\210\001\001\022\\\n\013coordinates\030\002 \001(\013" + - "2B.org.jetbrains.kotlin.kpm.idea.proto.I" + - "deaKpmBinaryCoordinatesProtoH\001\210\001\001\022\022\n\005cau" + - "se\030\003 \001(\tH\002\210\001\001B\t\n\007_extrasB\016\n\014_coordinates" + - "B\010\n\006_cause\"\335\002\n$IdeaKpmResolvedBinaryDepe" + - "ndencyProto\022L\n\006extras\030\001 \001(\01327.org.jetbra" + - "ins.kotlin.kpm.idea.proto.IdeaKpmExtrasP" + - "rotoH\000\210\001\001\022\\\n\013coordinates\030\002 \001(\0132B.org.jet" + - "brains.kotlin.kpm.idea.proto.IdeaKpmBina" + - "ryCoordinatesProtoH\001\210\001\001\022\030\n\013binary_type\030\003" + - " \001(\tH\002\210\001\001\022&\n\031binary_file_absolute_path\030\004" + - " \001(\tH\003\210\001\001B\t\n\007_extrasB\016\n\014_coordinatesB\016\n\014" + - "_binary_typeB\034\n\032_binary_file_absolute_pa" + - "th\"\375\002\n\036IdeaKpmFragmentDependencyProto\022L\n" + + "rogressive_mode\"\274\001\n\027IdeaKpmContentRootPr" + + "oto\022L\n\006extras\030\001 \001(\01327.org.jetbrains.kotl" + + "in.kpm.idea.proto.IdeaKpmExtrasProtoH\000\210\001" + + "\001\022\032\n\rabsolute_path\030\002 \001(\tH\001\210\001\001\022\021\n\004type\030\003 " + + "\001(\tH\002\210\001\001B\t\n\007_extrasB\020\n\016_absolute_pathB\007\n" + + "\005_type\"\363\001\n\035IdeaKpmBinaryCoordinatesProto" + + "\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\037\n\022kotlin_module" + + "_name\030\004 \001(\tH\003\210\001\001\022!\n\024kotlin_fragment_name" + + "\030\005 \001(\tH\004\210\001\001B\010\n\006_groupB\t\n\007_moduleB\n\n\010_ver" + + "sionB\025\n\023_kotlin_module_nameB\027\n\025_kotlin_f" + + "ragment_name\"\263\001\n\037IdeaKpmFragmentCoordina" + + "tesProto\022W\n\006module\030\001 \001(\0132B.org.jetbrains" + + ".kotlin.kpm.idea.proto.IdeaKpmModuleCoor" + + "dinatesProtoH\000\210\001\001\022\032\n\rfragment_name\030\002 \001(\t" + + "H\001\210\001\001B\t\n\007_moduleB\020\n\016_fragment_name\"\360\002\n\026I" + + "deaKpmDependencyProto\022s\n\034unresolved_bina" + + "ry_dependency\030\001 \001(\0132K.org.jetbrains.kotl" + + "in.kpm.idea.proto.IdeaKpmUnresolvedBinar" + + "yDependencyProtoH\000\022o\n\032resolved_binary_de" + + "pendency\030\002 \001(\0132I.org.jetbrains.kotlin.kp" + + "m.idea.proto.IdeaKpmResolvedBinaryDepend" + + "encyProtoH\000\022b\n\023fragment_dependency\030\003 \001(\013" + + "2C.org.jetbrains.kotlin.kpm.idea.proto.I" + + "deaKpmFragmentDependencyProtoH\000B\014\n\ndepen" + + "dency\"\215\002\n&IdeaKpmUnresolvedBinaryDepende" + + "ncyProto\022L\n\006extras\030\001 \001(\01327.org.jetbrains" + + ".kotlin.kpm.idea.proto.IdeaKpmExtrasProt" + + "oH\000\210\001\001\022\\\n\013coordinates\030\002 \001(\0132B.org.jetbra" + + "ins.kotlin.kpm.idea.proto.IdeaKpmBinaryC" + + "oordinatesProtoH\001\210\001\001\022\022\n\005cause\030\003 \001(\tH\002\210\001\001" + + "B\t\n\007_extrasB\016\n\014_coordinatesB\010\n\006_cause\"\335\002" + + "\n$IdeaKpmResolvedBinaryDependencyProto\022L" + + "\n\006extras\030\001 \001(\01327.org.jetbrains.kotlin.kp" + + "m.idea.proto.IdeaKpmExtrasProtoH\000\210\001\001\022\\\n\013" + + "coordinates\030\002 \001(\0132B.org.jetbrains.kotlin" + + ".kpm.idea.proto.IdeaKpmBinaryCoordinates" + + "ProtoH\001\210\001\001\022\030\n\013binary_type\030\003 \001(\tH\002\210\001\001\022&\n\031" + + "binary_file_absolute_path\030\004 \001(\tH\003\210\001\001B\t\n\007" + + "_extrasB\016\n\014_coordinatesB\016\n\014_binary_typeB" + + "\034\n\032_binary_file_absolute_path\"\375\002\n\036IdeaKp" + + "mFragmentDependencyProto\022L\n\006extras\030\001 \001(\013" + + "27.org.jetbrains.kotlin.kpm.idea.proto.I" + + "deaKpmExtrasProtoH\000\210\001\001\022[\n\004type\030\002 \001(\0162H.o" + + "rg.jetbrains.kotlin.kpm.idea.proto.IdeaK" + + "pmFragmentDependencyProto.TypeH\001\210\001\001\022^\n\013c" + + "oordinates\030\003 \001(\0132D.org.jetbrains.kotlin." + + "kpm.idea.proto.IdeaKpmFragmentCoordinate" + + "sProtoH\002\210\001\001\",\n\004Type\022\013\n\007REGULAR\020\000\022\n\n\006FRIE" + + "ND\020\001\022\013\n\007REFINES\020\002B\t\n\007_extrasB\007\n\005_typeB\016\n" + + "\014_coordinates\"\261\003\n\024IdeaKpmPlatformProto\022K" + + "\n\003jvm\030\001 \001(\0132<.org.jetbrains.kotlin.kpm.i" + + "dea.proto.IdeaKpmJvmPlatformProtoH\000\022Q\n\006n" + + "ative\030\002 \001(\0132?.org.jetbrains.kotlin.kpm.i" + + "dea.proto.IdeaKpmNativePlatformProtoH\000\022I" + + "\n\002js\030\003 \001(\0132;.org.jetbrains.kotlin.kpm.id" + + "ea.proto.IdeaKpmJsPlatformProtoH\000\022M\n\004was" + + "m\030\004 \001(\0132=.org.jetbrains.kotlin.kpm.idea." + + "proto.IdeaKpmWasmPlatformProtoH\000\022S\n\007unkn" + + "own\030\005 \001(\0132@.org.jetbrains.kotlin.kpm.ide" + + "a.proto.IdeaKpmUnknownPlatformProtoH\000B\n\n" + + "\010platform\"\232\001\n\027IdeaKpmJvmPlatformProto\022L\n" + "\006extras\030\001 \001(\01327.org.jetbrains.kotlin.kpm" + - ".idea.proto.IdeaKpmExtrasProtoH\000\210\001\001\022[\n\004t" + - "ype\030\002 \001(\0162H.org.jetbrains.kotlin.kpm.ide" + - "a.proto.IdeaKpmFragmentDependencyProto.T" + - "ypeH\001\210\001\001\022^\n\013coordinates\030\003 \001(\0132D.org.jetb" + - "rains.kotlin.kpm.idea.proto.IdeaKpmFragm" + - "entCoordinatesProtoH\002\210\001\001\",\n\004Type\022\013\n\007REGU" + - "LAR\020\000\022\n\n\006FRIEND\020\001\022\013\n\007REFINES\020\002B\t\n\007_extra" + - "sB\007\n\005_typeB\016\n\014_coordinates\"\261\003\n\024IdeaKpmPl" + - "atformProto\022K\n\003jvm\030\001 \001(\0132<.org.jetbrains" + - ".kotlin.kpm.idea.proto.IdeaKpmJvmPlatfor" + - "mProtoH\000\022Q\n\006native\030\002 \001(\0132?.org.jetbrains" + - ".kotlin.kpm.idea.proto.IdeaKpmNativePlat" + - "formProtoH\000\022I\n\002js\030\003 \001(\0132;.org.jetbrains." + - "kotlin.kpm.idea.proto.IdeaKpmJsPlatformP" + - "rotoH\000\022M\n\004wasm\030\004 \001(\0132=.org.jetbrains.kot" + - "lin.kpm.idea.proto.IdeaKpmWasmPlatformPr" + - "otoH\000\022S\n\007unknown\030\005 \001(\0132@.org.jetbrains.k" + - "otlin.kpm.idea.proto.IdeaKpmUnknownPlatf" + - "ormProtoH\000B\n\n\010platform\"\232\001\n\027IdeaKpmJvmPla" + - "tformProto\022L\n\006extras\030\001 \001(\01327.org.jetbrai" + - "ns.kotlin.kpm.idea.proto.IdeaKpmExtrasPr" + - "otoH\000\210\001\001\022\027\n\njvm_target\030\002 \001(\tH\001\210\001\001B\t\n\007_ex" + - "trasB\r\n\013_jvm_target\"\241\001\n\032IdeaKpmNativePla" + - "tformProto\022L\n\006extras\030\001 \001(\01327.org.jetbrai" + - "ns.kotlin.kpm.idea.proto.IdeaKpmExtrasPr" + - "otoH\000\210\001\001\022\031\n\014konan_target\030\002 \001(\tH\001\210\001\001B\t\n\007_" + - "extrasB\017\n\r_konan_target\"\215\001\n\026IdeaKpmJsPla" + - "tformProto\022L\n\006extras\030\001 \001(\01327.org.jetbrai" + - "ns.kotlin.kpm.idea.proto.IdeaKpmExtrasPr" + - "otoH\000\210\001\001\022\021\n\004isIr\030\002 \001(\010H\001\210\001\001B\t\n\007_extrasB\007" + - "\n\005_isIr\"s\n\030IdeaKpmWasmPlatformProto\022L\n\006e" + + ".idea.proto.IdeaKpmExtrasProtoH\000\210\001\001\022\027\n\nj" + + "vm_target\030\002 \001(\tH\001\210\001\001B\t\n\007_extrasB\r\n\013_jvm_" + + "target\"\241\001\n\032IdeaKpmNativePlatformProto\022L\n" + + "\006extras\030\001 \001(\01327.org.jetbrains.kotlin.kpm" + + ".idea.proto.IdeaKpmExtrasProtoH\000\210\001\001\022\031\n\014k" + + "onan_target\030\002 \001(\tH\001\210\001\001B\t\n\007_extrasB\017\n\r_ko" + + "nan_target\"\215\001\n\026IdeaKpmJsPlatformProto\022L\n" + + "\006extras\030\001 \001(\01327.org.jetbrains.kotlin.kpm" + + ".idea.proto.IdeaKpmExtrasProtoH\000\210\001\001\022\021\n\004i" + + "sIr\030\002 \001(\010H\001\210\001\001B\t\n\007_extrasB\007\n\005_isIr\"s\n\030Id" + + "eaKpmWasmPlatformProto\022L\n\006extras\030\001 \001(\01327" + + ".org.jetbrains.kotlin.kpm.idea.proto.Ide" + + "aKpmExtrasProtoH\000\210\001\001B\t\n\007_extras\"v\n\033IdeaK" + + "pmUnknownPlatformProto\022L\n\006extras\030\001 \001(\01327" + + ".org.jetbrains.kotlin.kpm.idea.proto.Ide" + + "aKpmExtrasProtoH\000\210\001\001B\t\n\007_extras\"\323\004\n\024Idea" + + "KpmFragmentProto\022L\n\006extras\030\001 \001(\01327.org.j" + + "etbrains.kotlin.kpm.idea.proto.IdeaKpmEx" + + "trasProtoH\000\210\001\001\022^\n\013coordinates\030\002 \001(\0132D.or" + + "g.jetbrains.kotlin.kpm.idea.proto.IdeaKp" + + "mFragmentCoordinatesProtoH\001\210\001\001\022L\n\tplatfo" + + "rms\030\003 \003(\01329.org.jetbrains.kotlin.kpm.ide" + + "a.proto.IdeaKpmPlatformProto\022a\n\021language" + + "_settings\030\004 \001(\0132A.org.jetbrains.kotlin.k" + + "pm.idea.proto.IdeaKpmLanguageSettingsPro" + + "toH\002\210\001\001\022Q\n\014dependencies\030\005 \003(\0132;.org.jetb" + + "rains.kotlin.kpm.idea.proto.IdeaKpmDepen" + + "dencyProto\022X\n\022source_directories\030\006 \003(\0132<" + + ".org.jetbrains.kotlin.kpm.idea.proto.Ide" + + "aKpmContentRootProtoB\t\n\007_extrasB\016\n\014_coor" + + "dinatesB\024\n\022_language_settings\"c\n\035IdeaKpm" + + "CompilationOutputProto\022\024\n\014classes_dirs\030\001" + + " \003(\t\022\032\n\rresources_dir\030\002 \001(\tH\000\210\001\001B\020\n\016_res" + + "ources_dir\"\366\003\n\023IdeaKpmVariantProto\022P\n\010fr" + + "agment\030\001 \001(\01329.org.jetbrains.kotlin.kpm." + + "idea.proto.IdeaKpmFragmentProtoH\000\210\001\001\022P\n\010" + + "platform\030\002 \001(\01329.org.jetbrains.kotlin.kp" + + "m.idea.proto.IdeaKpmPlatformProtoH\001\210\001\001\022k" + + "\n\022variant_attributes\030\003 \003(\0132O.org.jetbrai" + + "ns.kotlin.kpm.idea.proto.IdeaKpmVariantP" + + "roto.VariantAttributesEntry\022c\n\022compilati" + + "on_output\030\004 \001(\0132B.org.jetbrains.kotlin.k" + + "pm.idea.proto.IdeaKpmCompilationOutputPr" + + "otoH\002\210\001\001\0328\n\026VariantAttributesEntry\022\013\n\003ke" + + "y\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\013\n\t_fragmentB" + + "\013\n\t_platformB\025\n\023_compilation_output\"\365\002\n\022" + + "IdeaKpmModuleProto\022L\n\006extras\030\001 \001(\01327.org" + + ".jetbrains.kotlin.kpm.idea.proto.IdeaKpm" + + "ExtrasProtoH\000\210\001\001\022\\\n\013coordinates\030\002 \001(\0132B." + + "org.jetbrains.kotlin.kpm.idea.proto.Idea" + + "KpmModuleCoordinatesProtoH\001\210\001\001\022L\n\tfragme" + + "nts\030\003 \003(\01329.org.jetbrains.kotlin.kpm.ide" + + "a.proto.IdeaKpmFragmentProto\022J\n\010variants" + + "\030\004 \003(\01328.org.jetbrains.kotlin.kpm.idea.p" + + "roto.IdeaKpmVariantProtoB\t\n\007_extrasB\016\n\014_" + + "coordinates\"\272\003\n\023IdeaKpmProjectProto\022L\n\006e" + "xtras\030\001 \001(\01327.org.jetbrains.kotlin.kpm.i" + - "dea.proto.IdeaKpmExtrasProtoH\000\210\001\001B\t\n\007_ex" + - "tras\"v\n\033IdeaKpmUnknownPlatformProto\022L\n\006e" + - "xtras\030\001 \001(\01327.org.jetbrains.kotlin.kpm.i" + - "dea.proto.IdeaKpmExtrasProtoH\000\210\001\001B\t\n\007_ex" + - "tras\"\327\004\n\024IdeaKpmFragmentProto\022L\n\006extras\030" + - "\001 \001(\01327.org.jetbrains.kotlin.kpm.idea.pr" + - "oto.IdeaKpmExtrasProtoH\000\210\001\001\022^\n\013coordinat" + - "es\030\002 \001(\0132D.org.jetbrains.kotlin.kpm.idea" + - ".proto.IdeaKpmFragmentCoordinatesProtoH\001" + - "\210\001\001\022L\n\tplatforms\030\003 \003(\01329.org.jetbrains.k" + - "otlin.kpm.idea.proto.IdeaKpmPlatformProt" + - "o\022a\n\021language_settings\030\004 \001(\0132A.org.jetbr" + - "ains.kotlin.kpm.idea.proto.IdeaKpmLangua" + - "geSettingsProtoH\002\210\001\001\022Q\n\014dependencies\030\005 \003" + - "(\0132;.org.jetbrains.kotlin.kpm.idea.proto" + - ".IdeaKpmDependencyProto\022\\\n\022source_direct" + - "ories\030\006 \003(\0132@.org.jetbrains.kotlin.kpm.i" + - "dea.proto.IdeaKpmSourceDirectoryProtoB\t\n" + - "\007_extrasB\016\n\014_coordinatesB\024\n\022_language_se" + - "ttings\"c\n\035IdeaKpmCompilationOutputProto\022" + - "\024\n\014classes_dirs\030\001 \003(\t\022\032\n\rresources_dir\030\002" + - " \001(\tH\000\210\001\001B\020\n\016_resources_dir\"\366\003\n\023IdeaKpmV" + - "ariantProto\022P\n\010fragment\030\001 \001(\01329.org.jetb" + - "rains.kotlin.kpm.idea.proto.IdeaKpmFragm" + - "entProtoH\000\210\001\001\022P\n\010platform\030\002 \001(\01329.org.je" + - "tbrains.kotlin.kpm.idea.proto.IdeaKpmPla" + - "tformProtoH\001\210\001\001\022k\n\022variant_attributes\030\003 " + - "\003(\0132O.org.jetbrains.kotlin.kpm.idea.prot" + - "o.IdeaKpmVariantProto.VariantAttributesE" + - "ntry\022c\n\022compilation_output\030\004 \001(\0132B.org.j" + - "etbrains.kotlin.kpm.idea.proto.IdeaKpmCo" + - "mpilationOutputProtoH\002\210\001\001\0328\n\026VariantAttr" + - "ibutesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:" + - "\0028\001B\013\n\t_fragmentB\013\n\t_platformB\025\n\023_compil" + - "ation_output\"\365\002\n\022IdeaKpmModuleProto\022L\n\006e" + - "xtras\030\001 \001(\01327.org.jetbrains.kotlin.kpm.i" + - "dea.proto.IdeaKpmExtrasProtoH\000\210\001\001\022\\\n\013coo" + - "rdinates\030\002 \001(\0132B.org.jetbrains.kotlin.kp" + - "m.idea.proto.IdeaKpmModuleCoordinatesPro" + - "toH\001\210\001\001\022L\n\tfragments\030\003 \003(\01329.org.jetbrai" + - "ns.kotlin.kpm.idea.proto.IdeaKpmFragment" + - "Proto\022J\n\010variants\030\004 \003(\01328.org.jetbrains." + - "kotlin.kpm.idea.proto.IdeaKpmVariantProt" + - "oB\t\n\007_extrasB\016\n\014_coordinates\"\272\003\n\023IdeaKpm" + - "ProjectProto\022L\n\006extras\030\001 \001(\01327.org.jetbr" + - "ains.kotlin.kpm.idea.proto.IdeaKpmExtras" + - "ProtoH\000\210\001\001\022\"\n\025gradle_plugin_version\030\002 \001(" + - "\tH\001\210\001\001\022#\n\026core_libraries_version\030\003 \001(\tH\002" + - "\210\001\001\022)\n\034explicit_api_mode_cli_option\030\004 \001(" + - "\tH\003\210\001\001\022\037\n\022kotlin_native_home\030\005 \001(\tH\004\210\001\001\022" + - "H\n\007modules\030\006 \003(\01327.org.jetbrains.kotlin." + - "kpm.idea.proto.IdeaKpmModuleProtoB\t\n\007_ex" + - "trasB\030\n\026_gradle_plugin_versionB\031\n\027_core_" + - "libraries_versionB\037\n\035_explicit_api_mode_" + - "cli_optionB\025\n\023_kotlin_native_home\"\222\002\n\026Id" + - "eaKpmSchemaInfoProto\022\'\n\032since_schema_ver" + - "sion_major\030\001 \001(\rH\000\210\001\001\022\'\n\032since_schema_ve" + - "rsion_minor\030\002 \001(\rH\001\210\001\001\022\'\n\032since_schema_v" + - "ersion_patch\030\003 \001(\rH\002\210\001\001\022\024\n\007message\030\004 \001(\t" + - "H\003\210\001\001B\035\n\033_since_schema_version_majorB\035\n\033" + - "_since_schema_version_minorB\035\n\033_since_sc" + - "hema_version_patchB\n\n\010_message\"\372\002\n\025IdeaK" + - "pmContainerProto\022!\n\024schema_version_major" + - "\030\001 \001(\rH\000\210\001\001\022!\n\024schema_version_minor\030\002 \001(" + - "\rH\001\210\001\001\022!\n\024schema_version_patch\030\003 \001(\rH\002\210\001" + - "\001\022Q\n\014schema_infos\030\004 \003(\0132;.org.jetbrains." + - "kotlin.kpm.idea.proto.IdeaKpmSchemaInfoP" + - "roto\022N\n\007project\030\030 \001(\01328.org.jetbrains.ko" + - "tlin.kpm.idea.proto.IdeaKpmProjectProtoH" + - "\003\210\001\001B\027\n\025_schema_version_majorB\027\n\025_schema" + - "_version_minorB\027\n\025_schema_version_patchB" + - "\n\n\010_projectB\002P\001b\006proto3" + "dea.proto.IdeaKpmExtrasProtoH\000\210\001\001\022\"\n\025gra" + + "dle_plugin_version\030\002 \001(\tH\001\210\001\001\022#\n\026core_li" + + "braries_version\030\003 \001(\tH\002\210\001\001\022)\n\034explicit_a" + + "pi_mode_cli_option\030\004 \001(\tH\003\210\001\001\022\037\n\022kotlin_" + + "native_home\030\005 \001(\tH\004\210\001\001\022H\n\007modules\030\006 \003(\0132" + + "7.org.jetbrains.kotlin.kpm.idea.proto.Id" + + "eaKpmModuleProtoB\t\n\007_extrasB\030\n\026_gradle_p" + + "lugin_versionB\031\n\027_core_libraries_version" + + "B\037\n\035_explicit_api_mode_cli_optionB\025\n\023_ko" + + "tlin_native_home\"\222\002\n\026IdeaKpmSchemaInfoPr" + + "oto\022\'\n\032since_schema_version_major\030\001 \001(\rH" + + "\000\210\001\001\022\'\n\032since_schema_version_minor\030\002 \001(\r" + + "H\001\210\001\001\022\'\n\032since_schema_version_patch\030\003 \001(" + + "\rH\002\210\001\001\022\024\n\007message\030\004 \001(\tH\003\210\001\001B\035\n\033_since_s" + + "chema_version_majorB\035\n\033_since_schema_ver" + + "sion_minorB\035\n\033_since_schema_version_patc" + + "hB\n\n\010_message\"\372\002\n\025IdeaKpmContainerProto\022" + + "!\n\024schema_version_major\030\001 \001(\rH\000\210\001\001\022!\n\024sc" + + "hema_version_minor\030\002 \001(\rH\001\210\001\001\022!\n\024schema_" + + "version_patch\030\003 \001(\rH\002\210\001\001\022Q\n\014schema_infos" + + "\030\004 \003(\0132;.org.jetbrains.kotlin.kpm.idea.p" + + "roto.IdeaKpmSchemaInfoProto\022N\n\007project\030\030" + + " \001(\01328.org.jetbrains.kotlin.kpm.idea.pro" + + "to.IdeaKpmProjectProtoH\003\210\001\001B\027\n\025_schema_v" + + "ersion_majorB\027\n\025_schema_version_minorB\027\n" + + "\025_schema_version_patchB\n\n\010_projectB\002P\001b\006" + + "proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -329,104 +320,98 @@ final class ProtoIdeaKpm { com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmLanguageSettingsProto_descriptor, new java.lang.String[] { "LanguageVersion", "ApiVersion", "IsProgressiveMode", "EnabledLanguageFeatures", "OptInAnnotationsInUse", "CompilerPluginArguments", "CompilerPluginClasspath", "FreeCompilerArgs", "LanguageVersion", "ApiVersion", "IsProgressiveMode", }); - internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmSourceDirectoryProto_descriptor = + internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmContentRootProto_descriptor = getDescriptor().getMessageTypes().get(2); - internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmSourceDirectoryProto_fieldAccessorTable = new + internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmContentRootProto_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmSourceDirectoryProto_descriptor, + internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmContentRootProto_descriptor, new java.lang.String[] { "Extras", "AbsolutePath", "Type", "Extras", "AbsolutePath", "Type", }); - internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmResourceDirectoryProto_descriptor = - getDescriptor().getMessageTypes().get(3); - internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmResourceDirectoryProto_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmResourceDirectoryProto_descriptor, - new java.lang.String[] { "Extras", "AbsolutePath", "Extras", "AbsolutePath", }); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmBinaryCoordinatesProto_descriptor = - getDescriptor().getMessageTypes().get(4); + getDescriptor().getMessageTypes().get(3); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmBinaryCoordinatesProto_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmBinaryCoordinatesProto_descriptor, new java.lang.String[] { "Group", "Module", "Version", "KotlinModuleName", "KotlinFragmentName", "Group", "Module", "Version", "KotlinModuleName", "KotlinFragmentName", }); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmFragmentCoordinatesProto_descriptor = - getDescriptor().getMessageTypes().get(5); + getDescriptor().getMessageTypes().get(4); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmFragmentCoordinatesProto_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmFragmentCoordinatesProto_descriptor, new java.lang.String[] { "Module", "FragmentName", "Module", "FragmentName", }); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmDependencyProto_descriptor = - getDescriptor().getMessageTypes().get(6); + getDescriptor().getMessageTypes().get(5); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmDependencyProto_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmDependencyProto_descriptor, new java.lang.String[] { "UnresolvedBinaryDependency", "ResolvedBinaryDependency", "FragmentDependency", "Dependency", }); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmUnresolvedBinaryDependencyProto_descriptor = - getDescriptor().getMessageTypes().get(7); + getDescriptor().getMessageTypes().get(6); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmUnresolvedBinaryDependencyProto_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmUnresolvedBinaryDependencyProto_descriptor, new java.lang.String[] { "Extras", "Coordinates", "Cause", "Extras", "Coordinates", "Cause", }); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmResolvedBinaryDependencyProto_descriptor = - getDescriptor().getMessageTypes().get(8); + getDescriptor().getMessageTypes().get(7); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmResolvedBinaryDependencyProto_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmResolvedBinaryDependencyProto_descriptor, new java.lang.String[] { "Extras", "Coordinates", "BinaryType", "BinaryFileAbsolutePath", "Extras", "Coordinates", "BinaryType", "BinaryFileAbsolutePath", }); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmFragmentDependencyProto_descriptor = - getDescriptor().getMessageTypes().get(9); + getDescriptor().getMessageTypes().get(8); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmFragmentDependencyProto_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmFragmentDependencyProto_descriptor, new java.lang.String[] { "Extras", "Type", "Coordinates", "Extras", "Type", "Coordinates", }); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmPlatformProto_descriptor = - getDescriptor().getMessageTypes().get(10); + getDescriptor().getMessageTypes().get(9); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmPlatformProto_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmPlatformProto_descriptor, new java.lang.String[] { "Jvm", "Native", "Js", "Wasm", "Unknown", "Platform", }); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmJvmPlatformProto_descriptor = - getDescriptor().getMessageTypes().get(11); + getDescriptor().getMessageTypes().get(10); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmJvmPlatformProto_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmJvmPlatformProto_descriptor, new java.lang.String[] { "Extras", "JvmTarget", "Extras", "JvmTarget", }); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmNativePlatformProto_descriptor = - getDescriptor().getMessageTypes().get(12); + getDescriptor().getMessageTypes().get(11); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmNativePlatformProto_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmNativePlatformProto_descriptor, new java.lang.String[] { "Extras", "KonanTarget", "Extras", "KonanTarget", }); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmJsPlatformProto_descriptor = - getDescriptor().getMessageTypes().get(13); + getDescriptor().getMessageTypes().get(12); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmJsPlatformProto_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmJsPlatformProto_descriptor, new java.lang.String[] { "Extras", "IsIr", "Extras", "IsIr", }); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmWasmPlatformProto_descriptor = - getDescriptor().getMessageTypes().get(14); + getDescriptor().getMessageTypes().get(13); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmWasmPlatformProto_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmWasmPlatformProto_descriptor, new java.lang.String[] { "Extras", "Extras", }); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmUnknownPlatformProto_descriptor = - getDescriptor().getMessageTypes().get(15); + getDescriptor().getMessageTypes().get(14); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmUnknownPlatformProto_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmUnknownPlatformProto_descriptor, new java.lang.String[] { "Extras", "Extras", }); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmFragmentProto_descriptor = - getDescriptor().getMessageTypes().get(16); + getDescriptor().getMessageTypes().get(15); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmFragmentProto_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmFragmentProto_descriptor, new java.lang.String[] { "Extras", "Coordinates", "Platforms", "LanguageSettings", "Dependencies", "SourceDirectories", "Extras", "Coordinates", "LanguageSettings", }); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmCompilationOutputProto_descriptor = - getDescriptor().getMessageTypes().get(17); + getDescriptor().getMessageTypes().get(16); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmCompilationOutputProto_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmCompilationOutputProto_descriptor, new java.lang.String[] { "ClassesDirs", "ResourcesDir", "ResourcesDir", }); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmVariantProto_descriptor = - getDescriptor().getMessageTypes().get(18); + getDescriptor().getMessageTypes().get(17); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmVariantProto_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmVariantProto_descriptor, @@ -438,25 +423,25 @@ final class ProtoIdeaKpm { internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmVariantProto_VariantAttributesEntry_descriptor, new java.lang.String[] { "Key", "Value", }); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmModuleProto_descriptor = - getDescriptor().getMessageTypes().get(19); + getDescriptor().getMessageTypes().get(18); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmModuleProto_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmModuleProto_descriptor, new java.lang.String[] { "Extras", "Coordinates", "Fragments", "Variants", "Extras", "Coordinates", }); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmProjectProto_descriptor = - getDescriptor().getMessageTypes().get(20); + getDescriptor().getMessageTypes().get(19); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmProjectProto_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmProjectProto_descriptor, new java.lang.String[] { "Extras", "GradlePluginVersion", "CoreLibrariesVersion", "ExplicitApiModeCliOption", "KotlinNativeHome", "Modules", "Extras", "GradlePluginVersion", "CoreLibrariesVersion", "ExplicitApiModeCliOption", "KotlinNativeHome", }); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmSchemaInfoProto_descriptor = - getDescriptor().getMessageTypes().get(21); + getDescriptor().getMessageTypes().get(20); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmSchemaInfoProto_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmSchemaInfoProto_descriptor, new java.lang.String[] { "SinceSchemaVersionMajor", "SinceSchemaVersionMinor", "SinceSchemaVersionPatch", "Message", "SinceSchemaVersionMajor", "SinceSchemaVersionMinor", "SinceSchemaVersionPatch", "Message", }); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmContainerProto_descriptor = - getDescriptor().getMessageTypes().get(22); + getDescriptor().getMessageTypes().get(21); internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmContainerProto_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_org_jetbrains_kotlin_kpm_idea_proto_IdeaKpmContainerProto_descriptor, diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmSourceDirectoryProtoKt.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmContentRootProtoKt.kt similarity index 73% rename from libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmSourceDirectoryProtoKt.kt rename to libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmContentRootProtoKt.kt index 8e1654b73ab..0371bd5f909 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmSourceDirectoryProtoKt.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmContentRootProtoKt.kt @@ -4,23 +4,23 @@ package org.jetbrains.kotlin.kpm.idea.proto; @kotlin.jvm.JvmSynthetic -internal inline fun ideaKpmSourceDirectoryProto(block: org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProtoKt.Dsl.() -> kotlin.Unit): org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto = - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProtoKt.Dsl._create(org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto.newBuilder()).apply { block() }._build() -internal object IdeaKpmSourceDirectoryProtoKt { +internal inline fun ideaKpmContentRootProto(block: org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProtoKt.Dsl.() -> kotlin.Unit): org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto = + org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProtoKt.Dsl._create(org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto.newBuilder()).apply { block() }._build() +internal object IdeaKpmContentRootProtoKt { @kotlin.OptIn(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class) @com.google.protobuf.kotlin.ProtoDslMarker internal class Dsl private constructor( - private val _builder: org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto.Builder + private val _builder: org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto.Builder ) { internal companion object { @kotlin.jvm.JvmSynthetic @kotlin.PublishedApi - internal fun _create(builder: org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto.Builder): Dsl = Dsl(builder) + internal fun _create(builder: org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto.Builder): Dsl = Dsl(builder) } @kotlin.jvm.JvmSynthetic @kotlin.PublishedApi - internal fun _build(): org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto = _builder.build() + internal fun _build(): org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto = _builder.build() /** * optional .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto extras = 1; @@ -96,5 +96,5 @@ internal object IdeaKpmSourceDirectoryProtoKt { } } @kotlin.jvm.JvmSynthetic -internal inline fun org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto.copy(block: org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProtoKt.Dsl.() -> kotlin.Unit): org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto = - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProtoKt.Dsl._create(this.toBuilder()).apply { block() }._build() +internal inline fun org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto.copy(block: org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProtoKt.Dsl.() -> kotlin.Unit): org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto = + org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProtoKt.Dsl._create(this.toBuilder()).apply { block() }._build() diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmFragmentProtoKt.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmFragmentProtoKt.kt index 36c8bba1c24..268e005e514 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmFragmentProtoKt.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmFragmentProtoKt.kt @@ -231,62 +231,62 @@ internal object IdeaKpmFragmentProtoKt { @kotlin.OptIn(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class) internal class SourceDirectoriesProxy private constructor() : com.google.protobuf.kotlin.DslProxy() /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ - internal val sourceDirectories: com.google.protobuf.kotlin.DslList + internal val sourceDirectories: com.google.protobuf.kotlin.DslList @kotlin.jvm.JvmSynthetic get() = com.google.protobuf.kotlin.DslList( _builder.getSourceDirectoriesList() ) /** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; * @param value The sourceDirectories to add. */ @kotlin.jvm.JvmSynthetic @kotlin.jvm.JvmName("addSourceDirectories") - internal fun com.google.protobuf.kotlin.DslList.add(value: org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto) { + internal fun com.google.protobuf.kotlin.DslList.add(value: org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto) { _builder.addSourceDirectories(value) }/** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; * @param value The sourceDirectories to add. */ @kotlin.jvm.JvmSynthetic @kotlin.jvm.JvmName("plusAssignSourceDirectories") @Suppress("NOTHING_TO_INLINE") - internal inline operator fun com.google.protobuf.kotlin.DslList.plusAssign(value: org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto) { + internal inline operator fun com.google.protobuf.kotlin.DslList.plusAssign(value: org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto) { add(value) }/** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; * @param values The sourceDirectories to add. */ @kotlin.jvm.JvmSynthetic @kotlin.jvm.JvmName("addAllSourceDirectories") - internal fun com.google.protobuf.kotlin.DslList.addAll(values: kotlin.collections.Iterable) { + internal fun com.google.protobuf.kotlin.DslList.addAll(values: kotlin.collections.Iterable) { _builder.addAllSourceDirectories(values) }/** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; * @param values The sourceDirectories to add. */ @kotlin.jvm.JvmSynthetic @kotlin.jvm.JvmName("plusAssignAllSourceDirectories") @Suppress("NOTHING_TO_INLINE") - internal inline operator fun com.google.protobuf.kotlin.DslList.plusAssign(values: kotlin.collections.Iterable) { + internal inline operator fun com.google.protobuf.kotlin.DslList.plusAssign(values: kotlin.collections.Iterable) { addAll(values) }/** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; * @param index The index to set the value at. * @param value The sourceDirectories to set. */ @kotlin.jvm.JvmSynthetic @kotlin.jvm.JvmName("setSourceDirectories") - internal operator fun com.google.protobuf.kotlin.DslList.set(index: kotlin.Int, value: org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto) { + internal operator fun com.google.protobuf.kotlin.DslList.set(index: kotlin.Int, value: org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto) { _builder.setSourceDirectories(index, value) }/** - * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmSourceDirectoryProto source_directories = 6; + * repeated .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmContentRootProto source_directories = 6; */ @kotlin.jvm.JvmSynthetic @kotlin.jvm.JvmName("clearSourceDirectories") - internal fun com.google.protobuf.kotlin.DslList.clear() { + internal fun com.google.protobuf.kotlin.DslList.clear() { _builder.clearSourceDirectories() }} } diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmResourceDirectoryProtoKt.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmResourceDirectoryProtoKt.kt deleted file mode 100644 index 9d77875dd43..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/kpm/idea/proto/IdeaKpmResourceDirectoryProtoKt.kt +++ /dev/null @@ -1,76 +0,0 @@ -//Generated by the protocol buffer compiler. DO NOT EDIT! -// source: proto_idea_kpm.proto - -package org.jetbrains.kotlin.kpm.idea.proto; - -@kotlin.jvm.JvmSynthetic -internal inline fun ideaKpmResourceDirectoryProto(block: org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProtoKt.Dsl.() -> kotlin.Unit): org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto = - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProtoKt.Dsl._create(org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto.newBuilder()).apply { block() }._build() -internal object IdeaKpmResourceDirectoryProtoKt { - @kotlin.OptIn(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class) - @com.google.protobuf.kotlin.ProtoDslMarker - internal class Dsl private constructor( - private val _builder: org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto.Builder - ) { - internal companion object { - @kotlin.jvm.JvmSynthetic - @kotlin.PublishedApi - internal fun _create(builder: org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto.Builder): Dsl = Dsl(builder) - } - - @kotlin.jvm.JvmSynthetic - @kotlin.PublishedApi - internal fun _build(): org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto = _builder.build() - - /** - * optional .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto extras = 1; - */ - internal var extras: org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto - @JvmName("getExtras") - get() = _builder.getExtras() - @JvmName("setExtras") - set(value) { - _builder.setExtras(value) - } - /** - * optional .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto extras = 1; - */ - internal fun clearExtras() { - _builder.clearExtras() - } - /** - * optional .org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmExtrasProto extras = 1; - * @return Whether the extras field is set. - */ - internal fun hasExtras(): kotlin.Boolean { - return _builder.hasExtras() - } - - /** - * optional string absolute_path = 2; - */ - internal var absolutePath: kotlin.String - @JvmName("getAbsolutePath") - get() = _builder.getAbsolutePath() - @JvmName("setAbsolutePath") - set(value) { - _builder.setAbsolutePath(value) - } - /** - * optional string absolute_path = 2; - */ - internal fun clearAbsolutePath() { - _builder.clearAbsolutePath() - } - /** - * optional string absolute_path = 2; - * @return Whether the absolutePath field is set. - */ - internal fun hasAbsolutePath(): kotlin.Boolean { - return _builder.hasAbsolutePath() - } - } -} -@kotlin.jvm.JvmSynthetic -internal inline fun org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto.copy(block: org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProtoKt.Dsl.() -> kotlin.Unit): org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProto = - org.jetbrains.kotlin.kpm.idea.proto.IdeaKpmResourceDirectoryProtoKt.Dsl._create(this.toBuilder()).apply { block() }._build() diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/contentRoot.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/contentRoot.kt new file mode 100644 index 00000000000..9951e51af82 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/contentRoot.kt @@ -0,0 +1,35 @@ +/* + * 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.kpm.idea.proto + +import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmContentRoot +import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmContentRootImpl +import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationContext +import java.io.File + +internal fun IdeaKpmSerializationContext.IdeaKpmContentRootProto(sourceDirectory: IdeaKpmContentRoot): IdeaKpmContentRootProto { + return ideaKpmContentRootProto { + absolutePath = sourceDirectory.file.absolutePath + type = sourceDirectory.type + extras = IdeaKpmExtrasProto(sourceDirectory.extras) + } +} + +internal fun IdeaKpmSerializationContext.IdeaKpmContentRoot(proto: IdeaKpmContentRootProto): IdeaKpmContentRoot { + return IdeaKpmContentRootImpl( + file = File(proto.absolutePath), + type = proto.type, + extras = Extras(proto.extras) + ) +} + +internal fun IdeaKpmSerializationContext.IdeaKpmContentRoot(data: ByteArray): IdeaKpmContentRoot { + return IdeaKpmContentRoot(IdeaKpmContentRootProto.parseFrom(data)) +} + +internal fun IdeaKpmContentRoot.toByteArray(context: IdeaKpmSerializationContext): ByteArray { + return context.IdeaKpmContentRootProto(this).toByteArray() +} diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/fragment.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/fragment.kt index 2a3f0ef111f..769af941a7c 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/fragment.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/fragment.kt @@ -15,7 +15,7 @@ internal fun IdeaKpmSerializationContext.IdeaKpmFragmentProto(fragment: IdeaKpmF platforms.addAll(fragment.platforms.map { IdeaKpmPlatformProto(it) }) languageSettings = IdeaKpmLanguageSettingsProto(fragment.languageSettings) dependencies.addAll(fragment.dependencies.map { IdeaKpmDependencyProto(it) }) - sourceDirectories.addAll(fragment.sourceDirectories.map { IdeaKpmSourceDirectoryProto(it) }) + sourceDirectories.addAll(fragment.contentRoots.map { IdeaKpmContentRootProto(it) }) extras = IdeaKpmExtrasProto(fragment.extras) } } @@ -26,7 +26,7 @@ internal fun IdeaKpmSerializationContext.IdeaKpmFragment(proto: IdeaKpmFragmentP platforms = proto.platformsList.map { IdeaKpmPlatform(it) }.toSet(), languageSettings = IdeaKpmLanguageSettings(proto.languageSettings), dependencies = proto.dependenciesList.mapNotNull { IdeaKpmDependency(it) }, - sourceDirectories = proto.sourceDirectoriesList.mapNotNull { IdeaKpmSourceDirectory(it) }, + contentRoots = proto.sourceDirectoriesList.mapNotNull { IdeaKpmContentRoot(it) }, extras = Extras(proto.extras) ) } diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/sourceDirectory.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/sourceDirectory.kt deleted file mode 100644 index 27cc242faa4..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/kpm/idea/proto/sourceDirectory.kt +++ /dev/null @@ -1,41 +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.kpm.idea.proto - -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmSourceDirectory -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmSourceDirectoryImpl -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationContext -import java.io.File - -/* - * 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. - */ - - -internal fun IdeaKpmSerializationContext.IdeaKpmSourceDirectoryProto(sourceDirectory: IdeaKpmSourceDirectory): IdeaKpmSourceDirectoryProto { - return ideaKpmSourceDirectoryProto { - absolutePath = sourceDirectory.file.absolutePath - type = sourceDirectory.type - extras = IdeaKpmExtrasProto(sourceDirectory.extras) - } -} - -internal fun IdeaKpmSerializationContext.IdeaKpmSourceDirectory(proto: IdeaKpmSourceDirectoryProto): IdeaKpmSourceDirectory { - return IdeaKpmSourceDirectoryImpl( - file = File(proto.absolutePath), - type = proto.type, - extras = Extras(proto.extras) - ) -} - -internal fun IdeaKpmSerializationContext.IdeaKpmSourceDirectory(data: ByteArray): IdeaKpmSourceDirectory { - return IdeaKpmSourceDirectory(IdeaKpmSourceDirectoryProto.parseFrom(data)) -} - -internal fun IdeaKpmSourceDirectory.toByteArray(context: IdeaKpmSerializationContext): ByteArray { - return context.IdeaKpmSourceDirectoryProto(this).toByteArray() -} diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/proto/proto_idea_kpm.proto b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/proto/proto_idea_kpm.proto index acbd2eecf3b..56d832f314f 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/proto/proto_idea_kpm.proto +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/proto/proto_idea_kpm.proto @@ -23,17 +23,12 @@ message IdeaKpmLanguageSettingsProto { repeated string free_compiler_args = 8; } -message IdeaKpmSourceDirectoryProto { +message IdeaKpmContentRootProto { optional IdeaKpmExtrasProto extras = 1; optional string absolute_path = 2; optional string type = 3; } -message IdeaKpmResourceDirectoryProto { - optional IdeaKpmExtrasProto extras = 1; - optional string absolute_path = 2; -} - message IdeaKpmBinaryCoordinatesProto { optional string group = 1; optional string module = 2; @@ -119,7 +114,7 @@ message IdeaKpmFragmentProto { repeated IdeaKpmPlatformProto platforms = 3; optional IdeaKpmLanguageSettingsProto language_settings = 4; repeated IdeaKpmDependencyProto dependencies = 5; - repeated IdeaKpmSourceDirectoryProto source_directories = 6; + repeated IdeaKpmContentRootProto source_directories = 6; } message IdeaKpmCompilationOutputProto { diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/FragmentTest.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/FragmentTest.kt index 18a87146d10..1e35d57762c 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/FragmentTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/FragmentTest.kt @@ -39,8 +39,8 @@ class FragmentTest : AbstractSerializationTest() { languageSettings = (value.languageSettings as IdeaKpmLanguageSettingsImpl).copy( compilerPluginClasspath = value.languageSettings.compilerPluginClasspath.map { it.absoluteFile } ), - sourceDirectories = value.sourceDirectories - .map { it as IdeaKpmSourceDirectoryImpl } + contentRoots = value.contentRoots + .map { it as IdeaKpmContentRootImpl } .map { it.copy(file = it.file.absoluteFile) } ) diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/SourceDirectoryTest.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/SourceDirectoryTest.kt index 509abac44e1..29d83535bd8 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/SourceDirectoryTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/kpm/idea/proto/SourceDirectoryTest.kt @@ -5,32 +5,30 @@ package org.jetbrains.kotlin.kpm.idea.proto -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmSourceDirectory -import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmSourceDirectoryImpl -import org.jetbrains.kotlin.gradle.kpm.idea.serialize.IdeaKpmSerializationContext +import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmContentRoot +import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmContentRootImpl import org.jetbrains.kotlin.tooling.core.emptyExtras import org.jetbrains.kotlin.tooling.core.extrasKeyOf import org.jetbrains.kotlin.tooling.core.extrasOf import org.jetbrains.kotlin.tooling.core.withValue import org.junit.Test import java.io.File -import kotlin.test.assertEquals -class SourceDirectoryTest : AbstractSerializationTest() { +class SourceDirectoryTest : AbstractSerializationTest() { - override fun serialize(value: IdeaKpmSourceDirectory) = value.toByteArray(this) - override fun deserialize(data: ByteArray) = IdeaKpmSourceDirectory(data) + override fun serialize(value: IdeaKpmContentRoot) = value.toByteArray(this) + override fun deserialize(data: ByteArray) = IdeaKpmContentRoot(data) @Test fun `serialize - deserialize - sample 0`() = testSerialization( - IdeaKpmSourceDirectoryImpl( + IdeaKpmContentRootImpl( File("myFile").absoluteFile, type = "myType", extras = emptyExtras() ) ) @Test fun `serialize - deserialize - sample 1`() = testSerialization( - IdeaKpmSourceDirectoryImpl( + IdeaKpmContentRootImpl( File("myFile").absoluteFile, type = "myType", extras = extrasOf(extrasKeyOf() withValue 1) ) ) diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmSourceDirectory.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmContentRoot.kt similarity index 86% rename from libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmSourceDirectory.kt rename to libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmContentRoot.kt index 8b3e9ae7b6c..809fe4093da 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmSourceDirectory.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmContentRoot.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.tooling.core.emptyExtras import java.io.File import java.io.Serializable -sealed interface IdeaKpmSourceDirectory : Serializable { +sealed interface IdeaKpmContentRoot : Serializable { val extras: Extras val file: File val type: String @@ -22,11 +22,11 @@ sealed interface IdeaKpmSourceDirectory : Serializable { } @InternalKotlinGradlePluginApi -data class IdeaKpmSourceDirectoryImpl( +data class IdeaKpmContentRootImpl( override val file: File, override val type: String, override val extras: Extras = emptyExtras(), - ) : IdeaKpmSourceDirectory { +) : IdeaKpmContentRoot { @InternalKotlinGradlePluginApi companion object { diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmFragment.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmFragment.kt index 2d8973a8dc6..2d1ae02497b 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmFragment.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/IdeaKpmFragment.kt @@ -13,7 +13,7 @@ sealed interface IdeaKpmFragment : Serializable { val platforms: Set val languageSettings: IdeaKpmLanguageSettings val dependencies: List - val sourceDirectories: List + val contentRoots: List val extras: Extras } @@ -25,7 +25,7 @@ data class IdeaKpmFragmentImpl( override val platforms: Set, override val languageSettings: IdeaKpmLanguageSettings, override val dependencies: List, - override val sourceDirectories: List, + override val contentRoots: List, override val extras: Extras ) : IdeaKpmFragment { diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmInstances.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmInstances.kt index b7d1935b1de..895a18a5aeb 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmInstances.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/testFixtures/TestIdeaKpmInstances.kt @@ -71,7 +71,7 @@ object TestIdeaKpmInstances { coordinates = simpleFragmentCoordinates ) - val simpleSourceDirectory = IdeaKpmSourceDirectoryImpl( + val simpleSourceDirectory = IdeaKpmContentRootImpl( file = File("myFile").absoluteFile, type = "myType" ) @@ -81,7 +81,7 @@ object TestIdeaKpmInstances { platforms = setOf(simpleJvmPlatform), languageSettings = simpleLanguageSettings, dependencies = listOf(simpleUnresolvedBinaryDependency, simpleResolvedBinaryDependency, simpleFragmentDependency), - sourceDirectories = listOf(simpleSourceDirectory), + contentRoots = listOf(simpleSourceDirectory), extras = emptyExtras() ) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmFragmentBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmFragmentBuilder.kt index f376e632d11..e3932a3e519 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmFragmentBuilder.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/ideaKpmFragmentBuilder.kt @@ -18,8 +18,8 @@ private fun IdeaKpmProjectBuildingContext.buildIdeaKpmFragment(fragment: GradleK platforms = fragment.containingVariants.map { variant -> IdeaKpmPlatform(variant) }.toSet(), languageSettings = IdeaKpmLanguageSettings(fragment.languageSettings), dependencies = dependencyResolver.resolve(fragment).toList(), - sourceDirectories = fragment.kotlinSourceRoots.sourceDirectories.files.map { file -> - IdeaKpmSourceDirectoryImpl(file, type = IdeaKpmSourceDirectory.SOURCE_TYPE) + contentRoots = fragment.kotlinSourceRoots.sourceDirectories.files.map { file -> + IdeaKpmContentRootImpl(file, type = IdeaKpmContentRoot.SOURCE_TYPE) }, extras = fragment.extras )