From a420f23d4cdc61e815e48474d6cef1930ecd6220 Mon Sep 17 00:00:00 2001
From: Damon Cai <dcai@atlassian.com>
Date: Wed, 14 Jul 2021 08:25:00 +1000
Subject: [PATCH] Remove JvmField annotations from Kotlin private properties
 (#8804) (#8811)

---
 .../kotlin/src/main/kotlin/com/google/protobuf/ExtensionList.kt | 2 +-
 src/google/protobuf/compiler/java/java_message.cc               | 2 +-
 src/google/protobuf/compiler/java/java_message_lite.cc          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/kotlin/src/main/kotlin/com/google/protobuf/ExtensionList.kt b/java/kotlin/src/main/kotlin/com/google/protobuf/ExtensionList.kt
index 37e958edb2..d8982ebdad 100644
--- a/java/kotlin/src/main/kotlin/com/google/protobuf/ExtensionList.kt
+++ b/java/kotlin/src/main/kotlin/com/google/protobuf/ExtensionList.kt
@@ -40,7 +40,7 @@ import com.google.protobuf.MessageLite
  */
 class ExtensionList<E, M : MessageLite> @OnlyForUseByGeneratedProtoCode constructor(
   val extension: ExtensionLite<M, List<E>>,
-  @JvmField private val delegate: List<E>
+  private val delegate: List<E>
 ) : List<E> by delegate {
   override fun iterator(): Iterator<E> = UnmodifiableIterator(delegate.iterator())
 
diff --git a/src/google/protobuf/compiler/java/java_message.cc b/src/google/protobuf/compiler/java/java_message.cc
index 9059bfa6b6..336a08f116 100644
--- a/src/google/protobuf/compiler/java/java_message.cc
+++ b/src/google/protobuf/compiler/java/java_message.cc
@@ -1409,7 +1409,7 @@ void ImmutableMessageGenerator::GenerateKotlinDsl(io::Printer* printer) const {
       "@com.google.protobuf.kotlin.ProtoDslMarker\n");
   printer->Print(
       "class Dsl private constructor(\n"
-      "  @kotlin.jvm.JvmField private val _builder: $message$.Builder\n"
+      "  private val _builder: $message$.Builder\n"
       ") {\n"
       "  companion object {\n"
       "    @kotlin.jvm.JvmSynthetic\n"
diff --git a/src/google/protobuf/compiler/java/java_message_lite.cc b/src/google/protobuf/compiler/java/java_message_lite.cc
index 74ce6d62f4..13f003b9c0 100644
--- a/src/google/protobuf/compiler/java/java_message_lite.cc
+++ b/src/google/protobuf/compiler/java/java_message_lite.cc
@@ -732,7 +732,7 @@ void ImmutableMessageLiteGenerator::GenerateKotlinDsl(
       "@com.google.protobuf.kotlin.ProtoDslMarker\n");
   printer->Print(
       "class Dsl private constructor(\n"
-      "  @kotlin.jvm.JvmField private val _builder: $message$.Builder\n"
+      "  private val _builder: $message$.Builder\n"
       ") {\n"
       "  companion object {\n"
       "    @kotlin.jvm.JvmSynthetic\n"