From cda82b47e0be293618f927c1b15172580a79a256 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Thu, 24 Nov 2022 14:59:30 +0100 Subject: [PATCH] [Gradle] Implement IdeaKotlinProjectArtifactDependency KT-55112 --- .../tcs/IdeaKotlinDependencyProto.java | 211 ++++ .../IdeaKotlinDependencyProtoOrBuilder.java | 15 + ...KotlinProjectArtifactCoordinatesProto.java | 759 +++++++++++++++ ...jectArtifactCoordinatesProtoOrBuilder.java | 41 + ...aKotlinProjectArtifactDependencyProto.java | 902 ++++++++++++++++++ ...ojectArtifactDependencyProtoOrBuilder.java | 55 ++ .../IdeaKotlinProjectCoordinatesProto.java | 889 +++++++++++++++++ ...otlinProjectCoordinatesProtoOrBuilder.java | 60 ++ .../tcs/IdeaKotlinSourceCoordinatesProto.java | 603 +++--------- ...KotlinSourceCoordinatesProtoOrBuilder.java | 58 +- .../idea/proto/generated/tcs/ProtoTcs.java | 144 ++- .../tcs/IdeaKotlinDependencyProtoKt.kt | 27 + ...KotlinProjectArtifactCoordinatesProtoKt.kt | 82 ++ ...aKotlinProjectArtifactDependencyProtoKt.kt | 111 +++ .../IdeaKotlinProjectCoordinatesProtoKt.kt | 101 ++ .../tcs/IdeaKotlinSourceCoordinatesProtoKt.kt | 85 +- .../idea/proto/tcs/IdeaKotlinDependency.kt | 9 +- .../IdeaKotlinProjectArtifactCoordinates.kt | 27 + .../IdeaKotlinProjectArtifactDependency.kt | 34 + .../proto/tcs/IdeaKotlinProjectCoordinates.kt | 27 + .../proto/tcs/IdeaKotlinSourceCoordinates.kt | 10 +- .../proto/tcs/IdeaKotlinSourceDependency.kt | 18 +- .../tcs/IdeaKotlinSourceDependencyType.kt | 30 + .../src/main/proto/proto_tcs.proto | 24 +- ...linDependencyBackwardsCompatibilityTest.kt | 13 + ...otlinDependencyForwardCompatibilityTest.kt | 15 +- .../IdeaKotlinDependencySerializationTest.kt | 5 + ...jectArtifactDependencySerializationTest.kt | 25 + ...otlinSourceCoordinatesSerializationTest.kt | 9 +- .../idea/tcs/IdeaKotlinBinaryDependency.kt | 9 +- .../tcs/IdeaKotlinDependencyCoordinates.kt | 23 +- .../IdeaKotlinProjectArtifactDependency.kt | 20 + .../idea/tcs/IdeaKotlinProjectCoordinates.kt | 22 + ...aKotlinProjectArtifactDependencyMatcher.kt | 27 + .../tcs/IdeaKotlinSourceDependencyMatcher.kt | 1 + .../tcs/TestIdeaKotlinInstances.kt | 22 +- .../tcs/ideaDependencyMatcherBuilders.kt | 11 +- .../ide/IdeMultiplatformImportFactory.kt | 2 +- .../IdeDependsOnDependencyResolver.kt | 11 +- ...JvmAndAndroidPlatformDependencyResolver.kt | 4 +- ...er.kt => IdePlatformDependencyResolver.kt} | 58 +- ...leMultiplatformSourceDependencyResolver.kt | 6 +- .../kotlin/gradle/plugin/ide/factories.kt | 36 +- .../jetbrains/kotlin/gradle/buildProject.kt | 6 +- ... => IdeDependsOnDependencyResolverTest.kt} | 13 +- ...IdePlatformBinaryDependencyResolverTest.kt | 12 +- .../ide/IdeResolveSourceDependenciesTest.kt | 166 +++- 47 files changed, 4090 insertions(+), 748 deletions(-) create mode 100644 libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactCoordinatesProto.java create mode 100644 libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactCoordinatesProtoOrBuilder.java create mode 100644 libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactDependencyProto.java create mode 100644 libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactDependencyProtoOrBuilder.java create mode 100644 libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectCoordinatesProto.java create mode 100644 libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectCoordinatesProtoOrBuilder.java create mode 100644 libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactCoordinatesProtoKt.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactDependencyProtoKt.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectCoordinatesProtoKt.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinProjectArtifactCoordinates.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinProjectArtifactDependency.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinProjectCoordinates.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinSourceDependencyType.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinProjectArtifactDependencySerializationTest.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectArtifactDependency.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-idea/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/tcs/IdeaKotlinProjectCoordinates.kt create mode 100644 libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/tcs/IdeaKotlinProjectArtifactDependencyMatcher.kt rename libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/{IdePlatformBinaryDependencyResolver.kt => IdePlatformDependencyResolver.kt} (80%) rename libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/{IdeMultiplatformResolveDependsOnDependenciesTest.kt => IdeDependsOnDependencyResolverTest.kt} (82%) diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinDependencyProto.java b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinDependencyProto.java index a65e714c890..31757d2b425 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinDependencyProto.java +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinDependencyProto.java @@ -51,6 +51,7 @@ private static final long serialVersionUID = 0L; SOURCE_DEPENDENCY(1), RESOLVED_BINARY_DEPENDENCY(2), UNRESOLVED_BINARY_DEPENDENCY(3), + PROJECT_ARTIFACT_DEPENDENCY(4), DEPENDENCY_NOT_SET(0); private final int value; private DependencyCase(int value) { @@ -71,6 +72,7 @@ private static final long serialVersionUID = 0L; case 1: return SOURCE_DEPENDENCY; case 2: return RESOLVED_BINARY_DEPENDENCY; case 3: return UNRESOLVED_BINARY_DEPENDENCY; + case 4: return PROJECT_ARTIFACT_DEPENDENCY; case 0: return DEPENDENCY_NOT_SET; default: return null; } @@ -179,6 +181,37 @@ private static final long serialVersionUID = 0L; return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinUnresolvedBinaryDependencyProto.getDefaultInstance(); } + public static final int PROJECT_ARTIFACT_DEPENDENCY_FIELD_NUMBER = 4; + /** + * .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto project_artifact_dependency = 4; + * @return Whether the projectArtifactDependency field is set. + */ + @java.lang.Override + public boolean hasProjectArtifactDependency() { + return dependencyCase_ == 4; + } + /** + * .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto project_artifact_dependency = 4; + * @return The projectArtifactDependency. + */ + @java.lang.Override + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto getProjectArtifactDependency() { + if (dependencyCase_ == 4) { + return (org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto) dependency_; + } + return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto.getDefaultInstance(); + } + /** + * .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto project_artifact_dependency = 4; + */ + @java.lang.Override + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProtoOrBuilder getProjectArtifactDependencyOrBuilder() { + if (dependencyCase_ == 4) { + return (org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto) dependency_; + } + return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto.getDefaultInstance(); + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -202,6 +235,9 @@ private static final long serialVersionUID = 0L; if (dependencyCase_ == 3) { output.writeMessage(3, (org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinUnresolvedBinaryDependencyProto) dependency_); } + if (dependencyCase_ == 4) { + output.writeMessage(4, (org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto) dependency_); + } getUnknownFields().writeTo(output); } @@ -223,6 +259,10 @@ private static final long serialVersionUID = 0L; size += com.google.protobuf.CodedOutputStream .computeMessageSize(3, (org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinUnresolvedBinaryDependencyProto) dependency_); } + if (dependencyCase_ == 4) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(4, (org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto) dependency_); + } size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; @@ -252,6 +292,10 @@ private static final long serialVersionUID = 0L; if (!getUnresolvedBinaryDependency() .equals(other.getUnresolvedBinaryDependency())) return false; break; + case 4: + if (!getProjectArtifactDependency() + .equals(other.getProjectArtifactDependency())) return false; + break; case 0: default: } @@ -279,6 +323,10 @@ private static final long serialVersionUID = 0L; hash = (37 * hash) + UNRESOLVED_BINARY_DEPENDENCY_FIELD_NUMBER; hash = (53 * hash) + getUnresolvedBinaryDependency().hashCode(); break; + case 4: + hash = (37 * hash) + PROJECT_ARTIFACT_DEPENDENCY_FIELD_NUMBER; + hash = (53 * hash) + getProjectArtifactDependency().hashCode(); + break; case 0: default: } @@ -419,6 +467,9 @@ private static final long serialVersionUID = 0L; if (unresolvedBinaryDependencyBuilder_ != null) { unresolvedBinaryDependencyBuilder_.clear(); } + if (projectArtifactDependencyBuilder_ != null) { + projectArtifactDependencyBuilder_.clear(); + } dependencyCase_ = 0; dependency_ = null; return this; @@ -468,6 +519,13 @@ private static final long serialVersionUID = 0L; result.dependency_ = unresolvedBinaryDependencyBuilder_.build(); } } + if (dependencyCase_ == 4) { + if (projectArtifactDependencyBuilder_ == null) { + result.dependency_ = dependency_; + } else { + result.dependency_ = projectArtifactDependencyBuilder_.build(); + } + } result.dependencyCase_ = dependencyCase_; onBuilt(); return result; @@ -530,6 +588,10 @@ private static final long serialVersionUID = 0L; mergeUnresolvedBinaryDependency(other.getUnresolvedBinaryDependency()); break; } + case PROJECT_ARTIFACT_DEPENDENCY: { + mergeProjectArtifactDependency(other.getProjectArtifactDependency()); + break; + } case DEPENDENCY_NOT_SET: { break; } @@ -581,6 +643,13 @@ private static final long serialVersionUID = 0L; dependencyCase_ = 3; break; } // case 26 + case 34: { + input.readMessage( + getProjectArtifactDependencyFieldBuilder().getBuilder(), + extensionRegistry); + dependencyCase_ = 4; + break; + } // case 34 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { done = true; // was an endgroup tag @@ -1037,6 +1106,148 @@ private static final long serialVersionUID = 0L; onChanged();; return unresolvedBinaryDependencyBuilder_; } + + private com.google.protobuf.SingleFieldBuilderV3< + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto.Builder, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProtoOrBuilder> projectArtifactDependencyBuilder_; + /** + * .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto project_artifact_dependency = 4; + * @return Whether the projectArtifactDependency field is set. + */ + @java.lang.Override + public boolean hasProjectArtifactDependency() { + return dependencyCase_ == 4; + } + /** + * .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto project_artifact_dependency = 4; + * @return The projectArtifactDependency. + */ + @java.lang.Override + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto getProjectArtifactDependency() { + if (projectArtifactDependencyBuilder_ == null) { + if (dependencyCase_ == 4) { + return (org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto) dependency_; + } + return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto.getDefaultInstance(); + } else { + if (dependencyCase_ == 4) { + return projectArtifactDependencyBuilder_.getMessage(); + } + return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto.getDefaultInstance(); + } + } + /** + * .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto project_artifact_dependency = 4; + */ + public Builder setProjectArtifactDependency(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto value) { + if (projectArtifactDependencyBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + dependency_ = value; + onChanged(); + } else { + projectArtifactDependencyBuilder_.setMessage(value); + } + dependencyCase_ = 4; + return this; + } + /** + * .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto project_artifact_dependency = 4; + */ + public Builder setProjectArtifactDependency( + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto.Builder builderForValue) { + if (projectArtifactDependencyBuilder_ == null) { + dependency_ = builderForValue.build(); + onChanged(); + } else { + projectArtifactDependencyBuilder_.setMessage(builderForValue.build()); + } + dependencyCase_ = 4; + return this; + } + /** + * .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto project_artifact_dependency = 4; + */ + public Builder mergeProjectArtifactDependency(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto value) { + if (projectArtifactDependencyBuilder_ == null) { + if (dependencyCase_ == 4 && + dependency_ != org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto.getDefaultInstance()) { + dependency_ = org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto.newBuilder((org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto) dependency_) + .mergeFrom(value).buildPartial(); + } else { + dependency_ = value; + } + onChanged(); + } else { + if (dependencyCase_ == 4) { + projectArtifactDependencyBuilder_.mergeFrom(value); + } else { + projectArtifactDependencyBuilder_.setMessage(value); + } + } + dependencyCase_ = 4; + return this; + } + /** + * .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto project_artifact_dependency = 4; + */ + public Builder clearProjectArtifactDependency() { + if (projectArtifactDependencyBuilder_ == null) { + if (dependencyCase_ == 4) { + dependencyCase_ = 0; + dependency_ = null; + onChanged(); + } + } else { + if (dependencyCase_ == 4) { + dependencyCase_ = 0; + dependency_ = null; + } + projectArtifactDependencyBuilder_.clear(); + } + return this; + } + /** + * .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto project_artifact_dependency = 4; + */ + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto.Builder getProjectArtifactDependencyBuilder() { + return getProjectArtifactDependencyFieldBuilder().getBuilder(); + } + /** + * .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto project_artifact_dependency = 4; + */ + @java.lang.Override + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProtoOrBuilder getProjectArtifactDependencyOrBuilder() { + if ((dependencyCase_ == 4) && (projectArtifactDependencyBuilder_ != null)) { + return projectArtifactDependencyBuilder_.getMessageOrBuilder(); + } else { + if (dependencyCase_ == 4) { + return (org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto) dependency_; + } + return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto.getDefaultInstance(); + } + } + /** + * .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto project_artifact_dependency = 4; + */ + private com.google.protobuf.SingleFieldBuilderV3< + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto.Builder, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProtoOrBuilder> + getProjectArtifactDependencyFieldBuilder() { + if (projectArtifactDependencyBuilder_ == null) { + if (!(dependencyCase_ == 4)) { + dependency_ = org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto.getDefaultInstance(); + } + projectArtifactDependencyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto.Builder, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProtoOrBuilder>( + (org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto) dependency_, + getParentForChildren(), + isClean()); + dependency_ = null; + } + dependencyCase_ = 4; + onChanged();; + return projectArtifactDependencyBuilder_; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinDependencyProtoOrBuilder.java b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinDependencyProtoOrBuilder.java index ecb5b81258c..94409e9f51c 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinDependencyProtoOrBuilder.java +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinDependencyProtoOrBuilder.java @@ -52,5 +52,20 @@ public interface IdeaKotlinDependencyProtoOrBuilder extends */ org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinUnresolvedBinaryDependencyProtoOrBuilder getUnresolvedBinaryDependencyOrBuilder(); + /** + * .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto project_artifact_dependency = 4; + * @return Whether the projectArtifactDependency field is set. + */ + boolean hasProjectArtifactDependency(); + /** + * .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto project_artifact_dependency = 4; + * @return The projectArtifactDependency. + */ + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto getProjectArtifactDependency(); + /** + * .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto project_artifact_dependency = 4; + */ + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProtoOrBuilder getProjectArtifactDependencyOrBuilder(); + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinDependencyProto.DependencyCase getDependencyCase(); } diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactCoordinatesProto.java b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactCoordinatesProto.java new file mode 100644 index 00000000000..8d51b9068b7 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactCoordinatesProto.java @@ -0,0 +1,759 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: proto_tcs.proto + +package org.jetbrains.kotlin.gradle.idea.proto.generated.tcs; + +/** + * Protobuf type {@code org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto} + */ +public final class IdeaKotlinProjectArtifactCoordinatesProto extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto) + IdeaKotlinProjectArtifactCoordinatesProtoOrBuilder { +private static final long serialVersionUID = 0L; + // Use IdeaKotlinProjectArtifactCoordinatesProto.newBuilder() to construct. + private IdeaKotlinProjectArtifactCoordinatesProto(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private IdeaKotlinProjectArtifactCoordinatesProto() { + artifactFile_ = ""; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new IdeaKotlinProjectArtifactCoordinatesProto(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ProtoTcs.internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactCoordinatesProto_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ProtoTcs.internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactCoordinatesProto_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.class, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.Builder.class); + } + + private int bitField0_; + public static final int PROJECT_FIELD_NUMBER = 1; + private org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project_; + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; + * @return Whether the project field is set. + */ + @java.lang.Override + public boolean hasProject() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; + * @return The project. + */ + @java.lang.Override + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto getProject() { + return project_ == null ? org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.getDefaultInstance() : project_; + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; + */ + @java.lang.Override + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProtoOrBuilder getProjectOrBuilder() { + return project_ == null ? org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.getDefaultInstance() : project_; + } + + public static final int ARTIFACT_FILE_FIELD_NUMBER = 2; + private volatile java.lang.Object artifactFile_; + /** + * optional string artifact_file = 2; + * @return Whether the artifactFile field is set. + */ + @java.lang.Override + public boolean hasArtifactFile() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * optional string artifact_file = 2; + * @return The artifactFile. + */ + @java.lang.Override + public java.lang.String getArtifactFile() { + java.lang.Object ref = artifactFile_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + artifactFile_ = s; + return s; + } + } + /** + * optional string artifact_file = 2; + * @return The bytes for artifactFile. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getArtifactFileBytes() { + java.lang.Object ref = artifactFile_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + artifactFile_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (((bitField0_ & 0x00000001) != 0)) { + output.writeMessage(1, getProject()); + } + if (((bitField0_ & 0x00000002) != 0)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, artifactFile_); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getProject()); + } + if (((bitField0_ & 0x00000002) != 0)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, artifactFile_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto)) { + return super.equals(obj); + } + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto other = (org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto) obj; + + if (hasProject() != other.hasProject()) return false; + if (hasProject()) { + if (!getProject() + .equals(other.getProject())) return false; + } + if (hasArtifactFile() != other.hasArtifactFile()) return false; + if (hasArtifactFile()) { + if (!getArtifactFile() + .equals(other.getArtifactFile())) return false; + } + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasProject()) { + hash = (37 * hash) + PROJECT_FIELD_NUMBER; + hash = (53 * hash) + getProject().hashCode(); + } + if (hasArtifactFile()) { + hash = (37 * hash) + ARTIFACT_FILE_FIELD_NUMBER; + hash = (53 * hash) + getArtifactFile().hashCode(); + } + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto) + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProtoOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ProtoTcs.internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactCoordinatesProto_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ProtoTcs.internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactCoordinatesProto_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.class, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.Builder.class); + } + + // Construct using org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getProjectFieldBuilder(); + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + if (projectBuilder_ == null) { + project_ = null; + } else { + projectBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000001); + artifactFile_ = ""; + bitField0_ = (bitField0_ & ~0x00000002); + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ProtoTcs.internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactCoordinatesProto_descriptor; + } + + @java.lang.Override + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto getDefaultInstanceForType() { + return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.getDefaultInstance(); + } + + @java.lang.Override + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto build() { + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto buildPartial() { + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto result = new org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) != 0)) { + if (projectBuilder_ == null) { + result.project_ = project_; + } else { + result.project_ = projectBuilder_.build(); + } + to_bitField0_ |= 0x00000001; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + to_bitField0_ |= 0x00000002; + } + result.artifactFile_ = artifactFile_; + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto) { + return mergeFrom((org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto other) { + if (other == org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.getDefaultInstance()) return this; + if (other.hasProject()) { + mergeProject(other.getProject()); + } + if (other.hasArtifactFile()) { + bitField0_ |= 0x00000002; + artifactFile_ = other.artifactFile_; + onChanged(); + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + input.readMessage( + getProjectFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + artifactFile_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000002; + break; + } // case 18 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + private int bitField0_; + + private org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project_; + private com.google.protobuf.SingleFieldBuilderV3< + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.Builder, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProtoOrBuilder> projectBuilder_; + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; + * @return Whether the project field is set. + */ + public boolean hasProject() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; + * @return The project. + */ + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto getProject() { + if (projectBuilder_ == null) { + return project_ == null ? org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.getDefaultInstance() : project_; + } else { + return projectBuilder_.getMessage(); + } + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; + */ + public Builder setProject(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto value) { + if (projectBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + project_ = value; + onChanged(); + } else { + projectBuilder_.setMessage(value); + } + bitField0_ |= 0x00000001; + return this; + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; + */ + public Builder setProject( + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.Builder builderForValue) { + if (projectBuilder_ == null) { + project_ = builderForValue.build(); + onChanged(); + } else { + projectBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000001; + return this; + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; + */ + public Builder mergeProject(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto value) { + if (projectBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0) && + project_ != null && + project_ != org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.getDefaultInstance()) { + project_ = + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.newBuilder(project_).mergeFrom(value).buildPartial(); + } else { + project_ = value; + } + onChanged(); + } else { + projectBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000001; + return this; + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; + */ + public Builder clearProject() { + if (projectBuilder_ == null) { + project_ = null; + onChanged(); + } else { + projectBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000001); + return this; + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; + */ + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.Builder getProjectBuilder() { + bitField0_ |= 0x00000001; + onChanged(); + return getProjectFieldBuilder().getBuilder(); + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; + */ + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProtoOrBuilder getProjectOrBuilder() { + if (projectBuilder_ != null) { + return projectBuilder_.getMessageOrBuilder(); + } else { + return project_ == null ? + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.getDefaultInstance() : project_; + } + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.Builder, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProtoOrBuilder> + getProjectFieldBuilder() { + if (projectBuilder_ == null) { + projectBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.Builder, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProtoOrBuilder>( + getProject(), + getParentForChildren(), + isClean()); + project_ = null; + } + return projectBuilder_; + } + + private java.lang.Object artifactFile_ = ""; + /** + * optional string artifact_file = 2; + * @return Whether the artifactFile field is set. + */ + public boolean hasArtifactFile() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * optional string artifact_file = 2; + * @return The artifactFile. + */ + public java.lang.String getArtifactFile() { + java.lang.Object ref = artifactFile_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + artifactFile_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * optional string artifact_file = 2; + * @return The bytes for artifactFile. + */ + public com.google.protobuf.ByteString + getArtifactFileBytes() { + java.lang.Object ref = artifactFile_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + artifactFile_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * optional string artifact_file = 2; + * @param value The artifactFile to set. + * @return This builder for chaining. + */ + public Builder setArtifactFile( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000002; + artifactFile_ = value; + onChanged(); + return this; + } + /** + * optional string artifact_file = 2; + * @return This builder for chaining. + */ + public Builder clearArtifactFile() { + bitField0_ = (bitField0_ & ~0x00000002); + artifactFile_ = getDefaultInstance().getArtifactFile(); + onChanged(); + return this; + } + /** + * optional string artifact_file = 2; + * @param value The bytes for artifactFile to set. + * @return This builder for chaining. + */ + public Builder setArtifactFileBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + bitField0_ |= 0x00000002; + artifactFile_ = value; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto) + } + + // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto) + private static final org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto(); + } + + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public IdeaKotlinProjectArtifactCoordinatesProto parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactCoordinatesProtoOrBuilder.java b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactCoordinatesProtoOrBuilder.java new file mode 100644 index 00000000000..499ba8681aa --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactCoordinatesProtoOrBuilder.java @@ -0,0 +1,41 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: proto_tcs.proto + +package org.jetbrains.kotlin.gradle.idea.proto.generated.tcs; + +public interface IdeaKotlinProjectArtifactCoordinatesProtoOrBuilder extends + // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto) + com.google.protobuf.MessageOrBuilder { + + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; + * @return Whether the project field is set. + */ + boolean hasProject(); + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; + * @return The project. + */ + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto getProject(); + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; + */ + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProtoOrBuilder getProjectOrBuilder(); + + /** + * optional string artifact_file = 2; + * @return Whether the artifactFile field is set. + */ + boolean hasArtifactFile(); + /** + * optional string artifact_file = 2; + * @return The artifactFile. + */ + java.lang.String getArtifactFile(); + /** + * optional string artifact_file = 2; + * @return The bytes for artifactFile. + */ + com.google.protobuf.ByteString + getArtifactFileBytes(); +} diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactDependencyProto.java b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactDependencyProto.java new file mode 100644 index 00000000000..47d2e8720cb --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactDependencyProto.java @@ -0,0 +1,902 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: proto_tcs.proto + +package org.jetbrains.kotlin.gradle.idea.proto.generated.tcs; + +/** + * Protobuf type {@code org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto} + */ +public final class IdeaKotlinProjectArtifactDependencyProto extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto) + IdeaKotlinProjectArtifactDependencyProtoOrBuilder { +private static final long serialVersionUID = 0L; + // Use IdeaKotlinProjectArtifactDependencyProto.newBuilder() to construct. + private IdeaKotlinProjectArtifactDependencyProto(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private IdeaKotlinProjectArtifactDependencyProto() { + type_ = 0; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new IdeaKotlinProjectArtifactDependencyProto(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ProtoTcs.internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactDependencyProto_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ProtoTcs.internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactDependencyProto_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto.class, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto.Builder.class); + } + + private int bitField0_; + public static final int EXTRAS_FIELD_NUMBER = 1; + private org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto extras_; + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto extras = 1; + * @return Whether the extras field is set. + */ + @java.lang.Override + public boolean hasExtras() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto extras = 1; + * @return The extras. + */ + @java.lang.Override + public org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto getExtras() { + return extras_ == null ? org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto.getDefaultInstance() : extras_; + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto extras = 1; + */ + @java.lang.Override + public org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProtoOrBuilder getExtrasOrBuilder() { + return extras_ == null ? org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto.getDefaultInstance() : extras_; + } + + public static final int TYPE_FIELD_NUMBER = 2; + private int type_; + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto.Type type = 2; + * @return Whether the type field is set. + */ + @java.lang.Override public boolean hasType() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto.Type type = 2; + * @return The enum numeric value on the wire for type. + */ + @java.lang.Override public int getTypeValue() { + return type_; + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto.Type type = 2; + * @return The type. + */ + @java.lang.Override public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto.Type getType() { + @SuppressWarnings("deprecation") + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto.Type result = org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto.Type.valueOf(type_); + return result == null ? org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto.Type.UNRECOGNIZED : result; + } + + public static final int COORDINATES_FIELD_NUMBER = 3; + private org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates_; + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3; + * @return Whether the coordinates field is set. + */ + @java.lang.Override + public boolean hasCoordinates() { + return ((bitField0_ & 0x00000004) != 0); + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3; + * @return The coordinates. + */ + @java.lang.Override + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto getCoordinates() { + return coordinates_ == null ? org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.getDefaultInstance() : coordinates_; + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3; + */ + @java.lang.Override + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProtoOrBuilder getCoordinatesOrBuilder() { + return coordinates_ == null ? org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.getDefaultInstance() : coordinates_; + } + + 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)) { + output.writeEnum(2, type_); + } + if (((bitField0_ & 0x00000004) != 0)) { + output.writeMessage(3, getCoordinates()); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getExtras()); + } + if (((bitField0_ & 0x00000002) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeEnumSize(2, type_); + } + if (((bitField0_ & 0x00000004) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(3, getCoordinates()); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto)) { + return super.equals(obj); + } + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto other = (org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto) obj; + + if (hasExtras() != other.hasExtras()) return false; + if (hasExtras()) { + if (!getExtras() + .equals(other.getExtras())) return false; + } + if (hasType() != other.hasType()) return false; + if (hasType()) { + if (type_ != other.type_) return false; + } + if (hasCoordinates() != other.hasCoordinates()) return false; + if (hasCoordinates()) { + if (!getCoordinates() + .equals(other.getCoordinates())) return false; + } + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasExtras()) { + hash = (37 * hash) + EXTRAS_FIELD_NUMBER; + hash = (53 * hash) + getExtras().hashCode(); + } + if (hasType()) { + hash = (37 * hash) + TYPE_FIELD_NUMBER; + hash = (53 * hash) + type_; + } + if (hasCoordinates()) { + hash = (37 * hash) + COORDINATES_FIELD_NUMBER; + hash = (53 * hash) + getCoordinates().hashCode(); + } + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto) + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProtoOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ProtoTcs.internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactDependencyProto_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ProtoTcs.internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactDependencyProto_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto.class, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto.Builder.class); + } + + // Construct using org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto.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(); + getCoordinatesFieldBuilder(); + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + if (extrasBuilder_ == null) { + extras_ = null; + } else { + extrasBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000001); + type_ = 0; + bitField0_ = (bitField0_ & ~0x00000002); + if (coordinatesBuilder_ == null) { + coordinates_ = null; + } else { + coordinatesBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000004); + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ProtoTcs.internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactDependencyProto_descriptor; + } + + @java.lang.Override + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto getDefaultInstanceForType() { + return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto.getDefaultInstance(); + } + + @java.lang.Override + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto build() { + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto buildPartial() { + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto result = new org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto(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.type_ = type_; + if (((from_bitField0_ & 0x00000004) != 0)) { + if (coordinatesBuilder_ == null) { + result.coordinates_ = coordinates_; + } else { + result.coordinates_ = coordinatesBuilder_.build(); + } + to_bitField0_ |= 0x00000004; + } + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto) { + return mergeFrom((org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto other) { + if (other == org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto.getDefaultInstance()) return this; + if (other.hasExtras()) { + mergeExtras(other.getExtras()); + } + if (other.hasType()) { + setType(other.getType()); + } + if (other.hasCoordinates()) { + mergeCoordinates(other.getCoordinates()); + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + input.readMessage( + getExtrasFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 16: { + type_ = input.readEnum(); + bitField0_ |= 0x00000002; + break; + } // case 16 + case 26: { + input.readMessage( + getCoordinatesFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000004; + break; + } // case 26 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + private int bitField0_; + + private org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto extras_; + private com.google.protobuf.SingleFieldBuilderV3< + org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto, org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto.Builder, org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProtoOrBuilder> extrasBuilder_; + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto extras = 1; + * @return Whether the extras field is set. + */ + public boolean hasExtras() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto extras = 1; + * @return The extras. + */ + public org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto getExtras() { + if (extrasBuilder_ == null) { + return extras_ == null ? org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto.getDefaultInstance() : extras_; + } else { + return extrasBuilder_.getMessage(); + } + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto extras = 1; + */ + public Builder setExtras(org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto 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.gradle.idea.proto.generated.IdeaExtrasProto extras = 1; + */ + public Builder setExtras( + org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto.Builder builderForValue) { + if (extrasBuilder_ == null) { + extras_ = builderForValue.build(); + onChanged(); + } else { + extrasBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000001; + return this; + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto extras = 1; + */ + public Builder mergeExtras(org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto value) { + if (extrasBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0) && + extras_ != null && + extras_ != org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto.getDefaultInstance()) { + extras_ = + org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto.newBuilder(extras_).mergeFrom(value).buildPartial(); + } else { + extras_ = value; + } + onChanged(); + } else { + extrasBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000001; + return this; + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto extras = 1; + */ + public Builder clearExtras() { + if (extrasBuilder_ == null) { + extras_ = null; + onChanged(); + } else { + extrasBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000001); + return this; + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto extras = 1; + */ + public org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto.Builder getExtrasBuilder() { + bitField0_ |= 0x00000001; + onChanged(); + return getExtrasFieldBuilder().getBuilder(); + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto extras = 1; + */ + public org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProtoOrBuilder getExtrasOrBuilder() { + if (extrasBuilder_ != null) { + return extrasBuilder_.getMessageOrBuilder(); + } else { + return extras_ == null ? + org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto.getDefaultInstance() : extras_; + } + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto extras = 1; + */ + private com.google.protobuf.SingleFieldBuilderV3< + org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto, org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto.Builder, org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProtoOrBuilder> + getExtrasFieldBuilder() { + if (extrasBuilder_ == null) { + extrasBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto, org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto.Builder, org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProtoOrBuilder>( + getExtras(), + getParentForChildren(), + isClean()); + extras_ = null; + } + return extrasBuilder_; + } + + private int type_ = 0; + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto.Type type = 2; + * @return Whether the type field is set. + */ + @java.lang.Override public boolean hasType() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto.Type type = 2; + * @return The enum numeric value on the wire for type. + */ + @java.lang.Override public int getTypeValue() { + return type_; + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto.Type type = 2; + * @param value The enum numeric value on the wire for type to set. + * @return This builder for chaining. + */ + public Builder setTypeValue(int value) { + bitField0_ |= 0x00000002; + type_ = value; + onChanged(); + return this; + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto.Type type = 2; + * @return The type. + */ + @java.lang.Override + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto.Type getType() { + @SuppressWarnings("deprecation") + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto.Type result = org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto.Type.valueOf(type_); + return result == null ? org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto.Type.UNRECOGNIZED : result; + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto.Type type = 2; + * @param value The type to set. + * @return This builder for chaining. + */ + public Builder setType(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto.Type value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000002; + type_ = value.getNumber(); + onChanged(); + return this; + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto.Type type = 2; + * @return This builder for chaining. + */ + public Builder clearType() { + bitField0_ = (bitField0_ & ~0x00000002); + type_ = 0; + onChanged(); + return this; + } + + private org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates_; + private com.google.protobuf.SingleFieldBuilderV3< + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.Builder, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProtoOrBuilder> coordinatesBuilder_; + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3; + * @return Whether the coordinates field is set. + */ + public boolean hasCoordinates() { + return ((bitField0_ & 0x00000004) != 0); + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3; + * @return The coordinates. + */ + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto getCoordinates() { + if (coordinatesBuilder_ == null) { + return coordinates_ == null ? org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.getDefaultInstance() : coordinates_; + } else { + return coordinatesBuilder_.getMessage(); + } + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3; + */ + public Builder setCoordinates(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto value) { + if (coordinatesBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + coordinates_ = value; + onChanged(); + } else { + coordinatesBuilder_.setMessage(value); + } + bitField0_ |= 0x00000004; + return this; + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3; + */ + public Builder setCoordinates( + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.Builder builderForValue) { + if (coordinatesBuilder_ == null) { + coordinates_ = builderForValue.build(); + onChanged(); + } else { + coordinatesBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000004; + return this; + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3; + */ + public Builder mergeCoordinates(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto value) { + if (coordinatesBuilder_ == null) { + if (((bitField0_ & 0x00000004) != 0) && + coordinates_ != null && + coordinates_ != org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.getDefaultInstance()) { + coordinates_ = + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.newBuilder(coordinates_).mergeFrom(value).buildPartial(); + } else { + coordinates_ = value; + } + onChanged(); + } else { + coordinatesBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000004; + return this; + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3; + */ + public Builder clearCoordinates() { + if (coordinatesBuilder_ == null) { + coordinates_ = null; + onChanged(); + } else { + coordinatesBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000004); + return this; + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3; + */ + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.Builder getCoordinatesBuilder() { + bitField0_ |= 0x00000004; + onChanged(); + return getCoordinatesFieldBuilder().getBuilder(); + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3; + */ + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProtoOrBuilder getCoordinatesOrBuilder() { + if (coordinatesBuilder_ != null) { + return coordinatesBuilder_.getMessageOrBuilder(); + } else { + return coordinates_ == null ? + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.getDefaultInstance() : coordinates_; + } + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3; + */ + private com.google.protobuf.SingleFieldBuilderV3< + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.Builder, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProtoOrBuilder> + getCoordinatesFieldBuilder() { + if (coordinatesBuilder_ == null) { + coordinatesBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.Builder, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProtoOrBuilder>( + getCoordinates(), + getParentForChildren(), + isClean()); + coordinates_ = null; + } + return coordinatesBuilder_; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto) + } + + // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto) + private static final org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto(); + } + + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public IdeaKotlinProjectArtifactDependencyProto parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactDependencyProtoOrBuilder.java b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactDependencyProtoOrBuilder.java new file mode 100644 index 00000000000..7fa116a77ff --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactDependencyProtoOrBuilder.java @@ -0,0 +1,55 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: proto_tcs.proto + +package org.jetbrains.kotlin.gradle.idea.proto.generated.tcs; + +public interface IdeaKotlinProjectArtifactDependencyProtoOrBuilder extends + // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto) + com.google.protobuf.MessageOrBuilder { + + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto extras = 1; + * @return Whether the extras field is set. + */ + boolean hasExtras(); + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto extras = 1; + * @return The extras. + */ + org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto getExtras(); + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto extras = 1; + */ + org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProtoOrBuilder getExtrasOrBuilder(); + + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto.Type type = 2; + * @return Whether the type field is set. + */ + boolean hasType(); + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto.Type type = 2; + * @return The enum numeric value on the wire for type. + */ + int getTypeValue(); + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto.Type type = 2; + * @return The type. + */ + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto.Type getType(); + + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3; + * @return Whether the coordinates field is set. + */ + boolean hasCoordinates(); + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3; + * @return The coordinates. + */ + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto getCoordinates(); + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3; + */ + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProtoOrBuilder getCoordinatesOrBuilder(); +} diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectCoordinatesProto.java b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectCoordinatesProto.java new file mode 100644 index 00000000000..dae8989cf25 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectCoordinatesProto.java @@ -0,0 +1,889 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: proto_tcs.proto + +package org.jetbrains.kotlin.gradle.idea.proto.generated.tcs; + +/** + * Protobuf type {@code org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto} + */ +public final class IdeaKotlinProjectCoordinatesProto extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto) + IdeaKotlinProjectCoordinatesProtoOrBuilder { +private static final long serialVersionUID = 0L; + // Use IdeaKotlinProjectCoordinatesProto.newBuilder() to construct. + private IdeaKotlinProjectCoordinatesProto(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private IdeaKotlinProjectCoordinatesProto() { + buildId_ = ""; + projectPath_ = ""; + projectName_ = ""; + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new IdeaKotlinProjectCoordinatesProto(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ProtoTcs.internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectCoordinatesProto_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ProtoTcs.internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectCoordinatesProto_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.class, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.Builder.class); + } + + private int bitField0_; + public static final int BUILD_ID_FIELD_NUMBER = 1; + private volatile java.lang.Object buildId_; + /** + * optional string build_id = 1; + * @return Whether the buildId field is set. + */ + @java.lang.Override + public boolean hasBuildId() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * optional string build_id = 1; + * @return The buildId. + */ + @java.lang.Override + public java.lang.String getBuildId() { + java.lang.Object ref = buildId_; + 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(); + buildId_ = s; + return s; + } + } + /** + * optional string build_id = 1; + * @return The bytes for buildId. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getBuildIdBytes() { + java.lang.Object ref = buildId_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + buildId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int PROJECT_PATH_FIELD_NUMBER = 2; + private volatile java.lang.Object projectPath_; + /** + * optional string project_path = 2; + * @return Whether the projectPath field is set. + */ + @java.lang.Override + public boolean hasProjectPath() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * optional string project_path = 2; + * @return The projectPath. + */ + @java.lang.Override + public java.lang.String getProjectPath() { + java.lang.Object ref = projectPath_; + 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(); + projectPath_ = s; + return s; + } + } + /** + * optional string project_path = 2; + * @return The bytes for projectPath. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getProjectPathBytes() { + java.lang.Object ref = projectPath_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + projectPath_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int PROJECT_NAME_FIELD_NUMBER = 3; + private volatile java.lang.Object projectName_; + /** + * optional string project_name = 3; + * @return Whether the projectName field is set. + */ + @java.lang.Override + public boolean hasProjectName() { + return ((bitField0_ & 0x00000004) != 0); + } + /** + * optional string project_name = 3; + * @return The projectName. + */ + @java.lang.Override + public java.lang.String getProjectName() { + java.lang.Object ref = projectName_; + 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(); + projectName_ = s; + return s; + } + } + /** + * optional string project_name = 3; + * @return The bytes for projectName. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getProjectNameBytes() { + java.lang.Object ref = projectName_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + projectName_ = 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)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, buildId_); + } + if (((bitField0_ & 0x00000002) != 0)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, projectPath_); + } + if (((bitField0_ & 0x00000004) != 0)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 3, projectName_); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) != 0)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, buildId_); + } + if (((bitField0_ & 0x00000002) != 0)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, projectPath_); + } + if (((bitField0_ & 0x00000004) != 0)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, projectName_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto)) { + return super.equals(obj); + } + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto other = (org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto) obj; + + if (hasBuildId() != other.hasBuildId()) return false; + if (hasBuildId()) { + if (!getBuildId() + .equals(other.getBuildId())) return false; + } + if (hasProjectPath() != other.hasProjectPath()) return false; + if (hasProjectPath()) { + if (!getProjectPath() + .equals(other.getProjectPath())) return false; + } + if (hasProjectName() != other.hasProjectName()) return false; + if (hasProjectName()) { + if (!getProjectName() + .equals(other.getProjectName())) return false; + } + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasBuildId()) { + hash = (37 * hash) + BUILD_ID_FIELD_NUMBER; + hash = (53 * hash) + getBuildId().hashCode(); + } + if (hasProjectPath()) { + hash = (37 * hash) + PROJECT_PATH_FIELD_NUMBER; + hash = (53 * hash) + getProjectPath().hashCode(); + } + if (hasProjectName()) { + hash = (37 * hash) + PROJECT_NAME_FIELD_NUMBER; + hash = (53 * hash) + getProjectName().hashCode(); + } + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto) + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProtoOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ProtoTcs.internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectCoordinatesProto_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ProtoTcs.internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectCoordinatesProto_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.class, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.Builder.class); + } + + // Construct using org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.newBuilder() + private Builder() { + + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + + } + @java.lang.Override + public Builder clear() { + super.clear(); + buildId_ = ""; + bitField0_ = (bitField0_ & ~0x00000001); + projectPath_ = ""; + bitField0_ = (bitField0_ & ~0x00000002); + projectName_ = ""; + bitField0_ = (bitField0_ & ~0x00000004); + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ProtoTcs.internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectCoordinatesProto_descriptor; + } + + @java.lang.Override + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto getDefaultInstanceForType() { + return org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.getDefaultInstance(); + } + + @java.lang.Override + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto build() { + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto buildPartial() { + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto result = new org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) != 0)) { + to_bitField0_ |= 0x00000001; + } + result.buildId_ = buildId_; + if (((from_bitField0_ & 0x00000002) != 0)) { + to_bitField0_ |= 0x00000002; + } + result.projectPath_ = projectPath_; + if (((from_bitField0_ & 0x00000004) != 0)) { + to_bitField0_ |= 0x00000004; + } + result.projectName_ = projectName_; + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto) { + return mergeFrom((org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto other) { + if (other == org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.getDefaultInstance()) return this; + if (other.hasBuildId()) { + bitField0_ |= 0x00000001; + buildId_ = other.buildId_; + onChanged(); + } + if (other.hasProjectPath()) { + bitField0_ |= 0x00000002; + projectPath_ = other.projectPath_; + onChanged(); + } + if (other.hasProjectName()) { + bitField0_ |= 0x00000004; + projectName_ = other.projectName_; + onChanged(); + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + buildId_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + projectPath_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000002; + break; + } // case 18 + case 26: { + projectName_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000004; + break; + } // case 26 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + private int bitField0_; + + private java.lang.Object buildId_ = ""; + /** + * optional string build_id = 1; + * @return Whether the buildId field is set. + */ + public boolean hasBuildId() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * optional string build_id = 1; + * @return The buildId. + */ + public java.lang.String getBuildId() { + java.lang.Object ref = buildId_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + buildId_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * optional string build_id = 1; + * @return The bytes for buildId. + */ + public com.google.protobuf.ByteString + getBuildIdBytes() { + java.lang.Object ref = buildId_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + buildId_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * optional string build_id = 1; + * @param value The buildId to set. + * @return This builder for chaining. + */ + public Builder setBuildId( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; + buildId_ = value; + onChanged(); + return this; + } + /** + * optional string build_id = 1; + * @return This builder for chaining. + */ + public Builder clearBuildId() { + bitField0_ = (bitField0_ & ~0x00000001); + buildId_ = getDefaultInstance().getBuildId(); + onChanged(); + return this; + } + /** + * optional string build_id = 1; + * @param value The bytes for buildId to set. + * @return This builder for chaining. + */ + public Builder setBuildIdBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + bitField0_ |= 0x00000001; + buildId_ = value; + onChanged(); + return this; + } + + private java.lang.Object projectPath_ = ""; + /** + * optional string project_path = 2; + * @return Whether the projectPath field is set. + */ + public boolean hasProjectPath() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * optional string project_path = 2; + * @return The projectPath. + */ + public java.lang.String getProjectPath() { + java.lang.Object ref = projectPath_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + projectPath_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * optional string project_path = 2; + * @return The bytes for projectPath. + */ + public com.google.protobuf.ByteString + getProjectPathBytes() { + java.lang.Object ref = projectPath_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + projectPath_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * optional string project_path = 2; + * @param value The projectPath to set. + * @return This builder for chaining. + */ + public Builder setProjectPath( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000002; + projectPath_ = value; + onChanged(); + return this; + } + /** + * optional string project_path = 2; + * @return This builder for chaining. + */ + public Builder clearProjectPath() { + bitField0_ = (bitField0_ & ~0x00000002); + projectPath_ = getDefaultInstance().getProjectPath(); + onChanged(); + return this; + } + /** + * optional string project_path = 2; + * @param value The bytes for projectPath to set. + * @return This builder for chaining. + */ + public Builder setProjectPathBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + bitField0_ |= 0x00000002; + projectPath_ = value; + onChanged(); + return this; + } + + private java.lang.Object projectName_ = ""; + /** + * optional string project_name = 3; + * @return Whether the projectName field is set. + */ + public boolean hasProjectName() { + return ((bitField0_ & 0x00000004) != 0); + } + /** + * optional string project_name = 3; + * @return The projectName. + */ + public java.lang.String getProjectName() { + java.lang.Object ref = projectName_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + projectName_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * optional string project_name = 3; + * @return The bytes for projectName. + */ + public com.google.protobuf.ByteString + getProjectNameBytes() { + java.lang.Object ref = projectName_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + projectName_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * optional string project_name = 3; + * @param value The projectName to set. + * @return This builder for chaining. + */ + public Builder setProjectName( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000004; + projectName_ = value; + onChanged(); + return this; + } + /** + * optional string project_name = 3; + * @return This builder for chaining. + */ + public Builder clearProjectName() { + bitField0_ = (bitField0_ & ~0x00000004); + projectName_ = getDefaultInstance().getProjectName(); + onChanged(); + return this; + } + /** + * optional string project_name = 3; + * @param value The bytes for projectName to set. + * @return This builder for chaining. + */ + public Builder setProjectNameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + bitField0_ |= 0x00000004; + projectName_ = value; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto) + } + + // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto) + private static final org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto(); + } + + public static org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public IdeaKotlinProjectCoordinatesProto parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + +} + diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectCoordinatesProtoOrBuilder.java b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectCoordinatesProtoOrBuilder.java new file mode 100644 index 00000000000..ecfbd3122c4 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectCoordinatesProtoOrBuilder.java @@ -0,0 +1,60 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: proto_tcs.proto + +package org.jetbrains.kotlin.gradle.idea.proto.generated.tcs; + +public interface IdeaKotlinProjectCoordinatesProtoOrBuilder extends + // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto) + com.google.protobuf.MessageOrBuilder { + + /** + * optional string build_id = 1; + * @return Whether the buildId field is set. + */ + boolean hasBuildId(); + /** + * optional string build_id = 1; + * @return The buildId. + */ + java.lang.String getBuildId(); + /** + * optional string build_id = 1; + * @return The bytes for buildId. + */ + com.google.protobuf.ByteString + getBuildIdBytes(); + + /** + * optional string project_path = 2; + * @return Whether the projectPath field is set. + */ + boolean hasProjectPath(); + /** + * optional string project_path = 2; + * @return The projectPath. + */ + java.lang.String getProjectPath(); + /** + * optional string project_path = 2; + * @return The bytes for projectPath. + */ + com.google.protobuf.ByteString + getProjectPathBytes(); + + /** + * optional string project_name = 3; + * @return Whether the projectName field is set. + */ + boolean hasProjectName(); + /** + * optional string project_name = 3; + * @return The projectName. + */ + java.lang.String getProjectName(); + /** + * optional string project_name = 3; + * @return The bytes for projectName. + */ + com.google.protobuf.ByteString + getProjectNameBytes(); +} diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinSourceCoordinatesProto.java b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinSourceCoordinatesProto.java index 7ef9a7da0c0..b7173570c70 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinSourceCoordinatesProto.java +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinSourceCoordinatesProto.java @@ -16,9 +16,6 @@ private static final long serialVersionUID = 0L; super(builder); } private IdeaKotlinSourceCoordinatesProto() { - buildId_ = ""; - projectPath_ = ""; - projectName_ = ""; sourceSetName_ = ""; } @@ -48,156 +45,44 @@ private static final long serialVersionUID = 0L; } private int bitField0_; - public static final int BUILD_ID_FIELD_NUMBER = 1; - private volatile java.lang.Object buildId_; + public static final int PROJECT_FIELD_NUMBER = 1; + private org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project_; /** - * optional string build_id = 1; - * @return Whether the buildId field is set. + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; + * @return Whether the project field is set. */ @java.lang.Override - public boolean hasBuildId() { + public boolean hasProject() { return ((bitField0_ & 0x00000001) != 0); } /** - * optional string build_id = 1; - * @return The buildId. + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; + * @return The project. */ @java.lang.Override - public java.lang.String getBuildId() { - java.lang.Object ref = buildId_; - 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(); - buildId_ = s; - return s; - } + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto getProject() { + return project_ == null ? org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.getDefaultInstance() : project_; } /** - * optional string build_id = 1; - * @return The bytes for buildId. + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; */ @java.lang.Override - public com.google.protobuf.ByteString - getBuildIdBytes() { - java.lang.Object ref = buildId_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - buildId_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProtoOrBuilder getProjectOrBuilder() { + return project_ == null ? org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.getDefaultInstance() : project_; } - public static final int PROJECT_PATH_FIELD_NUMBER = 2; - private volatile java.lang.Object projectPath_; - /** - * optional string project_path = 2; - * @return Whether the projectPath field is set. - */ - @java.lang.Override - public boolean hasProjectPath() { - return ((bitField0_ & 0x00000002) != 0); - } - /** - * optional string project_path = 2; - * @return The projectPath. - */ - @java.lang.Override - public java.lang.String getProjectPath() { - java.lang.Object ref = projectPath_; - 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(); - projectPath_ = s; - return s; - } - } - /** - * optional string project_path = 2; - * @return The bytes for projectPath. - */ - @java.lang.Override - public com.google.protobuf.ByteString - getProjectPathBytes() { - java.lang.Object ref = projectPath_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - projectPath_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - public static final int PROJECT_NAME_FIELD_NUMBER = 3; - private volatile java.lang.Object projectName_; - /** - * optional string project_name = 3; - * @return Whether the projectName field is set. - */ - @java.lang.Override - public boolean hasProjectName() { - return ((bitField0_ & 0x00000004) != 0); - } - /** - * optional string project_name = 3; - * @return The projectName. - */ - @java.lang.Override - public java.lang.String getProjectName() { - java.lang.Object ref = projectName_; - 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(); - projectName_ = s; - return s; - } - } - /** - * optional string project_name = 3; - * @return The bytes for projectName. - */ - @java.lang.Override - public com.google.protobuf.ByteString - getProjectNameBytes() { - java.lang.Object ref = projectName_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - projectName_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - public static final int SOURCE_SET_NAME_FIELD_NUMBER = 4; + public static final int SOURCE_SET_NAME_FIELD_NUMBER = 2; private volatile java.lang.Object sourceSetName_; /** - * optional string source_set_name = 4; + * optional string source_set_name = 2; * @return Whether the sourceSetName field is set. */ @java.lang.Override public boolean hasSourceSetName() { - return ((bitField0_ & 0x00000008) != 0); + return ((bitField0_ & 0x00000002) != 0); } /** - * optional string source_set_name = 4; + * optional string source_set_name = 2; * @return The sourceSetName. */ @java.lang.Override @@ -214,7 +99,7 @@ private static final long serialVersionUID = 0L; } } /** - * optional string source_set_name = 4; + * optional string source_set_name = 2; * @return The bytes for sourceSetName. */ @java.lang.Override @@ -247,16 +132,10 @@ private static final long serialVersionUID = 0L; public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) != 0)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 1, buildId_); + output.writeMessage(1, getProject()); } if (((bitField0_ & 0x00000002) != 0)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 2, projectPath_); - } - if (((bitField0_ & 0x00000004) != 0)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 3, projectName_); - } - if (((bitField0_ & 0x00000008) != 0)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 4, sourceSetName_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, sourceSetName_); } getUnknownFields().writeTo(output); } @@ -268,16 +147,11 @@ private static final long serialVersionUID = 0L; size = 0; if (((bitField0_ & 0x00000001) != 0)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, buildId_); + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getProject()); } if (((bitField0_ & 0x00000002) != 0)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, projectPath_); - } - if (((bitField0_ & 0x00000004) != 0)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, projectName_); - } - if (((bitField0_ & 0x00000008) != 0)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, sourceSetName_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, sourceSetName_); } size += getUnknownFields().getSerializedSize(); memoizedSize = size; @@ -294,20 +168,10 @@ private static final long serialVersionUID = 0L; } org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceCoordinatesProto other = (org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceCoordinatesProto) obj; - if (hasBuildId() != other.hasBuildId()) return false; - if (hasBuildId()) { - if (!getBuildId() - .equals(other.getBuildId())) return false; - } - if (hasProjectPath() != other.hasProjectPath()) return false; - if (hasProjectPath()) { - if (!getProjectPath() - .equals(other.getProjectPath())) return false; - } - if (hasProjectName() != other.hasProjectName()) return false; - if (hasProjectName()) { - if (!getProjectName() - .equals(other.getProjectName())) return false; + if (hasProject() != other.hasProject()) return false; + if (hasProject()) { + if (!getProject() + .equals(other.getProject())) return false; } if (hasSourceSetName() != other.hasSourceSetName()) return false; if (hasSourceSetName()) { @@ -325,17 +189,9 @@ private static final long serialVersionUID = 0L; } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (hasBuildId()) { - hash = (37 * hash) + BUILD_ID_FIELD_NUMBER; - hash = (53 * hash) + getBuildId().hashCode(); - } - if (hasProjectPath()) { - hash = (37 * hash) + PROJECT_PATH_FIELD_NUMBER; - hash = (53 * hash) + getProjectPath().hashCode(); - } - if (hasProjectName()) { - hash = (37 * hash) + PROJECT_NAME_FIELD_NUMBER; - hash = (53 * hash) + getProjectName().hashCode(); + if (hasProject()) { + hash = (37 * hash) + PROJECT_FIELD_NUMBER; + hash = (53 * hash) + getProject().hashCode(); } if (hasSourceSetName()) { hash = (37 * hash) + SOURCE_SET_NAME_FIELD_NUMBER; @@ -458,25 +314,31 @@ private static final long serialVersionUID = 0L; // Construct using org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceCoordinatesProto.newBuilder() private Builder() { - + maybeForceBuilderInitialization(); } private Builder( com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + getProjectFieldBuilder(); + } } @java.lang.Override public Builder clear() { super.clear(); - buildId_ = ""; + if (projectBuilder_ == null) { + project_ = null; + } else { + projectBuilder_.clear(); + } bitField0_ = (bitField0_ & ~0x00000001); - projectPath_ = ""; - bitField0_ = (bitField0_ & ~0x00000002); - projectName_ = ""; - bitField0_ = (bitField0_ & ~0x00000004); sourceSetName_ = ""; - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -506,20 +368,16 @@ private static final long serialVersionUID = 0L; int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) != 0)) { + if (projectBuilder_ == null) { + result.project_ = project_; + } else { + result.project_ = projectBuilder_.build(); + } to_bitField0_ |= 0x00000001; } - result.buildId_ = buildId_; if (((from_bitField0_ & 0x00000002) != 0)) { to_bitField0_ |= 0x00000002; } - result.projectPath_ = projectPath_; - if (((from_bitField0_ & 0x00000004) != 0)) { - to_bitField0_ |= 0x00000004; - } - result.projectName_ = projectName_; - if (((from_bitField0_ & 0x00000008) != 0)) { - to_bitField0_ |= 0x00000008; - } result.sourceSetName_ = sourceSetName_; result.bitField0_ = to_bitField0_; onBuilt(); @@ -570,23 +428,11 @@ private static final long serialVersionUID = 0L; public Builder mergeFrom(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceCoordinatesProto other) { if (other == org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceCoordinatesProto.getDefaultInstance()) return this; - if (other.hasBuildId()) { - bitField0_ |= 0x00000001; - buildId_ = other.buildId_; - onChanged(); - } - if (other.hasProjectPath()) { - bitField0_ |= 0x00000002; - projectPath_ = other.projectPath_; - onChanged(); - } - if (other.hasProjectName()) { - bitField0_ |= 0x00000004; - projectName_ = other.projectName_; - onChanged(); + if (other.hasProject()) { + mergeProject(other.getProject()); } if (other.hasSourceSetName()) { - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; sourceSetName_ = other.sourceSetName_; onChanged(); } @@ -617,25 +463,17 @@ private static final long serialVersionUID = 0L; done = true; break; case 10: { - buildId_ = input.readStringRequireUtf8(); + input.readMessage( + getProjectFieldBuilder().getBuilder(), + extensionRegistry); bitField0_ |= 0x00000001; break; } // case 10 case 18: { - projectPath_ = input.readStringRequireUtf8(); + sourceSetName_ = input.readStringRequireUtf8(); bitField0_ |= 0x00000002; break; } // case 18 - case 26: { - projectName_ = input.readStringRequireUtf8(); - bitField0_ |= 0x00000004; - break; - } // case 26 - case 34: { - sourceSetName_ = input.readStringRequireUtf8(); - bitField0_ |= 0x00000008; - break; - } // case 34 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { done = true; // was an endgroup tag @@ -653,265 +491,136 @@ private static final long serialVersionUID = 0L; } private int bitField0_; - private java.lang.Object buildId_ = ""; + private org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project_; + private com.google.protobuf.SingleFieldBuilderV3< + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.Builder, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProtoOrBuilder> projectBuilder_; /** - * optional string build_id = 1; - * @return Whether the buildId field is set. + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; + * @return Whether the project field is set. */ - public boolean hasBuildId() { + public boolean hasProject() { return ((bitField0_ & 0x00000001) != 0); } /** - * optional string build_id = 1; - * @return The buildId. + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; + * @return The project. */ - public java.lang.String getBuildId() { - java.lang.Object ref = buildId_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - buildId_ = s; - return s; + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto getProject() { + if (projectBuilder_ == null) { + return project_ == null ? org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.getDefaultInstance() : project_; } else { - return (java.lang.String) ref; + return projectBuilder_.getMessage(); } } /** - * optional string build_id = 1; - * @return The bytes for buildId. + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; */ - public com.google.protobuf.ByteString - getBuildIdBytes() { - java.lang.Object ref = buildId_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - buildId_ = b; - return b; + public Builder setProject(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto value) { + if (projectBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + project_ = value; + onChanged(); } else { - return (com.google.protobuf.ByteString) ref; + projectBuilder_.setMessage(value); } - } - /** - * optional string build_id = 1; - * @param value The buildId to set. - * @return This builder for chaining. - */ - public Builder setBuildId( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - buildId_ = value; - onChanged(); - return this; - } - /** - * optional string build_id = 1; - * @return This builder for chaining. - */ - public Builder clearBuildId() { - bitField0_ = (bitField0_ & ~0x00000001); - buildId_ = getDefaultInstance().getBuildId(); - onChanged(); - return this; - } - /** - * optional string build_id = 1; - * @param value The bytes for buildId to set. - * @return This builder for chaining. - */ - public Builder setBuildIdBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); bitField0_ |= 0x00000001; - buildId_ = value; - onChanged(); return this; } - - private java.lang.Object projectPath_ = ""; /** - * optional string project_path = 2; - * @return Whether the projectPath field is set. + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; */ - public boolean hasProjectPath() { - return ((bitField0_ & 0x00000002) != 0); + public Builder setProject( + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.Builder builderForValue) { + if (projectBuilder_ == null) { + project_ = builderForValue.build(); + onChanged(); + } else { + projectBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000001; + return this; } /** - * optional string project_path = 2; - * @return The projectPath. + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; */ - public java.lang.String getProjectPath() { - java.lang.Object ref = projectPath_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - projectPath_ = s; - return s; + public Builder mergeProject(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto value) { + if (projectBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0) && + project_ != null && + project_ != org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.getDefaultInstance()) { + project_ = + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.newBuilder(project_).mergeFrom(value).buildPartial(); + } else { + project_ = value; + } + onChanged(); } else { - return (java.lang.String) ref; + projectBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000001; + return this; + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; + */ + public Builder clearProject() { + if (projectBuilder_ == null) { + project_ = null; + onChanged(); + } else { + projectBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000001); + return this; + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; + */ + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.Builder getProjectBuilder() { + bitField0_ |= 0x00000001; + onChanged(); + return getProjectFieldBuilder().getBuilder(); + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; + */ + public org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProtoOrBuilder getProjectOrBuilder() { + if (projectBuilder_ != null) { + return projectBuilder_.getMessageOrBuilder(); + } else { + return project_ == null ? + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.getDefaultInstance() : project_; } } /** - * optional string project_path = 2; - * @return The bytes for projectPath. + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; */ - public com.google.protobuf.ByteString - getProjectPathBytes() { - java.lang.Object ref = projectPath_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - projectPath_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; + private com.google.protobuf.SingleFieldBuilderV3< + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.Builder, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProtoOrBuilder> + getProjectFieldBuilder() { + if (projectBuilder_ == null) { + projectBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.Builder, org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProtoOrBuilder>( + getProject(), + getParentForChildren(), + isClean()); + project_ = null; } - } - /** - * optional string project_path = 2; - * @param value The projectPath to set. - * @return This builder for chaining. - */ - public Builder setProjectPath( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; - projectPath_ = value; - onChanged(); - return this; - } - /** - * optional string project_path = 2; - * @return This builder for chaining. - */ - public Builder clearProjectPath() { - bitField0_ = (bitField0_ & ~0x00000002); - projectPath_ = getDefaultInstance().getProjectPath(); - onChanged(); - return this; - } - /** - * optional string project_path = 2; - * @param value The bytes for projectPath to set. - * @return This builder for chaining. - */ - public Builder setProjectPathBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - bitField0_ |= 0x00000002; - projectPath_ = value; - onChanged(); - return this; - } - - private java.lang.Object projectName_ = ""; - /** - * optional string project_name = 3; - * @return Whether the projectName field is set. - */ - public boolean hasProjectName() { - return ((bitField0_ & 0x00000004) != 0); - } - /** - * optional string project_name = 3; - * @return The projectName. - */ - public java.lang.String getProjectName() { - java.lang.Object ref = projectName_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - projectName_ = s; - return s; - } else { - return (java.lang.String) ref; - } - } - /** - * optional string project_name = 3; - * @return The bytes for projectName. - */ - public com.google.protobuf.ByteString - getProjectNameBytes() { - java.lang.Object ref = projectName_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - projectName_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * optional string project_name = 3; - * @param value The projectName to set. - * @return This builder for chaining. - */ - public Builder setProjectName( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000004; - projectName_ = value; - onChanged(); - return this; - } - /** - * optional string project_name = 3; - * @return This builder for chaining. - */ - public Builder clearProjectName() { - bitField0_ = (bitField0_ & ~0x00000004); - projectName_ = getDefaultInstance().getProjectName(); - onChanged(); - return this; - } - /** - * optional string project_name = 3; - * @param value The bytes for projectName to set. - * @return This builder for chaining. - */ - public Builder setProjectNameBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - bitField0_ |= 0x00000004; - projectName_ = value; - onChanged(); - return this; + return projectBuilder_; } private java.lang.Object sourceSetName_ = ""; /** - * optional string source_set_name = 4; + * optional string source_set_name = 2; * @return Whether the sourceSetName field is set. */ public boolean hasSourceSetName() { - return ((bitField0_ & 0x00000008) != 0); + return ((bitField0_ & 0x00000002) != 0); } /** - * optional string source_set_name = 4; + * optional string source_set_name = 2; * @return The sourceSetName. */ public java.lang.String getSourceSetName() { @@ -927,7 +636,7 @@ private static final long serialVersionUID = 0L; } } /** - * optional string source_set_name = 4; + * optional string source_set_name = 2; * @return The bytes for sourceSetName. */ public com.google.protobuf.ByteString @@ -944,7 +653,7 @@ private static final long serialVersionUID = 0L; } } /** - * optional string source_set_name = 4; + * optional string source_set_name = 2; * @param value The sourceSetName to set. * @return This builder for chaining. */ @@ -953,23 +662,23 @@ private static final long serialVersionUID = 0L; if (value == null) { throw new NullPointerException(); } - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; sourceSetName_ = value; onChanged(); return this; } /** - * optional string source_set_name = 4; + * optional string source_set_name = 2; * @return This builder for chaining. */ public Builder clearSourceSetName() { - bitField0_ = (bitField0_ & ~0x00000008); + bitField0_ = (bitField0_ & ~0x00000002); sourceSetName_ = getDefaultInstance().getSourceSetName(); onChanged(); return this; } /** - * optional string source_set_name = 4; + * optional string source_set_name = 2; * @param value The bytes for sourceSetName to set. * @return This builder for chaining. */ @@ -979,7 +688,7 @@ private static final long serialVersionUID = 0L; throw new NullPointerException(); } checkByteStringIsUtf8(value); - bitField0_ |= 0x00000008; + bitField0_ |= 0x00000002; sourceSetName_ = value; onChanged(); return this; diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinSourceCoordinatesProtoOrBuilder.java b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinSourceCoordinatesProtoOrBuilder.java index 28c8204fc92..94b942cca77 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinSourceCoordinatesProtoOrBuilder.java +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinSourceCoordinatesProtoOrBuilder.java @@ -8,68 +8,32 @@ public interface IdeaKotlinSourceCoordinatesProtoOrBuilder extends com.google.protobuf.MessageOrBuilder { /** - * optional string build_id = 1; - * @return Whether the buildId field is set. + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; + * @return Whether the project field is set. */ - boolean hasBuildId(); + boolean hasProject(); /** - * optional string build_id = 1; - * @return The buildId. + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; + * @return The project. */ - java.lang.String getBuildId(); + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto getProject(); /** - * optional string build_id = 1; - * @return The bytes for buildId. + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; */ - com.google.protobuf.ByteString - getBuildIdBytes(); + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProtoOrBuilder getProjectOrBuilder(); /** - * optional string project_path = 2; - * @return Whether the projectPath field is set. - */ - boolean hasProjectPath(); - /** - * optional string project_path = 2; - * @return The projectPath. - */ - java.lang.String getProjectPath(); - /** - * optional string project_path = 2; - * @return The bytes for projectPath. - */ - com.google.protobuf.ByteString - getProjectPathBytes(); - - /** - * optional string project_name = 3; - * @return Whether the projectName field is set. - */ - boolean hasProjectName(); - /** - * optional string project_name = 3; - * @return The projectName. - */ - java.lang.String getProjectName(); - /** - * optional string project_name = 3; - * @return The bytes for projectName. - */ - com.google.protobuf.ByteString - getProjectNameBytes(); - - /** - * optional string source_set_name = 4; + * optional string source_set_name = 2; * @return Whether the sourceSetName field is set. */ boolean hasSourceSetName(); /** - * optional string source_set_name = 4; + * optional string source_set_name = 2; * @return The sourceSetName. */ java.lang.String getSourceSetName(); /** - * optional string source_set_name = 4; + * optional string source_set_name = 2; * @return The bytes for sourceSetName. */ com.google.protobuf.ByteString diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/ProtoTcs.java b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/ProtoTcs.java index ca41dea8634..0b5263c6e7c 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/ProtoTcs.java +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/java/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/ProtoTcs.java @@ -34,6 +34,16 @@ public final class ProtoTcs { static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinResolvedBinaryDependencyProto_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactDependencyProto_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactDependencyProto_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectCoordinatesProto_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectCoordinatesProto_fieldAccessorTable; static final com.google.protobuf.Descriptors.Descriptor internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinBinaryCoordinatesProto_descriptor; static final @@ -44,6 +54,11 @@ public final class ProtoTcs { static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinSourceCoordinatesProto_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactCoordinatesProto_descriptor; + static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactCoordinatesProto_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -55,7 +70,7 @@ public final class ProtoTcs { java.lang.String[] descriptorData = { "\n\017proto_tcs.proto\0224org.jetbrains.kotlin." + "gradle.idea.proto.generated.tcs\032\022proto_e" + - "xtras.proto\"\255\003\n\031IdeaKotlinDependencyProt" + + "xtras.proto\"\265\004\n\031IdeaKotlinDependencyProt" + "o\022r\n\021source_dependency\030\001 \001(\0132U.org.jetbr" + "ains.kotlin.gradle.idea.proto.generated." + "tcs.IdeaKotlinSourceDependencyProtoH\000\022\203\001" + @@ -65,45 +80,68 @@ public final class ProtoTcs { "encyProtoH\000\022\207\001\n\034unresolved_binary_depend" + "ency\030\003 \001(\0132_.org.jetbrains.kotlin.gradle" + ".idea.proto.generated.tcs.IdeaKotlinUnre" + - "solvedBinaryDependencyProtoH\000B\014\n\ndepende" + - "ncy\"\257\003\n\037IdeaKotlinSourceDependencyProto\022" + - "V\n\006extras\030\001 \001(\0132A.org.jetbrains.kotlin.g" + - "radle.idea.proto.generated.IdeaExtrasPro" + - "toH\000\210\001\001\022m\n\004type\030\002 \001(\0162Z.org.jetbrains.ko" + - "tlin.gradle.idea.proto.generated.tcs.Ide" + - "aKotlinSourceDependencyProto.TypeH\001\210\001\001\022p" + - "\n\013coordinates\030\003 \001(\0132V.org.jetbrains.kotl" + - "in.gradle.idea.proto.generated.tcs.IdeaK" + - "otlinSourceCoordinatesProtoH\002\210\001\001\"/\n\004Type" + - "\022\013\n\007REGULAR\020\000\022\n\n\006FRIEND\020\001\022\016\n\nDEPENDS_ON\020" + - "\002B\t\n\007_extrasB\007\n\005_typeB\016\n\014_coordinates\"\256\002" + - "\n)IdeaKotlinUnresolvedBinaryDependencyPr" + - "oto\022V\n\006extras\030\001 \001(\0132A.org.jetbrains.kotl" + - "in.gradle.idea.proto.generated.IdeaExtra" + - "sProtoH\000\210\001\001\022p\n\013coordinates\030\002 \001(\0132V.org.j" + - "etbrains.kotlin.gradle.idea.proto.genera" + - "ted.tcs.IdeaKotlinBinaryCoordinatesProto" + - "H\001\210\001\001\022\022\n\005cause\030\003 \001(\tH\002\210\001\001B\t\n\007_extrasB\016\n\014" + - "_coordinatesB\010\n\006_cause\"\342\002\n\'IdeaKotlinRes" + - "olvedBinaryDependencyProto\022V\n\006extras\030\001 \001" + - "(\0132A.org.jetbrains.kotlin.gradle.idea.pr" + - "oto.generated.IdeaExtrasProtoH\000\210\001\001\022p\n\013co" + - "ordinates\030\002 \001(\0132V.org.jetbrains.kotlin.g" + - "radle.idea.proto.generated.tcs.IdeaKotli" + - "nBinaryCoordinatesProtoH\001\210\001\001\022\030\n\013binary_t" + - "ype\030\003 \001(\tH\002\210\001\001\022\030\n\013binary_file\030\004 \001(\tH\003\210\001\001" + - "B\t\n\007_extrasB\016\n\014_coordinatesB\016\n\014_binary_t" + - "ypeB\016\n\014_binary_file\"\264\001\n IdeaKotlinBinary" + - "CoordinatesProto\022\022\n\005group\030\001 \001(\tH\000\210\001\001\022\023\n\006" + - "module\030\002 \001(\tH\001\210\001\001\022\024\n\007version\030\003 \001(\tH\002\210\001\001\022" + - "\034\n\017source_set_name\030\004 \001(\tH\003\210\001\001B\010\n\006_groupB" + - "\t\n\007_moduleB\n\n\010_versionB\022\n\020_source_set_na" + - "me\"\320\001\n IdeaKotlinSourceCoordinatesProto\022" + - "\025\n\010build_id\030\001 \001(\tH\000\210\001\001\022\031\n\014project_path\030\002" + - " \001(\tH\001\210\001\001\022\031\n\014project_name\030\003 \001(\tH\002\210\001\001\022\034\n\017" + - "source_set_name\030\004 \001(\tH\003\210\001\001B\013\n\t_build_idB" + - "\017\n\r_project_pathB\017\n\r_project_nameB\022\n\020_so" + - "urce_set_nameB\002P\001b\006proto3" + "solvedBinaryDependencyProtoH\000\022\205\001\n\033projec" + + "t_artifact_dependency\030\004 \001(\0132^.org.jetbra" + + "ins.kotlin.gradle.idea.proto.generated.t" + + "cs.IdeaKotlinProjectArtifactDependencyPr" + + "otoH\000B\014\n\ndependency\"\257\003\n\037IdeaKotlinSource" + + "DependencyProto\022V\n\006extras\030\001 \001(\0132A.org.je" + + "tbrains.kotlin.gradle.idea.proto.generat" + + "ed.IdeaExtrasProtoH\000\210\001\001\022m\n\004type\030\002 \001(\0162Z." + + "org.jetbrains.kotlin.gradle.idea.proto.g" + + "enerated.tcs.IdeaKotlinSourceDependencyP" + + "roto.TypeH\001\210\001\001\022p\n\013coordinates\030\003 \001(\0132V.or" + + "g.jetbrains.kotlin.gradle.idea.proto.gen" + + "erated.tcs.IdeaKotlinSourceCoordinatesPr" + + "otoH\002\210\001\001\"/\n\004Type\022\013\n\007REGULAR\020\000\022\n\n\006FRIEND\020" + + "\001\022\016\n\nDEPENDS_ON\020\002B\t\n\007_extrasB\007\n\005_typeB\016\n" + + "\014_coordinates\"\256\002\n)IdeaKotlinUnresolvedBi" + + "naryDependencyProto\022V\n\006extras\030\001 \001(\0132A.or" + + "g.jetbrains.kotlin.gradle.idea.proto.gen" + + "erated.IdeaExtrasProtoH\000\210\001\001\022p\n\013coordinat" + + "es\030\002 \001(\0132V.org.jetbrains.kotlin.gradle.i" + + "dea.proto.generated.tcs.IdeaKotlinBinary" + + "CoordinatesProtoH\001\210\001\001\022\022\n\005cause\030\003 \001(\tH\002\210\001" + + "\001B\t\n\007_extrasB\016\n\014_coordinatesB\010\n\006_cause\"\342" + + "\002\n\'IdeaKotlinResolvedBinaryDependencyPro" + + "to\022V\n\006extras\030\001 \001(\0132A.org.jetbrains.kotli" + + "n.gradle.idea.proto.generated.IdeaExtras" + + "ProtoH\000\210\001\001\022p\n\013coordinates\030\002 \001(\0132V.org.je" + + "tbrains.kotlin.gradle.idea.proto.generat" + + "ed.tcs.IdeaKotlinBinaryCoordinatesProtoH" + + "\001\210\001\001\022\030\n\013binary_type\030\003 \001(\tH\002\210\001\001\022\030\n\013binary" + + "_file\030\004 \001(\tH\003\210\001\001B\t\n\007_extrasB\016\n\014_coordina" + + "tesB\016\n\014_binary_typeB\016\n\014_binary_file\"\220\003\n(" + + "IdeaKotlinProjectArtifactDependencyProto" + + "\022V\n\006extras\030\001 \001(\0132A.org.jetbrains.kotlin." + + "gradle.idea.proto.generated.IdeaExtrasPr" + + "otoH\000\210\001\001\022m\n\004type\030\002 \001(\0162Z.org.jetbrains.k" + + "otlin.gradle.idea.proto.generated.tcs.Id" + + "eaKotlinSourceDependencyProto.TypeH\001\210\001\001\022" + + "y\n\013coordinates\030\003 \001(\0132_.org.jetbrains.kot" + + "lin.gradle.idea.proto.generated.tcs.Idea" + + "KotlinProjectArtifactCoordinatesProtoH\002\210" + + "\001\001B\t\n\007_extrasB\007\n\005_typeB\016\n\014_coordinates\"\237" + + "\001\n!IdeaKotlinProjectCoordinatesProto\022\025\n\010" + + "build_id\030\001 \001(\tH\000\210\001\001\022\031\n\014project_path\030\002 \001(" + + "\tH\001\210\001\001\022\031\n\014project_name\030\003 \001(\tH\002\210\001\001B\013\n\t_bu" + + "ild_idB\017\n\r_project_pathB\017\n\r_project_name" + + "\"\264\001\n IdeaKotlinBinaryCoordinatesProto\022\022\n" + + "\005group\030\001 \001(\tH\000\210\001\001\022\023\n\006module\030\002 \001(\tH\001\210\001\001\022\024" + + "\n\007version\030\003 \001(\tH\002\210\001\001\022\034\n\017source_set_name\030" + + "\004 \001(\tH\003\210\001\001B\010\n\006_groupB\t\n\007_moduleB\n\n\010_vers" + + "ionB\022\n\020_source_set_name\"\317\001\n IdeaKotlinSo" + + "urceCoordinatesProto\022m\n\007project\030\001 \001(\0132W." + + "org.jetbrains.kotlin.gradle.idea.proto.g" + + "enerated.tcs.IdeaKotlinProjectCoordinate" + + "sProtoH\000\210\001\001\022\034\n\017source_set_name\030\002 \001(\tH\001\210\001" + + "\001B\n\n\010_projectB\022\n\020_source_set_name\"\324\001\n)Id" + + "eaKotlinProjectArtifactCoordinatesProto\022" + + "m\n\007project\030\001 \001(\0132W.org.jetbrains.kotlin." + + "gradle.idea.proto.generated.tcs.IdeaKotl" + + "inProjectCoordinatesProtoH\000\210\001\001\022\032\n\rartifa" + + "ct_file\030\002 \001(\tH\001\210\001\001B\n\n\010_projectB\020\n\016_artif" + + "act_fileB\002P\001b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -115,7 +153,7 @@ public final class ProtoTcs { internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinDependencyProto_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinDependencyProto_descriptor, - new java.lang.String[] { "SourceDependency", "ResolvedBinaryDependency", "UnresolvedBinaryDependency", "Dependency", }); + new java.lang.String[] { "SourceDependency", "ResolvedBinaryDependency", "UnresolvedBinaryDependency", "ProjectArtifactDependency", "Dependency", }); internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinSourceDependencyProto_descriptor = getDescriptor().getMessageTypes().get(1); internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinSourceDependencyProto_fieldAccessorTable = new @@ -134,18 +172,36 @@ public final class ProtoTcs { com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinResolvedBinaryDependencyProto_descriptor, new java.lang.String[] { "Extras", "Coordinates", "BinaryType", "BinaryFile", "Extras", "Coordinates", "BinaryType", "BinaryFile", }); - internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinBinaryCoordinatesProto_descriptor = + internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactDependencyProto_descriptor = getDescriptor().getMessageTypes().get(4); + internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactDependencyProto_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactDependencyProto_descriptor, + new java.lang.String[] { "Extras", "Type", "Coordinates", "Extras", "Type", "Coordinates", }); + internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectCoordinatesProto_descriptor = + getDescriptor().getMessageTypes().get(5); + internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectCoordinatesProto_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectCoordinatesProto_descriptor, + new java.lang.String[] { "BuildId", "ProjectPath", "ProjectName", "BuildId", "ProjectPath", "ProjectName", }); + internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinBinaryCoordinatesProto_descriptor = + getDescriptor().getMessageTypes().get(6); internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinBinaryCoordinatesProto_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinBinaryCoordinatesProto_descriptor, new java.lang.String[] { "Group", "Module", "Version", "SourceSetName", "Group", "Module", "Version", "SourceSetName", }); internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinSourceCoordinatesProto_descriptor = - getDescriptor().getMessageTypes().get(5); + getDescriptor().getMessageTypes().get(7); internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinSourceCoordinatesProto_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinSourceCoordinatesProto_descriptor, - new java.lang.String[] { "BuildId", "ProjectPath", "ProjectName", "SourceSetName", "BuildId", "ProjectPath", "ProjectName", "SourceSetName", }); + new java.lang.String[] { "Project", "SourceSetName", "Project", "SourceSetName", }); + internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactCoordinatesProto_descriptor = + getDescriptor().getMessageTypes().get(8); + internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactCoordinatesProto_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_org_jetbrains_kotlin_gradle_idea_proto_generated_tcs_IdeaKotlinProjectArtifactCoordinatesProto_descriptor, + new java.lang.String[] { "Project", "ArtifactFile", "Project", "ArtifactFile", }); org.jetbrains.kotlin.gradle.idea.proto.generated.ProtoExtras.getDescriptor(); } diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinDependencyProtoKt.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinDependencyProtoKt.kt index c966b415c57..9af8721bef9 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinDependencyProtoKt.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinDependencyProtoKt.kt @@ -93,6 +93,30 @@ object IdeaKotlinDependencyProtoKt { fun hasUnresolvedBinaryDependency(): kotlin.Boolean { return _builder.hasUnresolvedBinaryDependency() } + + /** + * .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto project_artifact_dependency = 4; + */ + var projectArtifactDependency: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto + @JvmName("getProjectArtifactDependency") + get() = _builder.getProjectArtifactDependency() + @JvmName("setProjectArtifactDependency") + set(value) { + _builder.setProjectArtifactDependency(value) + } + /** + * .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto project_artifact_dependency = 4; + */ + fun clearProjectArtifactDependency() { + _builder.clearProjectArtifactDependency() + } + /** + * .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto project_artifact_dependency = 4; + * @return Whether the projectArtifactDependency field is set. + */ + fun hasProjectArtifactDependency(): kotlin.Boolean { + return _builder.hasProjectArtifactDependency() + } val dependencyCase: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinDependencyProto.DependencyCase @JvmName("getDependencyCase") get() = _builder.getDependencyCase() @@ -115,3 +139,6 @@ val org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinDependencyPro val org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinDependencyProtoOrBuilder.unresolvedBinaryDependencyOrNull: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinUnresolvedBinaryDependencyProto? get() = if (hasUnresolvedBinaryDependency()) getUnresolvedBinaryDependency() else null +val org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinDependencyProtoOrBuilder.projectArtifactDependencyOrNull: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto? + get() = if (hasProjectArtifactDependency()) getProjectArtifactDependency() else null + diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactCoordinatesProtoKt.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactCoordinatesProtoKt.kt new file mode 100644 index 00000000000..d0e45598652 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactCoordinatesProtoKt.kt @@ -0,0 +1,82 @@ +//Generated by the protocol buffer compiler. DO NOT EDIT! +// source: proto_tcs.proto + +package org.jetbrains.kotlin.gradle.idea.proto.generated.tcs; + +@kotlin.jvm.JvmName("-initializeideaKotlinProjectArtifactCoordinatesProto") +inline fun ideaKotlinProjectArtifactCoordinatesProto(block: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProtoKt.Dsl.() -> kotlin.Unit): org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto = + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProtoKt.Dsl._create(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.newBuilder()).apply { block() }._build() +object IdeaKotlinProjectArtifactCoordinatesProtoKt { + @kotlin.OptIn(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class) + @com.google.protobuf.kotlin.ProtoDslMarker + class Dsl private constructor( + private val _builder: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.Builder + ) { + companion object { + @kotlin.jvm.JvmSynthetic + @kotlin.PublishedApi + internal fun _create(builder: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.Builder): Dsl = Dsl(builder) + } + + @kotlin.jvm.JvmSynthetic + @kotlin.PublishedApi + internal fun _build(): org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto = _builder.build() + + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; + */ + var project: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto + @JvmName("getProject") + get() = _builder.getProject() + @JvmName("setProject") + set(value) { + _builder.setProject(value) + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; + */ + fun clearProject() { + _builder.clearProject() + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; + * @return Whether the project field is set. + */ + fun hasProject(): kotlin.Boolean { + return _builder.hasProject() + } + val IdeaKotlinProjectArtifactCoordinatesProtoKt.Dsl.projectOrNull: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto? + get() = _builder.projectOrNull + + /** + * optional string artifact_file = 2; + */ + var artifactFile: kotlin.String + @JvmName("getArtifactFile") + get() = _builder.getArtifactFile() + @JvmName("setArtifactFile") + set(value) { + _builder.setArtifactFile(value) + } + /** + * optional string artifact_file = 2; + */ + fun clearArtifactFile() { + _builder.clearArtifactFile() + } + /** + * optional string artifact_file = 2; + * @return Whether the artifactFile field is set. + */ + fun hasArtifactFile(): kotlin.Boolean { + return _builder.hasArtifactFile() + } + } +} +@kotlin.jvm.JvmSynthetic +inline fun org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto.copy(block: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProtoKt.Dsl.() -> kotlin.Unit): org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto = + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProtoKt.Dsl._create(this.toBuilder()).apply { block() }._build() + +val org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProtoOrBuilder.projectOrNull: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto? + get() = if (hasProject()) getProject() else null + diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactDependencyProtoKt.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactDependencyProtoKt.kt new file mode 100644 index 00000000000..226013562be --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectArtifactDependencyProtoKt.kt @@ -0,0 +1,111 @@ +//Generated by the protocol buffer compiler. DO NOT EDIT! +// source: proto_tcs.proto + +package org.jetbrains.kotlin.gradle.idea.proto.generated.tcs; + +@kotlin.jvm.JvmName("-initializeideaKotlinProjectArtifactDependencyProto") +inline fun ideaKotlinProjectArtifactDependencyProto(block: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProtoKt.Dsl.() -> kotlin.Unit): org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto = + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProtoKt.Dsl._create(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto.newBuilder()).apply { block() }._build() +object IdeaKotlinProjectArtifactDependencyProtoKt { + @kotlin.OptIn(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class) + @com.google.protobuf.kotlin.ProtoDslMarker + class Dsl private constructor( + private val _builder: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto.Builder + ) { + companion object { + @kotlin.jvm.JvmSynthetic + @kotlin.PublishedApi + internal fun _create(builder: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto.Builder): Dsl = Dsl(builder) + } + + @kotlin.jvm.JvmSynthetic + @kotlin.PublishedApi + internal fun _build(): org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto = _builder.build() + + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto extras = 1; + */ + var extras: org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto + @JvmName("getExtras") + get() = _builder.getExtras() + @JvmName("setExtras") + set(value) { + _builder.setExtras(value) + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto extras = 1; + */ + fun clearExtras() { + _builder.clearExtras() + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto extras = 1; + * @return Whether the extras field is set. + */ + fun hasExtras(): kotlin.Boolean { + return _builder.hasExtras() + } + val IdeaKotlinProjectArtifactDependencyProtoKt.Dsl.extrasOrNull: org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto? + get() = _builder.extrasOrNull + + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto.Type type = 2; + */ + var type: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto.Type + @JvmName("getType") + get() = _builder.getType() + @JvmName("setType") + set(value) { + _builder.setType(value) + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto.Type type = 2; + */ + fun clearType() { + _builder.clearType() + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto.Type type = 2; + * @return Whether the type field is set. + */ + fun hasType(): kotlin.Boolean { + return _builder.hasType() + } + + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3; + */ + var coordinates: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto + @JvmName("getCoordinates") + get() = _builder.getCoordinates() + @JvmName("setCoordinates") + set(value) { + _builder.setCoordinates(value) + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3; + */ + fun clearCoordinates() { + _builder.clearCoordinates() + } + /** + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3; + * @return Whether the coordinates field is set. + */ + fun hasCoordinates(): kotlin.Boolean { + return _builder.hasCoordinates() + } + val IdeaKotlinProjectArtifactDependencyProtoKt.Dsl.coordinatesOrNull: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto? + get() = _builder.coordinatesOrNull + } +} +@kotlin.jvm.JvmSynthetic +inline fun org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto.copy(block: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProtoKt.Dsl.() -> kotlin.Unit): org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto = + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProtoKt.Dsl._create(this.toBuilder()).apply { block() }._build() + +val org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProtoOrBuilder.extrasOrNull: org.jetbrains.kotlin.gradle.idea.proto.generated.IdeaExtrasProto? + get() = if (hasExtras()) getExtras() else null + +val org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProtoOrBuilder.coordinatesOrNull: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto? + get() = if (hasCoordinates()) getCoordinates() else null + diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectCoordinatesProtoKt.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectCoordinatesProtoKt.kt new file mode 100644 index 00000000000..3af5667c17d --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinProjectCoordinatesProtoKt.kt @@ -0,0 +1,101 @@ +//Generated by the protocol buffer compiler. DO NOT EDIT! +// source: proto_tcs.proto + +package org.jetbrains.kotlin.gradle.idea.proto.generated.tcs; + +@kotlin.jvm.JvmName("-initializeideaKotlinProjectCoordinatesProto") +inline fun ideaKotlinProjectCoordinatesProto(block: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProtoKt.Dsl.() -> kotlin.Unit): org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto = + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProtoKt.Dsl._create(org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.newBuilder()).apply { block() }._build() +object IdeaKotlinProjectCoordinatesProtoKt { + @kotlin.OptIn(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class) + @com.google.protobuf.kotlin.ProtoDslMarker + class Dsl private constructor( + private val _builder: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.Builder + ) { + companion object { + @kotlin.jvm.JvmSynthetic + @kotlin.PublishedApi + internal fun _create(builder: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.Builder): Dsl = Dsl(builder) + } + + @kotlin.jvm.JvmSynthetic + @kotlin.PublishedApi + internal fun _build(): org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto = _builder.build() + + /** + * optional string build_id = 1; + */ + var buildId: kotlin.String + @JvmName("getBuildId") + get() = _builder.getBuildId() + @JvmName("setBuildId") + set(value) { + _builder.setBuildId(value) + } + /** + * optional string build_id = 1; + */ + fun clearBuildId() { + _builder.clearBuildId() + } + /** + * optional string build_id = 1; + * @return Whether the buildId field is set. + */ + fun hasBuildId(): kotlin.Boolean { + return _builder.hasBuildId() + } + + /** + * optional string project_path = 2; + */ + var projectPath: kotlin.String + @JvmName("getProjectPath") + get() = _builder.getProjectPath() + @JvmName("setProjectPath") + set(value) { + _builder.setProjectPath(value) + } + /** + * optional string project_path = 2; + */ + fun clearProjectPath() { + _builder.clearProjectPath() + } + /** + * optional string project_path = 2; + * @return Whether the projectPath field is set. + */ + fun hasProjectPath(): kotlin.Boolean { + return _builder.hasProjectPath() + } + + /** + * optional string project_name = 3; + */ + var projectName: kotlin.String + @JvmName("getProjectName") + get() = _builder.getProjectName() + @JvmName("setProjectName") + set(value) { + _builder.setProjectName(value) + } + /** + * optional string project_name = 3; + */ + fun clearProjectName() { + _builder.clearProjectName() + } + /** + * optional string project_name = 3; + * @return Whether the projectName field is set. + */ + fun hasProjectName(): kotlin.Boolean { + return _builder.hasProjectName() + } + } +} +@kotlin.jvm.JvmSynthetic +inline fun org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto.copy(block: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProtoKt.Dsl.() -> kotlin.Unit): org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto = + org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProtoKt.Dsl._create(this.toBuilder()).apply { block() }._build() + diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinSourceCoordinatesProtoKt.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinSourceCoordinatesProtoKt.kt index ce8a48f4031..2e5b5fad317 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinSourceCoordinatesProtoKt.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/generated/kotlin/org/jetbrains/kotlin/gradle/idea/proto/generated/tcs/IdeaKotlinSourceCoordinatesProtoKt.kt @@ -23,79 +23,33 @@ object IdeaKotlinSourceCoordinatesProtoKt { internal fun _build(): org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceCoordinatesProto = _builder.build() /** - * optional string build_id = 1; + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; */ - var buildId: kotlin.String - @JvmName("getBuildId") - get() = _builder.getBuildId() - @JvmName("setBuildId") + var project: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto + @JvmName("getProject") + get() = _builder.getProject() + @JvmName("setProject") set(value) { - _builder.setBuildId(value) + _builder.setProject(value) } /** - * optional string build_id = 1; + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; */ - fun clearBuildId() { - _builder.clearBuildId() + fun clearProject() { + _builder.clearProject() } /** - * optional string build_id = 1; - * @return Whether the buildId field is set. + * optional .org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto project = 1; + * @return Whether the project field is set. */ - fun hasBuildId(): kotlin.Boolean { - return _builder.hasBuildId() + fun hasProject(): kotlin.Boolean { + return _builder.hasProject() } + val IdeaKotlinSourceCoordinatesProtoKt.Dsl.projectOrNull: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto? + get() = _builder.projectOrNull /** - * optional string project_path = 2; - */ - var projectPath: kotlin.String - @JvmName("getProjectPath") - get() = _builder.getProjectPath() - @JvmName("setProjectPath") - set(value) { - _builder.setProjectPath(value) - } - /** - * optional string project_path = 2; - */ - fun clearProjectPath() { - _builder.clearProjectPath() - } - /** - * optional string project_path = 2; - * @return Whether the projectPath field is set. - */ - fun hasProjectPath(): kotlin.Boolean { - return _builder.hasProjectPath() - } - - /** - * optional string project_name = 3; - */ - var projectName: kotlin.String - @JvmName("getProjectName") - get() = _builder.getProjectName() - @JvmName("setProjectName") - set(value) { - _builder.setProjectName(value) - } - /** - * optional string project_name = 3; - */ - fun clearProjectName() { - _builder.clearProjectName() - } - /** - * optional string project_name = 3; - * @return Whether the projectName field is set. - */ - fun hasProjectName(): kotlin.Boolean { - return _builder.hasProjectName() - } - - /** - * optional string source_set_name = 4; + * optional string source_set_name = 2; */ var sourceSetName: kotlin.String @JvmName("getSourceSetName") @@ -105,13 +59,13 @@ object IdeaKotlinSourceCoordinatesProtoKt { _builder.setSourceSetName(value) } /** - * optional string source_set_name = 4; + * optional string source_set_name = 2; */ fun clearSourceSetName() { _builder.clearSourceSetName() } /** - * optional string source_set_name = 4; + * optional string source_set_name = 2; * @return Whether the sourceSetName field is set. */ fun hasSourceSetName(): kotlin.Boolean { @@ -123,3 +77,6 @@ object IdeaKotlinSourceCoordinatesProtoKt { inline fun org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceCoordinatesProto.copy(block: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceCoordinatesProtoKt.Dsl.() -> kotlin.Unit): org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceCoordinatesProto = org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceCoordinatesProtoKt.Dsl._create(this.toBuilder()).apply { block() }._build() +val org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceCoordinatesProtoOrBuilder.projectOrNull: org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto? + get() = if (hasProject()) getProject() else null + diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinDependency.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinDependency.kt index ab975aa91af..0e60aeaa30d 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinDependency.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinDependency.kt @@ -11,10 +11,7 @@ import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinDependency import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinDependencyProto.DependencyCase import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ideaKotlinDependencyProto import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext -import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency -import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinResolvedBinaryDependency -import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceDependency -import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinUnresolvedBinaryDependency +import org.jetbrains.kotlin.gradle.idea.tcs.* internal fun IdeaKotlinSerializationContext.IdeaKotlinDependencyProto(dependency: IdeaKotlinDependency): IdeaKotlinDependencyProto { return ideaKotlinDependencyProto { @@ -22,7 +19,8 @@ internal fun IdeaKotlinSerializationContext.IdeaKotlinDependencyProto(dependency is IdeaKotlinResolvedBinaryDependency -> resolvedBinaryDependency = IdeaKotlinResolvedBinaryDependencyProto(dependency) is IdeaKotlinUnresolvedBinaryDependency -> unresolvedBinaryDependency = IdeaKotlinUnresolvedBinaryDependencyProto(dependency) is IdeaKotlinSourceDependency -> sourceDependency = IdeaKotlinSourceDependencyProto(dependency) - } + is IdeaKotlinProjectArtifactDependency -> projectArtifactDependency = IdeaKotlinProjectArtifactDependencyProto(dependency) + }.let { } } } @@ -31,6 +29,7 @@ internal fun IdeaKotlinSerializationContext.IdeaKotlinDependency(proto: IdeaKotl DependencyCase.SOURCE_DEPENDENCY -> IdeaKotlinSourceDependency(proto.sourceDependency) DependencyCase.RESOLVED_BINARY_DEPENDENCY -> IdeaKotlinResolvedBinaryDependency(proto.resolvedBinaryDependency) DependencyCase.UNRESOLVED_BINARY_DEPENDENCY -> IdeaKotlinUnresolvedBinaryDependency(proto.unresolvedBinaryDependency) + DependencyCase.PROJECT_ARTIFACT_DEPENDENCY -> IdeaKotlinProjectArtifactDependency(proto.projectArtifactDependency) DependencyCase.DEPENDENCY_NOT_SET -> { logger.error("Dependency not set") null diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinProjectArtifactCoordinates.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinProjectArtifactCoordinates.kt new file mode 100644 index 00000000000..73951516d1a --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinProjectArtifactCoordinates.kt @@ -0,0 +1,27 @@ +/* + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.gradle.idea.proto.tcs + +import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactCoordinatesProto +import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ideaKotlinProjectArtifactCoordinatesProto +import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinProjectArtifactCoordinates +import java.io.File + +internal fun IdeaKotlinProjectArtifactCoordinatesProto( + coordinates: IdeaKotlinProjectArtifactCoordinates +): IdeaKotlinProjectArtifactCoordinatesProto { + return ideaKotlinProjectArtifactCoordinatesProto { + this.project = IdeaKotlinProjectCoordinatesProto(coordinates.project) + this.artifactFile = coordinates.artifactFile.path + } +} + +internal fun IdeaKotlinProjectArtifactCoordinates(proto: IdeaKotlinProjectArtifactCoordinatesProto): IdeaKotlinProjectArtifactCoordinates { + return IdeaKotlinProjectArtifactCoordinates( + project = IdeaKotlinProjectCoordinates(proto.project), + artifactFile = File(proto.artifactFile) + ) +} diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinProjectArtifactDependency.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinProjectArtifactDependency.kt new file mode 100644 index 00000000000..103327c47fc --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinProjectArtifactDependency.kt @@ -0,0 +1,34 @@ +/* + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.gradle.idea.proto.tcs + +import org.jetbrains.kotlin.gradle.idea.proto.Extras +import org.jetbrains.kotlin.gradle.idea.proto.IdeaExtrasProto +import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectArtifactDependencyProto +import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ideaKotlinProjectArtifactDependencyProto +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext +import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinProjectArtifactDependency +import org.jetbrains.kotlin.tooling.core.toMutableExtras + +internal fun IdeaKotlinSerializationContext.IdeaKotlinProjectArtifactDependencyProto( + dependency: IdeaKotlinProjectArtifactDependency +): IdeaKotlinProjectArtifactDependencyProto { + return ideaKotlinProjectArtifactDependencyProto { + this.extras = IdeaExtrasProto(dependency.extras) + this.type = dependency.type.toProto() + this.coordinates = IdeaKotlinProjectArtifactCoordinatesProto(dependency.coordinates) + } +} + +internal fun IdeaKotlinSerializationContext.IdeaKotlinProjectArtifactDependency( + proto: IdeaKotlinProjectArtifactDependencyProto +): IdeaKotlinProjectArtifactDependency { + return IdeaKotlinProjectArtifactDependency( + extras = Extras(proto.extras).toMutableExtras(), + type = IdeaKotlinSourceDependencyType(proto.type), + coordinates = IdeaKotlinProjectArtifactCoordinates(proto.coordinates), + ) +} diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinProjectCoordinates.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinProjectCoordinates.kt new file mode 100644 index 00000000000..b68bf9f827a --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinProjectCoordinates.kt @@ -0,0 +1,27 @@ +/* + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.gradle.idea.proto.tcs + +import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinProjectCoordinatesProto +import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.ideaKotlinProjectCoordinatesProto +import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinProjectCoordinates + +internal fun IdeaKotlinProjectCoordinatesProto(coordinates: IdeaKotlinProjectCoordinates): IdeaKotlinProjectCoordinatesProto { + return ideaKotlinProjectCoordinatesProto { + this.buildId = coordinates.buildId + this.projectPath = coordinates.projectPath + this.projectName = coordinates.projectName + } +} + +fun IdeaKotlinProjectCoordinates(proto: IdeaKotlinProjectCoordinatesProto): IdeaKotlinProjectCoordinates { + return IdeaKotlinProjectCoordinates( + buildId = proto.buildId, + projectPath = proto.projectPath, + projectName = proto.projectName + ) +} + diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinSourceCoordinates.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinSourceCoordinates.kt index feb2377c7a9..b7f8fc31633 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinSourceCoordinates.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinSourceCoordinates.kt @@ -8,9 +8,7 @@ internal fun IdeaKotlinSourceCoordinatesProto( coordinates: IdeaKotlinSourceCoordinates ): IdeaKotlinSourceCoordinatesProto { return ideaKotlinSourceCoordinatesProto { - this.buildId = coordinates.buildId - this.projectPath = coordinates.projectPath - this.projectName = coordinates.projectName + this.project = IdeaKotlinProjectCoordinatesProto(coordinates.project) this.sourceSetName = coordinates.sourceSetName } } @@ -19,9 +17,7 @@ internal fun IdeaKotlinSourceCoordinates( proto: IdeaKotlinSourceCoordinatesProto ): IdeaKotlinSourceCoordinates { return IdeaKotlinSourceCoordinates( - buildId = proto.buildId, - projectPath = proto.projectPath, - projectName = proto.projectName, + project = IdeaKotlinProjectCoordinates(proto.project), sourceSetName = proto.sourceSetName ) -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinSourceDependency.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinSourceDependency.kt index d2945b69f0d..1145a130ec2 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinSourceDependency.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinSourceDependency.kt @@ -18,11 +18,7 @@ internal fun IdeaKotlinSerializationContext.IdeaKotlinSourceDependencyProto( ): IdeaKotlinSourceDependencyProto { return ideaKotlinSourceDependencyProto { this.extras = IdeaExtrasProto(dependency.extras) - this.type = when (dependency.type) { - IdeaKotlinSourceDependency.Type.Regular -> IdeaKotlinSourceDependencyProto.Type.REGULAR - IdeaKotlinSourceDependency.Type.Friend -> IdeaKotlinSourceDependencyProto.Type.FRIEND - IdeaKotlinSourceDependency.Type.DependsOn -> IdeaKotlinSourceDependencyProto.Type.DEPENDS_ON - } + this.type = dependency.type.toProto() this.coordinates = IdeaKotlinSourceCoordinatesProto(dependency.coordinates) } } @@ -32,15 +28,7 @@ internal fun IdeaKotlinSerializationContext.IdeaKotlinSourceDependency( ): IdeaKotlinSourceDependency { return IdeaKotlinSourceDependency( extras = Extras(proto.extras).toMutableExtras(), - type = when (proto.type) { - IdeaKotlinSourceDependencyProto.Type.REGULAR -> IdeaKotlinSourceDependency.Type.Regular - IdeaKotlinSourceDependencyProto.Type.FRIEND -> IdeaKotlinSourceDependency.Type.Friend - IdeaKotlinSourceDependencyProto.Type.DEPENDS_ON -> IdeaKotlinSourceDependency.Type.DependsOn - IdeaKotlinSourceDependencyProto.Type.UNRECOGNIZED, null -> { - logger.warn("Unexpected ${IdeaKotlinSourceDependencyProto.Type::class.java.name}: ${proto.type}") - IdeaKotlinSourceDependency.Type.Regular - } - }, + type = IdeaKotlinSourceDependencyType(proto.type), coordinates = IdeaKotlinSourceCoordinates(proto.coordinates), ) -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinSourceDependencyType.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinSourceDependencyType.kt new file mode 100644 index 00000000000..274c55a23bd --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinSourceDependencyType.kt @@ -0,0 +1,30 @@ +/* + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.gradle.idea.proto.tcs + +import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceDependencyProto +import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationContext +import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceDependency + +internal fun IdeaKotlinSerializationContext.IdeaKotlinSourceDependencyType(type: IdeaKotlinSourceDependencyProto.Type?): IdeaKotlinSourceDependency.Type { + return when (type) { + IdeaKotlinSourceDependencyProto.Type.REGULAR -> IdeaKotlinSourceDependency.Type.Regular + IdeaKotlinSourceDependencyProto.Type.FRIEND -> IdeaKotlinSourceDependency.Type.Friend + IdeaKotlinSourceDependencyProto.Type.DEPENDS_ON -> IdeaKotlinSourceDependency.Type.DependsOn + IdeaKotlinSourceDependencyProto.Type.UNRECOGNIZED, null -> { + logger.warn("Unexpected ${IdeaKotlinSourceDependencyProto.Type::class.java.name}: $type") + IdeaKotlinSourceDependency.Type.Regular + } + } +} + +internal fun IdeaKotlinSourceDependency.Type.toProto(): IdeaKotlinSourceDependencyProto.Type { + return when (this) { + IdeaKotlinSourceDependency.Type.Regular -> IdeaKotlinSourceDependencyProto.Type.REGULAR + IdeaKotlinSourceDependency.Type.Friend -> IdeaKotlinSourceDependencyProto.Type.FRIEND + IdeaKotlinSourceDependency.Type.DependsOn -> IdeaKotlinSourceDependencyProto.Type.DEPENDS_ON + } +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/proto/proto_tcs.proto b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/proto/proto_tcs.proto index 8fc2851eb93..e72f0b8e348 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/proto/proto_tcs.proto +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/main/proto/proto_tcs.proto @@ -9,6 +9,7 @@ message IdeaKotlinDependencyProto { IdeaKotlinSourceDependencyProto source_dependency = 1; IdeaKotlinResolvedBinaryDependencyProto resolved_binary_dependency = 2; IdeaKotlinUnresolvedBinaryDependencyProto unresolved_binary_dependency = 3; + IdeaKotlinProjectArtifactDependencyProto project_artifact_dependency = 4; } } @@ -37,6 +38,18 @@ message IdeaKotlinResolvedBinaryDependencyProto { optional string binary_file = 4; } +message IdeaKotlinProjectArtifactDependencyProto { + optional IdeaExtrasProto extras = 1; + optional IdeaKotlinSourceDependencyProto.Type type = 2; + optional IdeaKotlinProjectArtifactCoordinatesProto coordinates = 3; +} + +message IdeaKotlinProjectCoordinatesProto { + optional string build_id = 1; + optional string project_path = 2; + optional string project_name = 3; +} + message IdeaKotlinBinaryCoordinatesProto { optional string group = 1; optional string module = 2; @@ -45,8 +58,11 @@ message IdeaKotlinBinaryCoordinatesProto { } message IdeaKotlinSourceCoordinatesProto { - optional string build_id = 1; - optional string project_path = 2; - optional string project_name = 3; - optional string source_set_name = 4; + optional IdeaKotlinProjectCoordinatesProto project = 1; + optional string source_set_name = 2; +} + +message IdeaKotlinProjectArtifactCoordinatesProto { + optional IdeaKotlinProjectCoordinatesProto project = 1; + optional string artifact_file = 2; } diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinDependencyBackwardsCompatibilityTest.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinDependencyBackwardsCompatibilityTest.kt index 0e454cfc2e7..9ad6fa9e137 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinDependencyBackwardsCompatibilityTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinDependencyBackwardsCompatibilityTest.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.gradle.idea.proto.tcs import org.jetbrains.kotlin.gradle.idea.proto.classLoaderForBackwardsCompatibleClasses import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinSerializationLogger +import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinProjectArtifactDependency import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinResolvedBinaryDependency import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceDependency import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinUnresolvedBinaryDependency @@ -56,6 +57,18 @@ class IdeaKotlinDependencyBackwardsCompatibilityTest { assertEquals(dependency.coordinates, deserializedCopied.coordinates) assertEquals(dependency.extras, deserializedCopied.extras) } + + @Test + fun `test - simple project artifact dependency`() { + val dependency = TestIdeaKotlinInstances.simpleProjectArtifactDependency + val binary = TestIdeaKotlinDependencySerializer().serialize(dependency) + val deserialized = deserializeIdeaKotlinDependencyWithBackwardsCompatibleClasses(binary) + val deserializedCopied = deserialized.copy() + + assertEquals(dependency.type, deserializedCopied.type) + assertEquals(dependency.coordinates, deserializedCopied.coordinates) + assertEquals(dependency.extras, deserializedCopied.extras) + } } private fun deserializeIdeaKotlinDependencyWithBackwardsCompatibleClasses(project: ByteArray): Any { diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinDependencyForwardCompatibilityTest.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinDependencyForwardCompatibilityTest.kt index 2d8a1513a58..d38eee42daa 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinDependencyForwardCompatibilityTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinDependencyForwardCompatibilityTest.kt @@ -6,10 +6,7 @@ package org.jetbrains.kotlin.gradle.idea.proto.tcs import org.jetbrains.kotlin.gradle.idea.proto.classLoaderForBackwardsCompatibleClasses -import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency -import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinResolvedBinaryDependency -import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceDependency -import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinUnresolvedBinaryDependency +import org.jetbrains.kotlin.gradle.idea.tcs.* import org.jetbrains.kotlin.gradle.idea.testFixtures.serialize.TestIdeaKotlinSerializationContext import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.TestIdeaKotlinDependencySerializer import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.TestIdeaKotlinInstances @@ -50,6 +47,16 @@ class IdeaKotlinDependencyForwardCompatibilityTest { assertEquals(TestIdeaKotlinInstances.simpleSourceDependency.coordinates, deserialized.coordinates) assertEquals(TestIdeaKotlinInstances.simpleSourceDependency.extras, deserialized.extras) } + + @Test + fun `test - simple project artifact dependency`() { + val binary = oldBinaryOf(TestIdeaKotlinInstances::simpleProjectArtifactDependency) + val deserialized = deserializeOrFail(binary) + + assertEquals(TestIdeaKotlinInstances.simpleProjectArtifactDependency.type, deserialized.type) + assertEquals(TestIdeaKotlinInstances.simpleProjectArtifactDependency.coordinates, deserialized.coordinates) + assertEquals(TestIdeaKotlinInstances.simpleProjectArtifactDependency.extras, deserialized.extras) + } } private inline fun deserializeOrFail(data: ByteArray): T { diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinDependencySerializationTest.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinDependencySerializationTest.kt index f747983f0ef..c92a096e85e 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinDependencySerializationTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinDependencySerializationTest.kt @@ -35,6 +35,11 @@ class IdeaKotlinDependencySerializationTest : AbstractSerializationTest() { + override fun serialize(value: IdeaKotlinProjectArtifactDependency): ByteArray { + return IdeaKotlinProjectArtifactDependencyProto(value).toByteArray() + } + + override fun deserialize(data: ByteArray): IdeaKotlinProjectArtifactDependency { + return IdeaKotlinProjectArtifactDependency(IdeaKotlinProjectArtifactDependencyProto.parseFrom(data)) + } + + @Test + fun `sample 0`() = testSerialization(TestIdeaKotlinInstances.simpleProjectArtifactDependency) +} diff --git a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinSourceCoordinatesSerializationTest.kt b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinSourceCoordinatesSerializationTest.kt index 59737b8d623..b4eb89ec805 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinSourceCoordinatesSerializationTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea-proto/src/test/kotlin/org/jetbrains/kotlin/gradle/idea/proto/tcs/IdeaKotlinSourceCoordinatesSerializationTest.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.gradle.idea.proto.tcs import org.jetbrains.kotlin.gradle.idea.proto.AbstractSerializationTest import org.jetbrains.kotlin.gradle.idea.proto.generated.tcs.IdeaKotlinSourceCoordinatesProto +import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinProjectCoordinates import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceCoordinates import org.junit.Test @@ -20,9 +21,11 @@ class IdeaKotlinSourceCoordinatesSerializationTest : AbstractSerializationTest() withValue "Cash" ) + val simpleProjectCoordinates = IdeaKotlinProjectCoordinates( + buildId = "myBuildId", + projectPath = "my:project:path", + projectName = "myProjectName" + ) + val simpleBinaryCoordinates = IdeaKotlinBinaryCoordinates( group = "myGroup", module = "myModule", @@ -27,12 +33,16 @@ object TestIdeaKotlinInstances { ) val simpleSourceCoordinates = IdeaKotlinSourceCoordinates( - buildId = "myBuildId", - projectPath = "my:project:path", - projectName = "myProjectName", + project = simpleProjectCoordinates, sourceSetName = "mySourceSetName" ) + + val simpleProjectArtifactCoordinates = IdeaKotlinProjectArtifactCoordinates( + project = simpleProjectCoordinates, + artifactFile = File("myArtifactFile.klib") + ) + val simpleUnresolvedBinaryDependency = IdeaKotlinUnresolvedBinaryDependency( cause = "myCause", coordinates = simpleBinaryCoordinates, @@ -51,4 +61,10 @@ object TestIdeaKotlinInstances { type = IdeaKotlinSourceDependency.Type.Regular, extras = extrasWithIntAndStrings.toMutableExtras() ) + + val simpleProjectArtifactDependency = IdeaKotlinProjectArtifactDependency( + coordinates = simpleProjectArtifactCoordinates, + type = IdeaKotlinSourceDependency.Type.Regular, + extras = extrasWithIntAndStrings.toMutableExtras() + ) } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/tcs/ideaDependencyMatcherBuilders.kt b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/tcs/ideaDependencyMatcherBuilders.kt index a98dd1fcd53..99224592778 100644 --- a/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/tcs/ideaDependencyMatcherBuilders.kt +++ b/libraries/tools/kotlin-gradle-plugin-idea/src/testFixtures/kotlin/org/jetbrains/kotlin/gradle/idea/testFixtures/tcs/ideaDependencyMatcherBuilders.kt @@ -23,8 +23,8 @@ fun ideSourceDependency(type: IdeaKotlinSourceDependency.Type, project: Project, } fun ideSourceDependency(type: IdeaKotlinSourceDependency.Type, path: String): IdeaKotlinDependencyMatcher { - val segments = path.split(":") - val projectPath = segments.dropLast(1).joinToString(":") + val segments = path.split("/") + val projectPath = segments.dropLast(1).joinToString("/") val sourceSetName = segments.last() return IdeaKotlinSourceDependencyMatcher(type, projectPath, sourceSetName) } @@ -38,6 +38,13 @@ fun dependsOnDependency(project: Project, sourceSetName: String) = fun dependsOnDependency(path: String) = ideSourceDependency(IdeaKotlinSourceDependency.Type.DependsOn, path) +fun projectArtifactDependency( + type: IdeaKotlinSourceDependency.Type = IdeaKotlinSourceDependency.Type.Regular, projectPath: String, artifactFilePath: Regex +): IdeaKotlinDependencyMatcher = IdeaKotlinProjectArtifactDependencyMatcher( + type = type, + projectPath = projectPath, + artifactFilePath = artifactFilePath +) fun binaryCoordinates(regex: Regex): IdeaKotlinDependencyMatcher { return IdeaBinaryCoordinatesMatcher(regex) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImportFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImportFactory.kt index 35dd96d62cf..7301363f11a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImportFactory.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImportFactory.kt @@ -56,7 +56,7 @@ fun IdeMultiplatformImport(extension: KotlinMultiplatformExtension): IdeMultipla ) registerDependencyResolver( - resolver = IdePlatformBinaryDependencyResolver(), + resolver = IdePlatformDependencyResolver(), constraint = IdeMultiplatformImport.SourceSetConstraint.isPlatform, phase = IdeMultiplatformImport.DependencyResolutionPhase.BinaryDependencyResolution, level = IdeMultiplatformImport.DependencyResolutionLevel.Default diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeDependsOnDependencyResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeDependsOnDependencyResolver.kt index 7db4ebc82f3..1ab65f1b224 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeDependsOnDependencyResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeDependsOnDependencyResolver.kt @@ -10,9 +10,9 @@ import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceCoordinates import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceDependency import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.ide.IdeDependencyResolver -import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.currentBuildId +import org.jetbrains.kotlin.gradle.plugin.ide.IdeaKotlinProjectCoordinates import org.jetbrains.kotlin.gradle.plugin.sources.internal -import org.jetbrains.kotlin.tooling.core.mutableExtrasOf +import org.jetbrains.kotlin.gradle.plugin.sources.project internal object IdeDependsOnDependencyResolver : IdeDependencyResolver { override fun resolve(sourceSet: KotlinSourceSet): Set { @@ -20,12 +20,9 @@ internal object IdeDependsOnDependencyResolver : IdeDependencyResolver { IdeaKotlinSourceDependency( type = IdeaKotlinSourceDependency.Type.DependsOn, coordinates = IdeaKotlinSourceCoordinates( - buildId = dependsOnSourceSet.internal.project.currentBuildId().name, - projectPath = dependsOnSourceSet.internal.project.path, - projectName = dependsOnSourceSet.internal.project.name, + project = IdeaKotlinProjectCoordinates(dependsOnSourceSet.project), sourceSetName = dependsOnSourceSet.name - ), - extras = mutableExtrasOf() + ) ) }.toSet() } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeJvmAndAndroidPlatformDependencyResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeJvmAndAndroidPlatformDependencyResolver.kt index 4f3cd122a01..00e403bf030 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeJvmAndAndroidPlatformDependencyResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeJvmAndAndroidPlatformDependencyResolver.kt @@ -21,9 +21,9 @@ import org.jetbrains.kotlin.gradle.utils.named * Resolves dependencies of jvm and Android source sets from the perspective jvm */ internal fun IdeJvmAndAndroidPlatformBinaryDependencyResolver(project: Project): IdeDependencyResolver = - IdePlatformBinaryDependencyResolver( + IdePlatformDependencyResolver( binaryType = IdeaKotlinDependency.CLASSPATH_BINARY_TYPE, - artifactResolutionStrategy = IdePlatformBinaryDependencyResolver.ArtifactResolutionStrategy.PlatformLikeSourceSet( + artifactResolutionStrategy = IdePlatformDependencyResolver.ArtifactResolutionStrategy.PlatformLikeSourceSet( setupPlatformResolutionAttributes = { attributes.attribute(Usage.USAGE_ATTRIBUTE, project.usageByName(Usage.JAVA_API)) attributes.attribute(Category.CATEGORY_ATTRIBUTE, project.objects.named(Category.LIBRARY)) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdePlatformBinaryDependencyResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdePlatformDependencyResolver.kt similarity index 80% rename from libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdePlatformBinaryDependencyResolver.kt rename to libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdePlatformDependencyResolver.kt index f21cfbe341b..a43669cd692 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdePlatformBinaryDependencyResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdePlatformDependencyResolver.kt @@ -6,19 +6,20 @@ package org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers import org.gradle.api.artifacts.ArtifactView -import org.gradle.api.artifacts.component.ComponentIdentifier import org.gradle.api.artifacts.component.ModuleComponentIdentifier import org.gradle.api.artifacts.component.ModuleComponentSelector +import org.gradle.api.artifacts.component.ProjectComponentIdentifier import org.gradle.api.attributes.AttributeContainer +import org.gradle.api.logging.Logger import org.gradle.api.logging.Logging +import org.gradle.internal.component.local.model.OpaqueComponentArtifactIdentifier import org.gradle.internal.resolve.ModuleVersionResolveException -import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinBinaryCoordinates -import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency -import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinResolvedBinaryDependency -import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinUnresolvedBinaryDependency +import org.jetbrains.kotlin.gradle.idea.tcs.* import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.ide.IdeDependencyResolver +import org.jetbrains.kotlin.gradle.plugin.ide.IdeaKotlinBinaryCoordinates +import org.jetbrains.kotlin.gradle.plugin.ide.IdeaKotlinProjectCoordinates import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMetadataCompilation import org.jetbrains.kotlin.gradle.plugin.mpp.internal import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmFragment @@ -27,7 +28,7 @@ import org.jetbrains.kotlin.gradle.plugin.sources.* import org.jetbrains.kotlin.gradle.targets.metadata.ALL_COMPILE_METADATA_CONFIGURATION_NAME import org.jetbrains.kotlin.tooling.core.mutableExtrasOf -internal class IdePlatformBinaryDependencyResolver( +internal class IdePlatformDependencyResolver( private val binaryType: String = IdeaKotlinDependency.CLASSPATH_BINARY_TYPE, private val artifactResolutionStrategy: ArtifactResolutionStrategy = ArtifactResolutionStrategy.Compilation() ) : IdeDependencyResolver { @@ -76,12 +77,35 @@ internal class IdePlatformBinaryDependencyResolver( }.toSet() val resolvedDependencies = artifacts.artifacts.mapNotNull { artifact -> - IdeaKotlinResolvedBinaryDependency( - coordinates = artifact.variant.owner.toIdeaKotlinBinaryCoordinatesOrNull(), - binaryType = binaryType, - binaryFile = artifact.file, - extras = mutableExtrasOf() - ) + when (val componentId = artifact.id.componentIdentifier) { + is ProjectComponentIdentifier -> { + IdeaKotlinProjectArtifactDependency( + type = IdeaKotlinSourceDependency.Type.Regular, + coordinates = IdeaKotlinProjectArtifactCoordinates( + project = IdeaKotlinProjectCoordinates(componentId), + artifactFile = artifact.file + ) + ) + } + + is ModuleComponentIdentifier -> { + IdeaKotlinResolvedBinaryDependency( + coordinates = IdeaKotlinBinaryCoordinates(componentId), + binaryType = binaryType, + binaryFile = artifact.file, + ) + } + + is OpaqueComponentArtifactIdentifier -> { + /* Such dependencies *would* require implementing a resolver */ + null + } + + else -> { + logger.warn("Unhandled componentId: ${componentId.javaClass}") + null + } + } }.toSet() return resolvedDependencies + unresolvedDependencies @@ -108,7 +132,6 @@ internal class IdePlatformBinaryDependencyResolver( return compilation.internal.configurations.compileDependencyConfiguration.incoming.artifactView { view -> view.isLenient = true - view.componentFilter { id -> id is ModuleComponentIdentifier } view.attributes.setupArtifactViewAttributes(sourceSet) } } @@ -139,19 +162,12 @@ internal class IdePlatformBinaryDependencyResolver( return sourceSetCompileDependencies.incoming.artifactView { view -> view.isLenient = true - view.componentFilter { id -> id is ModuleComponentIdentifier } view.attributes.setupArtifactViewAttributes(sourceSet) } } - private fun ComponentIdentifier.toIdeaKotlinBinaryCoordinatesOrNull(): IdeaKotlinBinaryCoordinates? { - return when (this) { - is ModuleComponentIdentifier -> IdeaKotlinBinaryCoordinates(group, module, version) - else -> null - } - } private companion object { - val logger = Logging.getLogger(IdePlatformBinaryDependencyResolver::class.java) + val logger: Logger = Logging.getLogger(IdePlatformDependencyResolver::class.java) } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeVisibleMultiplatformSourceDependencyResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeVisibleMultiplatformSourceDependencyResolver.kt index a7ba388dbf3..baf5d5f22ae 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeVisibleMultiplatformSourceDependencyResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/dependencyResolvers/IdeVisibleMultiplatformSourceDependencyResolver.kt @@ -10,8 +10,8 @@ import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceCoordinates import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceDependency import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.ide.IdeDependencyResolver +import org.jetbrains.kotlin.gradle.plugin.ide.IdeaKotlinProjectCoordinates import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution -import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.currentBuildId import org.jetbrains.kotlin.gradle.plugin.sources.DefaultKotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.sources.KotlinDependencyScope.* @@ -34,9 +34,7 @@ object IdeVisibleMultiplatformSourceDependencyResolver : IdeDependencyResolver { IdeaKotlinSourceDependency( type = IdeaKotlinSourceDependency.Type.Regular, coordinates = IdeaKotlinSourceCoordinates( - buildId = project.currentBuildId().toString(), - projectPath = project.path, - projectName = project.name, + project = IdeaKotlinProjectCoordinates(project), sourceSetName = visibleSourceSetName ) ) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/factories.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/factories.kt index bc281b99ca7..748da01019d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/factories.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/factories.kt @@ -5,16 +5,44 @@ package org.jetbrains.kotlin.gradle.plugin.ide +import org.gradle.api.Project +import org.gradle.api.artifacts.component.ModuleComponentIdentifier +import org.gradle.api.artifacts.component.ProjectComponentIdentifier +import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinBinaryCoordinates +import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinProjectCoordinates import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceCoordinates import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.currentBuildId import org.jetbrains.kotlin.gradle.plugin.sources.project + +internal fun IdeaKotlinProjectCoordinates(identifier: ProjectComponentIdentifier): IdeaKotlinProjectCoordinates { + return IdeaKotlinProjectCoordinates( + buildId = identifier.build.name, + projectPath = identifier.projectPath, + projectName = identifier.projectName + ) +} + +internal fun IdeaKotlinProjectCoordinates(project: Project): IdeaKotlinProjectCoordinates { + return IdeaKotlinProjectCoordinates( + buildId = project.currentBuildId().name, + projectPath = project.path, + projectName = project.name + ) +} + internal fun IdeaKotlinSourceCoordinates(sourceSet: KotlinSourceSet): IdeaKotlinSourceCoordinates { return IdeaKotlinSourceCoordinates( - buildId = sourceSet.project.currentBuildId().toString(), - projectPath = sourceSet.project.path, - projectName = sourceSet.project.name, + project = IdeaKotlinProjectCoordinates(sourceSet.project), sourceSetName = sourceSet.name ) -} \ No newline at end of file +} + +fun IdeaKotlinBinaryCoordinates(identifier: ModuleComponentIdentifier): IdeaKotlinBinaryCoordinates { + return IdeaKotlinBinaryCoordinates( + group = identifier.group, + module = identifier.module, + version = identifier.version + ) +} diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/buildProject.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/buildProject.kt index a6a1189d00a..3c0ebd163e4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/buildProject.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/buildProject.kt @@ -40,10 +40,14 @@ fun buildProjectWithKPM(projectBuilder: ProjectBuilder.() -> Unit = { }, code: P } fun buildProjectWithJvm(projectBuilder: ProjectBuilder.() -> Unit = {}, code: Project.() -> Unit = {}) = buildProject(projectBuilder) { - project.plugins.apply(KotlinPlatformJvmPlugin::class.java) + project.applyKotlinJvmPlugin() code() } +fun Project.applyKotlinJvmPlugin() { + project.plugins.apply(KotlinPlatformJvmPlugin::class.java) +} + fun Project.kotlin(code: KotlinMultiplatformExtension.() -> Unit) { val kotlin = project.kotlinExtension as KotlinMultiplatformExtension kotlin.code() diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeMultiplatformResolveDependsOnDependenciesTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeDependsOnDependencyResolverTest.kt similarity index 82% rename from libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeMultiplatformResolveDependsOnDependenciesTest.kt rename to libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeDependsOnDependencyResolverTest.kt index 5717435d43f..4836275f565 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeMultiplatformResolveDependsOnDependenciesTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeDependsOnDependencyResolverTest.kt @@ -11,10 +11,10 @@ import org.jetbrains.kotlin.gradle.buildProjectWithMPP import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceDependency import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.assertMatches -import org.jetbrains.kotlin.gradle.plugin.ide.kotlinIdeMultiplatformImport +import org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers.IdeDependsOnDependencyResolver import kotlin.test.Test -class IdeMultiplatformResolveDependsOnDependenciesTest { +class IdeDependsOnDependencyResolverTest { @Test fun `test - sample 0 - default dependsOn to commonMain and commonTest`() { @@ -27,13 +27,12 @@ class IdeMultiplatformResolveDependsOnDependenciesTest { val jvmMain = kotlin.sourceSets.getByName("jvmMain") val jvmTest = kotlin.sourceSets.getByName("jvmTest") - - project.kotlinIdeMultiplatformImport.resolveDependencies(jvmMain) + IdeDependsOnDependencyResolver.resolve(jvmMain) .filterIsInstance() .assertMatches(dependsOnDependency(commonMain)) - project.kotlinIdeMultiplatformImport.resolveDependencies(jvmTest) + IdeDependsOnDependencyResolver.resolve(jvmTest) .filterIsInstance() .assertMatches(dependsOnDependency(commonTest)) } @@ -50,14 +49,14 @@ class IdeMultiplatformResolveDependsOnDependenciesTest { jvmMain.dependsOn(customMain) customMain.dependsOn(commonMain) - project.kotlinIdeMultiplatformImport.resolveDependencies(jvmMain) + IdeDependsOnDependencyResolver.resolve(jvmMain) .filterIsInstance() .assertMatches( dependsOnDependency(commonMain), dependsOnDependency(customMain) ) - project.kotlinIdeMultiplatformImport.resolveDependencies(customMain) + IdeDependsOnDependencyResolver.resolve(customMain) .filterIsInstance() .assertMatches(dependsOnDependency(commonMain)) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdePlatformBinaryDependencyResolverTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdePlatformBinaryDependencyResolverTest.kt index 75173de9e9b..bff7172872e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdePlatformBinaryDependencyResolverTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdePlatformBinaryDependencyResolverTest.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.gradle.enableDependencyVerification import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.assertMatches import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.binaryCoordinates import org.jetbrains.kotlin.gradle.kpm.idea.mavenCentralCacheRedirector -import org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers.IdePlatformBinaryDependencyResolver +import org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers.IdePlatformDependencyResolver import kotlin.test.Test class IdePlatformBinaryDependencyResolverTest { @@ -46,7 +46,7 @@ class IdePlatformBinaryDependencyResolverTest { } /* This resolver shall refuse to resolve for dependencies for metadata based dependencies */ - IdePlatformBinaryDependencyResolver().resolve(commonMain).assertMatches() + IdePlatformDependencyResolver().resolve(commonMain).assertMatches() val jvmDependencies = listOf( binaryCoordinates("com.arkivanov.mvikotlin:mvikotlin-jvm:3.0.2"), @@ -72,9 +72,9 @@ class IdePlatformBinaryDependencyResolverTest { binaryCoordinates("com.arkivanov.essenty:utils-internal-linuxx64:0.4.2"), ) - IdePlatformBinaryDependencyResolver().resolve(jvmMain).assertMatches(jvmDependencies) - IdePlatformBinaryDependencyResolver().resolve(jvmTest).assertMatches(jvmDependencies) - IdePlatformBinaryDependencyResolver().resolve(linuxX64Main).assertMatches(linuxDependencies) - IdePlatformBinaryDependencyResolver().resolve(linuxX64Test).assertMatches(linuxDependencies) + IdePlatformDependencyResolver().resolve(jvmMain).assertMatches(jvmDependencies) + IdePlatformDependencyResolver().resolve(jvmTest).assertMatches(jvmDependencies) + IdePlatformDependencyResolver().resolve(linuxX64Main).assertMatches(linuxDependencies) + IdePlatformDependencyResolver().resolve(linuxX64Test).assertMatches(linuxDependencies) } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeResolveSourceDependenciesTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeResolveSourceDependenciesTest.kt index 9affb42c90d..76b2dbce99a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeResolveSourceDependenciesTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeResolveSourceDependenciesTest.kt @@ -10,11 +10,10 @@ package org.jetbrains.kotlin.gradle.ide import org.gradle.api.Project import org.jetbrains.kotlin.gradle.* import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension -import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceDependency -import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.assertMatches -import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.dependsOnDependency -import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.friendSourceDependency -import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.regularSourceDependency +import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinBinaryDependency +import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinDependency +import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceDependency.Type.Regular +import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.* import org.jetbrains.kotlin.gradle.plugin.ide.kotlinIdeMultiplatformImport import kotlin.test.Test @@ -55,44 +54,92 @@ class IdeResolveSourceDependenciesTest { producer.evaluate() consumer.evaluate() - consumer.resolveSourceDependencies("commonMain").assertMatches( - regularSourceDependency(":producer:commonMain") + consumer.resolveDependencies("commonMain").assertMatches( + regularSourceDependency(":producer/commonMain") ) - consumer.resolveSourceDependencies("nativeMain").assertMatches( - regularSourceDependency(":producer:commonMain"), - regularSourceDependency(":producer:nativeMain"), - regularSourceDependency(":producer:linuxMain"), - dependsOnDependency(":consumer:commonMain"), + consumer.resolveDependencies("nativeMain").assertMatches( + regularSourceDependency(":producer/commonMain"), + regularSourceDependency(":producer/nativeMain"), + regularSourceDependency(":producer/linuxMain"), + dependsOnDependency(":consumer/commonMain"), ) - consumer.resolveSourceDependencies("nativeTest").assertMatches( - regularSourceDependency(":producer:commonMain"), - regularSourceDependency(":producer:nativeMain"), - regularSourceDependency(":producer:linuxMain"), - friendSourceDependency(":consumer:commonMain"), - friendSourceDependency(":consumer:nativeMain"), - friendSourceDependency(":consumer:linuxMain"), - dependsOnDependency(":consumer:commonTest"), + consumer.resolveDependencies("nativeTest").assertMatches( + regularSourceDependency(":producer/commonMain"), + regularSourceDependency(":producer/nativeMain"), + regularSourceDependency(":producer/linuxMain"), + friendSourceDependency(":consumer/commonMain"), + friendSourceDependency(":consumer/nativeMain"), + friendSourceDependency(":consumer/linuxMain"), + dependsOnDependency(":consumer/commonTest"), ) - consumer.resolveSourceDependencies("linuxMain").assertMatches( - regularSourceDependency(":producer:commonMain"), - regularSourceDependency(":producer:nativeMain"), - regularSourceDependency(":producer:linuxMain"), - dependsOnDependency(":consumer:commonMain"), - dependsOnDependency(":consumer:nativeMain"), + consumer.resolveDependencies("linuxMain").assertMatches( + regularSourceDependency(":producer/commonMain"), + regularSourceDependency(":producer/nativeMain"), + regularSourceDependency(":producer/linuxMain"), + dependsOnDependency(":consumer/commonMain"), + dependsOnDependency(":consumer/nativeMain"), ) - consumer.resolveSourceDependencies("linuxTest").assertMatches( - regularSourceDependency(":producer:commonMain"), - regularSourceDependency(":producer:nativeMain"), - regularSourceDependency(":producer:linuxMain"), - friendSourceDependency(":consumer:commonMain"), - friendSourceDependency(":consumer:nativeMain"), - friendSourceDependency(":consumer:linuxMain"), - dependsOnDependency(":consumer:commonTest"), - dependsOnDependency(":consumer:nativeTest"), + consumer.resolveDependencies("linuxTest").assertMatches( + regularSourceDependency(":producer/commonMain"), + regularSourceDependency(":producer/nativeMain"), + regularSourceDependency(":producer/linuxMain"), + friendSourceDependency(":consumer/commonMain"), + friendSourceDependency(":consumer/nativeMain"), + friendSourceDependency(":consumer/linuxMain"), + dependsOnDependency(":consumer/commonTest"), + dependsOnDependency(":consumer/nativeTest"), + ) + + consumer.resolveDependencies("linuxX64Main").assertMatches( + regularSourceDependency(":producer/commonMain"), + regularSourceDependency(":producer/nativeMain"), + regularSourceDependency(":producer/linuxMain"), + dependsOnDependency(":consumer/commonMain"), + dependsOnDependency(":consumer/nativeMain"), + dependsOnDependency(":consumer/linuxMain"), + projectArtifactDependency(Regular, ":producer", Regex(".*/linuxX64/main/klib/producer.klib")) + ) + + consumer.resolveDependencies("linuxX64Test").assertMatches( + regularSourceDependency(":producer/commonMain"), + regularSourceDependency(":producer/nativeMain"), + regularSourceDependency(":producer/linuxMain"), + friendSourceDependency(":consumer/commonMain"), + friendSourceDependency(":consumer/nativeMain"), + friendSourceDependency(":consumer/linuxMain"), + friendSourceDependency(":consumer/linuxX64Main"), + dependsOnDependency(":consumer/commonTest"), + dependsOnDependency(":consumer/nativeTest"), + dependsOnDependency(":consumer/linuxTest"), + projectArtifactDependency(Regular, ":producer", Regex(".*/linuxX64/main/klib/producer.klib")) + ) + + consumer.resolveDependencies("linuxArm64Main").assertMatches( + regularSourceDependency(":producer/commonMain"), + regularSourceDependency(":producer/nativeMain"), + regularSourceDependency(":producer/linuxMain"), + dependsOnDependency(":consumer/commonMain"), + dependsOnDependency(":consumer/nativeMain"), + dependsOnDependency(":consumer/linuxMain"), + projectArtifactDependency(Regular, ":producer", Regex(".*/linuxArm64/main/klib/producer.klib")) + ) + + consumer.resolveDependencies("linuxArm64Test").assertMatches( + regularSourceDependency(":producer/commonMain"), + regularSourceDependency(":producer/nativeMain"), + regularSourceDependency(":producer/linuxMain"), + friendSourceDependency(":consumer/commonMain"), + friendSourceDependency(":consumer/nativeMain"), + friendSourceDependency(":consumer/linuxMain"), + friendSourceDependency(":consumer/linuxArm64Main"), + dependsOnDependency(":consumer/commonTest"), + dependsOnDependency(":consumer/nativeTest"), + dependsOnDependency(":consumer/linuxTest"), + projectArtifactDependency(Regular, ":producer", Regex(".*/linuxArm64/main/klib/producer.klib")) ) } @@ -133,16 +180,53 @@ class IdeResolveSourceDependenciesTest { producer.evaluate() consumer.evaluate() - consumer.resolveSourceDependencies("jvmAndAndroidMain").assertMatches( - regularSourceDependency(":producer:commonMain"), - regularSourceDependency(":producer:jvmAndAndroidMain"), - dependsOnDependency(":consumer:commonMain") + consumer.resolveDependencies("jvmAndAndroidMain").assertMatches( + regularSourceDependency(":producer/commonMain"), + regularSourceDependency(":producer/jvmAndAndroidMain"), + dependsOnDependency(":consumer/commonMain") + ) + } + + @Test + fun `test - multiplatform to kotlin jvm - sample 0`() { + val root = buildProject() + + val producer = buildProject({ withParent(root).withName("producer") }) { + enableDefaultStdlibDependency(false) + applyKotlinJvmPlugin() + } + + val consumer = buildProject({ withParent(root).withName("consumer") }) { + enableDefaultStdlibDependency(false) + applyMultiplatformPlugin() + multiplatformExtension.jvm() + multiplatformExtension.sourceSets.getByName("commonMain").dependencies { + implementation(project(":producer")) + } + } + + root.evaluate() + producer.evaluate() + consumer.evaluate() + + consumer.resolveDependencies("commonMain").assertMatches(emptyList()) + + consumer.resolveDependencies("jvmMain").assertMatches( + dependsOnDependency(":consumer/commonMain"), + projectArtifactDependency(Regular, ":producer", Regex(""".*/build/libs/producer.jar""")) + ) + + consumer.resolveDependencies("jvmTest").assertMatches( + friendSourceDependency(":consumer/commonMain"), + friendSourceDependency(":consumer/jvmMain"), + dependsOnDependency(":consumer/commonTest"), + projectArtifactDependency(Regular, ":producer", Regex(""".*/build/libs/producer.jar""")) ) } } -private fun Project.resolveSourceDependencies(sourceSetName: String): List { +private fun Project.resolveDependencies(sourceSetName: String): Iterable { return kotlinIdeMultiplatformImport .resolveDependencies(multiplatformExtension.sourceSets.getByName(sourceSetName)) - .filterIsInstance() + .filter { it !is IdeaKotlinBinaryDependency } }