RetroSearch Browse

Home - News ( United States | United Kingdom | Italy | Germany ) - Football scores

Showing content from https://github.com/protocolbuffers/protobuf/commit/7359f751a6d22a9ad22c6d175f560884b06c203c below:

Manually migrate top-level protobuf unittest protos from edition 2023… · protocolbuffers/protobuf@7359f75 · GitHub

File tree Expand file treeCollapse file tree 27 files changed

+196

-126

lines changed

Filter options

Expand file treeCollapse file tree 27 files changed

+196

-126

lines changed Original file line number Diff line number Diff line change


 @@ -37,7 +37,7 @@ foreach(proto_file ${tests_protos})

37 37


 PROTOS ${proto_file}

38 38


 LANGUAGE cpp

39 39


 OUT_VAR pb_generated_files

40

-
 IMPORT_DIRS ${protobuf_SOURCE_DIR}/src

40

+
 IMPORT_DIRS ${protobuf_SOURCE_DIR}/src ${protobuf_SOURCE_DIR}/java/core/src/main/resources

41 41

42 42


 set(tests_proto_files ${tests_proto_files} ${pb_generated_files})

43 43


 endforeach(proto_file)

Original file line number Diff line number Diff line change


 @@ -50,7 +50,7 @@ $PROTOC -Isrc --csharp_out=csharp/src/Google.Protobuf \

50 50


 # Note that this deliberately does *not* include old_extensions1.proto

51 51


 # and old_extensions2.proto, which are generated with an older version

52 52


 # of protoc.

53

-
 $PROTOC -Isrc -I. \

53

+
 $PROTOC -Isrc -I. -Ijava/core/src/main/resources/ \

54 54


 --experimental_allow_proto3_optional \

55 55


 --experimental_editions \

56 56


 --csharp_out=csharp/src/Google.Protobuf.Test.TestProtos \

Original file line number Diff line number Diff line change


 @@ -217,7 +217,10 @@ cc_proto_library(

217 217


 filegroup(

218 218


 name = "java_features_proto_srcs",

219 219


 srcs = ["src/main/resources/google/protobuf/java_features.proto"],

220

-
 visibility = ["//pkg:__pkg__"],

220

+
 visibility = [

221

+
 "//pkg:__pkg__",

222

+
 "//python:__pkg__",

223

+
 ],

221 224

222 225 223 226


 compile_edition_defaults(

Original file line number Diff line number Diff line change


 @@ -258,16 +258,23 @@ def build_targets(name):

258 258

259 259 260 260


 internal_copy_files(

261

-
 name = "copied_test_dependency_proto_files",

261

+
 name = "copied_cpp_features_test_dependency_proto_files",

262 262


 srcs = [

263 263


 "//src/google/protobuf:cpp_features_proto_srcs",

264 264

],

265 265


 strip_prefix = "src",

266 266

267 267 268

+
 internal_copy_files(

269

+
 name = "copied_java_features_test_dependency_proto_files",

270

+
 srcs = [

271

+
 "//java/core:java_features_proto_srcs",

272

+
 ],

273

+
 strip_prefix = "java/core/src/main/resources",

274

+
 )

268 275


 internal_py_proto_library(

269 276


 name = "test_dependency_proto_py_pb2",

270

-
 srcs = [":copied_test_dependency_proto_files"],

277

+
 srcs = [":copied_cpp_features_test_dependency_proto_files", ":copied_java_features_test_dependency_proto_files"],

271 278


 include = ".",

272 279


 default_runtime = "",

273 280


 protoc = "//:protoc",

Original file line number Diff line number Diff line change


 @@ -1473,7 +1473,7 @@ class ReturnObject:

1473 1473

1474 1474

],

1475 1475


 minimum_edition=descriptor_pb2.Edition.EDITION_PROTO2,

1476

-
 maximum_edition=descriptor_pb2.Edition.EDITION_2023,

1476

+
 maximum_edition=descriptor_pb2.Edition.EDITION_2024,

1477 1477

1478 1478


 defaults.defaults[0].overridable_features.Extensions[

1479 1479


 unittest_features_pb2.test

Original file line number Diff line number Diff line change


 @@ -1053,7 +1053,7 @@ filegroup(

1053 1053


 visibility = ["//:__subpackages__"],

1054 1054

1055 1055 1056

-
 proto_library(

1056

+
 protobuf_test_proto_library(

1057 1057


 name = "test_protos",

1058 1058


 srcs = [

1059 1059


 "any_test.proto",


 @@ -1095,6 +1095,10 @@ proto_library(

1095 1095


 "unittest_string_view.proto",

1096 1096


 "unittest_well_known_types.proto",

1097 1097

],

1098

+
 option_deps = [

1099

+
 ":cpp_features_proto",

1100

+
 "//:java_features_proto",

1101

+
 ],

1098 1102


 strip_import_prefix = "/src",

1099 1103


 visibility = ["//:__subpackages__"],

1100 1104


 deps = [


 @@ -1190,9 +1194,10 @@ cc_proto_library(

1190 1194


 deps = [":unittest_features_proto"],

1191 1195

1192 1196 1193

-
 proto_library(

1197

+
 protobuf_test_proto_library(

1194 1198


 name = "generic_test_protos",

1195 1199


 srcs = [":test_proto_srcs"],

1200

+
 option_deps = [":cpp_features_proto"],

1196 1201


 strip_import_prefix = "/src",

1197 1202


 visibility = ["//:__subpackages__"],

1198 1203


 deps = [


 @@ -1211,9 +1216,13 @@ proto_library(

1211 1216

],

1212 1217

1213 1218 1214

-
 proto_library(

1219

+
 protobuf_test_proto_library(

1215 1220


 name = "generic_test_editions_protos",

1216 1221


 srcs = [":test_proto_editions_srcs"],

1222

+
 option_deps = [

1223

+
 ":cpp_features_proto",

1224

+
 "//:java_features_proto",

1225

+
 ],

1217 1226


 strip_import_prefix = "/src",

1218 1227


 visibility = ["//:__subpackages__"],

1219 1228


 deps = [

You can’t perform that action at this time.

RetroSearch is an open source project built by @garambo | Open a GitHub Issue

Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo

HTML: 3.2 | Encoding: UTF-8 | Version: 0.7.4