From 2bc454cd9b4bf6627cf7454daad20a1b3b7a6c63 Mon Sep 17 00:00:00 2001 From: Kenji Abe Date: Sat, 17 Sep 2022 09:13:50 +0900 Subject: [PATCH] Add missing `public` modifier to Kotlin generated code --- src/google/protobuf/compiler/java/enum_field.cc | 2 +- src/google/protobuf/compiler/java/enum_field_lite.cc | 2 +- src/google/protobuf/compiler/java/message.cc | 2 +- src/google/protobuf/compiler/java/message_lite.cc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/google/protobuf/compiler/java/enum_field.cc b/src/google/protobuf/compiler/java/enum_field.cc index ab799f026c67..1e5f9e8082f4 100644 --- a/src/google/protobuf/compiler/java/enum_field.cc +++ b/src/google/protobuf/compiler/java/enum_field.cc @@ -287,7 +287,7 @@ void ImmutableEnumFieldGenerator::GenerateKotlinDslMembers( if (SupportUnknownEnumValue(descriptor_->file())) { printer->Print( variables_, - "$kt_deprecation$ var $kt_name$Value: kotlin.Int\n" + "$kt_deprecation$public var $kt_name$Value: kotlin.Int\n" " @JvmName(\"${$get$kt_capitalized_name$Value$}$\")\n" " get() = $kt_dsl_builder$.${$get$capitalized_name$Value$}$()\n" " @JvmName(\"${$set$kt_capitalized_name$Value$}$\")\n" diff --git a/src/google/protobuf/compiler/java/enum_field_lite.cc b/src/google/protobuf/compiler/java/enum_field_lite.cc index 1bdfc3ef565f..d3a7fb0ce2cf 100644 --- a/src/google/protobuf/compiler/java/enum_field_lite.cc +++ b/src/google/protobuf/compiler/java/enum_field_lite.cc @@ -329,7 +329,7 @@ void ImmutableEnumFieldLiteGenerator::GenerateKotlinDslMembers( if (SupportUnknownEnumValue(descriptor_->file())) { printer->Print( variables_, - "$kt_deprecation$ var $kt_name$Value: kotlin.Int\n" + "$kt_deprecation$public var $kt_name$Value: kotlin.Int\n" " @JvmName(\"${$get$kt_capitalized_name$Value$}$\")\n" " get() = $kt_dsl_builder$.${$get$capitalized_name$Value$}$()\n" " @JvmName(\"${$set$kt_capitalized_name$Value$}$\")\n" diff --git a/src/google/protobuf/compiler/java/message.cc b/src/google/protobuf/compiler/java/message.cc index af64911e9700..eecea7d62c65 100644 --- a/src/google/protobuf/compiler/java/message.cc +++ b/src/google/protobuf/compiler/java/message.cc @@ -1525,7 +1525,7 @@ void ImmutableMessageGenerator::GenerateKotlinOrNull(io::Printer* printer) const const FieldDescriptor* field = descriptor_->field(i); if (field->has_presence() && GetJavaType(field) == JAVATYPE_MESSAGE) { printer->Print( - "val $full_classname$OrBuilder.$camelcase_name$OrNull: $full_name$?\n" + "public val $full_classname$OrBuilder.$camelcase_name$OrNull: $full_name$?\n" " get() = if (has$name$()) get$name$() else null\n\n", "full_classname", EscapeKotlinKeywords(name_resolver_->GetClassName(descriptor_, true)), diff --git a/src/google/protobuf/compiler/java/message_lite.cc b/src/google/protobuf/compiler/java/message_lite.cc index fc44cb172ded..b087728f276c 100644 --- a/src/google/protobuf/compiler/java/message_lite.cc +++ b/src/google/protobuf/compiler/java/message_lite.cc @@ -870,7 +870,7 @@ void ImmutableMessageLiteGenerator::GenerateKotlinOrNull(io::Printer* printer) c const FieldDescriptor* field = descriptor_->field(i); if (field->has_presence() && GetJavaType(field) == JAVATYPE_MESSAGE) { printer->Print( - "val $full_classname$OrBuilder.$camelcase_name$OrNull: " + "public val $full_classname$OrBuilder.$camelcase_name$OrNull: " "$full_name$?\n" " get() = if (has$name$()) get$name$() else null\n\n", "full_classname",