Merge branch '26.x' into cp-26x-4

protocolbuffers · Mar 26, 2024 · 6a177d2 · 6a177d2
2 parents 22f1170 + e1092ee
commit 6a177d2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/java/core/BUILD.bazel b/java/core/BUILD.bazel
@@ -170,7 +170,10 @@ proto_library(
     name = "java_features_proto",
     srcs = ["src/main/resources/google/protobuf/java_features.proto"],
     strip_import_prefix = "/java/core/src/main/resources",
-    visibility = ["//pkg:__pkg__"],
+    visibility = [
+        "//java/kotlin:__pkg__",
+        "//pkg:__pkg__",
+    ],
     deps = ["//:descriptor_proto"],
 )
 

diff --git a/java/kotlin/BUILD.bazel b/java/kotlin/BUILD.bazel
@@ -60,6 +60,7 @@ kt_jvm_export(
     pom_template = "//java/kotlin:pom_template.xml",
     resources = [
         "//:well_known_type_protos",
+        "//java/core:java_features_proto",
         "//src/google/protobuf:descriptor_proto_srcs",
     ],
     tags = ["manual"],
@@ -319,6 +320,7 @@ internal_gen_kt_protos(
         "//:timestamp_proto",
         "//:type_proto",
         "//:wrappers_proto",
+        "//java/core:java_features_proto",
     ],
 )
 

diff --git a/java/kotlin/generate-sources-build.xml b/java/kotlin/generate-sources-build.xml
@@ -4,6 +4,8 @@
     <exec executable="${protoc}">
         <arg value="--kotlin_out=${generated.sources.dir}"/>
         <arg value="--proto_path=${protobuf.source.dir}"/>
+        <arg value="--proto_path=${protobuf.java_source.dir}"/>
+        <arg value="${protobuf.java_source.dir}/main/java/com/google/protobuf/java_features.proto"/>
         <arg value="${protobuf.source.dir}/google/protobuf/any.proto"/>
         <arg value="${protobuf.source.dir}/google/protobuf/api.proto"/>
         <arg value="${protobuf.source.dir}/google/protobuf/descriptor.proto"/>