From 66f80c3610b0cd61bedd42c78e78ae2eac002142 Mon Sep 17 00:00:00 2001
From: Deanna Garcia <deannagarcia@google.com>
Date: Tue, 28 Feb 2023 09:43:33 -0800
Subject: [PATCH] Remove errorprone dependency from kotlin protos.

PiperOrigin-RevId: 512960332
---
 java/kotlin/BUILD.bazel                           | 1 -
 java/kotlin/pom.xml                               | 5 -----
 src/google/protobuf/compiler/java/message.cc      | 6 ------
 src/google/protobuf/compiler/java/message_lite.cc | 6 ------
 4 files changed, 18 deletions(-)

diff --git a/java/kotlin/BUILD.bazel b/java/kotlin/BUILD.bazel
index c809117afcdc..9814c7a0d3fa 100644
--- a/java/kotlin/BUILD.bazel
+++ b/java/kotlin/BUILD.bazel
@@ -25,7 +25,6 @@ kt_jvm_library(
     deps = [
         ":only_for_use_in_proto_generated_code_its_generator_and_tests",
         "//java/lite",
-        "@maven//:com_google_errorprone_error_prone_annotations",
     ],
 )
 
diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml
index 52a368d58f86..1d265d56e0b8 100644
--- a/java/kotlin/pom.xml
+++ b/java/kotlin/pom.xml
@@ -34,11 +34,6 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.errorprone</groupId>
-      <artifactId>error_prone_annotations</artifactId>
-      <version>2.5.1</version>
-    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
diff --git a/src/google/protobuf/compiler/java/message.cc b/src/google/protobuf/compiler/java/message.cc
index 1bd7449741dc..5d6a44609f97 100644
--- a/src/google/protobuf/compiler/java/message.cc
+++ b/src/google/protobuf/compiler/java/message.cc
@@ -1305,9 +1305,6 @@ void ImmutableMessageGenerator::GenerateKotlinMembers(
                  "camelcase_name",
                  name_resolver_->GetKotlinFactoryName(descriptor_));
 
-  if (!context_->options().opensource_runtime) {
-    printer->Print("@com.google.errorprone.annotations.CheckReturnValue\n");
-  }
 
   printer->Print(
       "public inline fun $camelcase_name$(block: $message_kt$.Dsl.() -> "
@@ -1340,9 +1337,6 @@ void ImmutableMessageGenerator::GenerateTopLevelKotlinMembers(
     io::Printer* printer) const {
   printer->Print("@kotlin.jvm.JvmSynthetic\n");
 
-  if (context_->options().opensource_runtime) {
-    printer->Print("@com.google.errorprone.annotations.CheckReturnValue\n");
-  }
 
   printer->Print(
       "public inline fun $message$.copy(block: $message_kt$.Dsl.() -> "
diff --git a/src/google/protobuf/compiler/java/message_lite.cc b/src/google/protobuf/compiler/java/message_lite.cc
index 02506bace4f2..721a463c3d9b 100644
--- a/src/google/protobuf/compiler/java/message_lite.cc
+++ b/src/google/protobuf/compiler/java/message_lite.cc
@@ -816,9 +816,6 @@ void ImmutableMessageLiteGenerator::GenerateKotlinMembers(
                  "camelcase_name",
                  name_resolver_->GetKotlinFactoryName(descriptor_));
 
-  if (!context_->options().opensource_runtime) {
-    printer->Print("@com.google.errorprone.annotations.CheckReturnValue\n");
-  }
   printer->Print(
       "public inline fun $camelcase_name$(block: $message_kt$.Dsl.() -> "
       "kotlin.Unit): $message$ =\n"
@@ -846,9 +843,6 @@ void ImmutableMessageLiteGenerator::GenerateKotlinMembers(
 
 void ImmutableMessageLiteGenerator::GenerateTopLevelKotlinMembers(
     io::Printer* printer) const {
-  if (!context_->options().opensource_runtime) {
-    printer->Print("@com.google.errorprone.annotations.CheckReturnValue\n");
-  }
   printer->Print(
       "public inline fun $message$.copy(block: $message_kt$.Dsl.() -> "
       "kotlin.Unit): $message$ =\n"