Skip to content

Commit 7b6e828

Browse files
deannagarciacopybara-github
authored andcommitted
Remove errorprone dependency from kotlin protos.
PiperOrigin-RevId: 512960332
1 parent 2dc5338 commit 7b6e828

File tree

4 files changed

+0
-18
lines changed

4 files changed

+0
-18
lines changed

java/kotlin/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ kt_jvm_library(
2525
deps = [
2626
":only_for_use_in_proto_generated_code_its_generator_and_tests",
2727
"//java/lite",
28-
"@maven//:com_google_errorprone_error_prone_annotations",
2928
],
3029
)
3130

java/kotlin/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@
3434
<artifactId>mockito-core</artifactId>
3535
<scope>test</scope>
3636
</dependency>
37-
<dependency>
38-
<groupId>com.google.errorprone</groupId>
39-
<artifactId>error_prone_annotations</artifactId>
40-
<version>2.5.1</version>
41-
</dependency>
4237
<dependency>
4338
<groupId>com.google.guava</groupId>
4439
<artifactId>guava</artifactId>

src/google/protobuf/compiler/java/message.cc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1305,9 +1305,6 @@ void ImmutableMessageGenerator::GenerateKotlinMembers(
13051305
"camelcase_name",
13061306
name_resolver_->GetKotlinFactoryName(descriptor_));
13071307

1308-
if (!context_->options().opensource_runtime) {
1309-
printer->Print("@com.google.errorprone.annotations.CheckReturnValue\n");
1310-
}
13111308

13121309
printer->Print(
13131310
"public inline fun $camelcase_name$(block: $message_kt$.Dsl.() -> "
@@ -1340,9 +1337,6 @@ void ImmutableMessageGenerator::GenerateTopLevelKotlinMembers(
13401337
io::Printer* printer) const {
13411338
printer->Print("@kotlin.jvm.JvmSynthetic\n");
13421339

1343-
if (context_->options().opensource_runtime) {
1344-
printer->Print("@com.google.errorprone.annotations.CheckReturnValue\n");
1345-
}
13461340

13471341
printer->Print(
13481342
"public inline fun $message$.copy(block: $message_kt$.Dsl.() -> "

src/google/protobuf/compiler/java/message_lite.cc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -816,9 +816,6 @@ void ImmutableMessageLiteGenerator::GenerateKotlinMembers(
816816
"camelcase_name",
817817
name_resolver_->GetKotlinFactoryName(descriptor_));
818818

819-
if (!context_->options().opensource_runtime) {
820-
printer->Print("@com.google.errorprone.annotations.CheckReturnValue\n");
821-
}
822819
printer->Print(
823820
"public inline fun $camelcase_name$(block: $message_kt$.Dsl.() -> "
824821
"kotlin.Unit): $message$ =\n"
@@ -846,9 +843,6 @@ void ImmutableMessageLiteGenerator::GenerateKotlinMembers(
846843

847844
void ImmutableMessageLiteGenerator::GenerateTopLevelKotlinMembers(
848845
io::Printer* printer) const {
849-
if (!context_->options().opensource_runtime) {
850-
printer->Print("@com.google.errorprone.annotations.CheckReturnValue\n");
851-
}
852846
printer->Print(
853847
"public inline fun $message$.copy(block: $message_kt$.Dsl.() -> "
854848
"kotlin.Unit): $message$ =\n"

0 commit comments

Comments
 (0)