RetroSearch Browse

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

Showing content from https://github.com/protocolbuffers/protobuf/commit/6216ae471f22f407b6e74ed70e688872f2761d35 below:

Update our compiled_edition_default's maximum_edition to 2024 (#22870) · protocolbuffers/protobuf@6216ae4 · GitHub

File tree Expand file treeCollapse file tree 11 files changed

+46

-13

lines changed

Filter options

- - Google.Protobuf.Test/Reflection
  - Google.Protobuf/Reflection
- src/main/java/com/google/protobuf
ruby/ext/google/protobuf_c

Expand file treeCollapse file tree 11 files changed

+46

-13

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


 @@ -16,7 +16,7 @@ load("//upb/cmake:build_defs.bzl", "staleness_test")

16 16


 conformance_test(

17 17


 name = "conformance_test",

18 18


 failure_list = "//conformance:failure_list_csharp.txt",

19

-
 maximum_edition = "2023",

19

+
 maximum_edition = "2024",

20 20


 testee = "//conformance:conformance_csharp",

21 21

22 22


 @@ -127,7 +127,7 @@ compile_edition_defaults(

127 127


 srcs = [

128 128


 "//:descriptor_proto",

129 129

],

130

-
 maximum_edition = "2023",

130

+
 maximum_edition = "2024",

131 131


 minimum_edition = "PROTO2",

132 132

133 133 Original file line number Diff line number Diff line change


 @@ -56,7 +56,7 @@ public void MaxSupportedEdition()

56 56


 // a new edition. It should only be changed when you're sure that all the features in the new

57 57


 // edition are supported. Just changing the configuration for feature set default generation

58 58


 // will *advertise* that we support the new edition, but that isn't sufficient.

59

-
 Edition maxSupportedEdition = Edition._2023;

59

+
 Edition maxSupportedEdition = Edition._2024;

60 60 61 61


 // These lines should not need to be changed.

62 62


 FeatureSetDescriptor.GetEditionDefaults(maxSupportedEdition);

Original file line number Diff line number Diff line change


 @@ -13,5 +13,5 @@ internal sealed partial class FeatureSetDescriptor

13 13

14 14


 // Canonical serialized form of the edition defaults, generated by embed_edition_defaults.

15 15


 private const string DefaultsBase64 =

16

-
 "ChcYhAciACoQCAEQAhgCIAMoATACOAJAAQoXGOcHIgAqEAgCEAEYASACKAEwATgCQAEKFxjoByIMCAEQARgBIAIoATABKgQ4AkABIOYHKOgH";

16

+
 "ChcYhAciACoQCAEQAhgCIAMoATACOAJAAQoXGOcHIgAqEAgCEAEYASACKAEwATgCQAEKFxjoByIMCAEQARgBIAIoATABKgQ4AkABChcY6QciEAgBEAEYASACKAEwATgBQAIqACDmByjpBw==";

17 17

Original file line number Diff line number Diff line change


 @@ -27,7 +27,7 @@ compile_edition_defaults(

27 27


 "//java/core:java_features_proto",

28 28


 "//src/google/protobuf:cpp_features_proto",

29 29

],

30

-
 maximum_edition = "2023",

30

+
 maximum_edition = "2024",

31 31


 minimum_edition = "2023",

32 32

33 33 Original file line number Diff line number Diff line change


 @@ -231,7 +231,7 @@ TEST_F(OverridableDefaultsTest, Proto3) {

231 231


 TEST_F(OverridableDefaultsTest, Edition2023) {

232 232


 auto feature_defaults = ReadDefaults("protobuf_defaults");

233 233


 ASSERT_OK(feature_defaults);

234

-
 ASSERT_GE(feature_defaults->defaults().size(), 3);

234

+
 ASSERT_GE(feature_defaults->defaults().size(), 4);

235 235


 auto defaults = feature_defaults->defaults(2);

236 236


 ASSERT_EQ(defaults.edition(), EDITION_2023);

237 237


 @@ -248,6 +248,39 @@ TEST_F(OverridableDefaultsTest, Edition2023) {

248 248


  )pb"));

249 249

250 250 251

+
 // Lock down that 2024 overridable defaults never change. Once Edition 2024 has

252

+
 // been released this test should never need to be touched.

253

+
 TEST_F(OverridableDefaultsTest, Edition2024) {

254

+
 auto feature_defaults = ReadDefaults("protobuf_defaults");

255

+
 ASSERT_OK(feature_defaults);

256

+
 ASSERT_GE(feature_defaults->defaults().size(), 4);

257

+
 auto defaults = feature_defaults->defaults(3);

258

+
 ASSERT_EQ(defaults.edition(), EDITION_2024);

259 + 260 + 261

+
 EXPECT_THAT(defaults.overridable_features(), EqualsProto(R"pb(

262

+
  field_presence: EXPLICIT

263

+
  enum_type: OPEN

264

+
  repeated_field_encoding: PACKED

265

+
  utf8_validation: VERIFY

266

+
  message_encoding: LENGTH_PREFIXED

267

+
  json_format: ALLOW

268

+
  enforce_naming_style: STYLE2024

269

+
  default_symbol_visibility: EXPORT_TOP_LEVEL

270

+
  [pb.cpp] {

271

+
  legacy_closed_enum: false

272

+
  string_type: VIEW

273

+
  enum_name_uses_string_view: true

274

+
  }

275

+
  [pb.java] {

276

+
  legacy_closed_enum: false

277

+
  utf8_validation: DEFAULT

278

+
  large_enum: false

279

+
  nest_in_file_class: NO

280

+
  }

281

+
  )pb"));

282

+
 }

283 + 251 284


 } // namespace

252 285


 } // namespace protobuf

253 286


 } // namespace google

Original file line number Diff line number Diff line change


 @@ -222,7 +222,7 @@ compile_edition_defaults(

222 222


 "//:descriptor_proto",

223 223


 "//:java_features_proto",

224 224

],

225

-
 maximum_edition = "2023",

225

+
 maximum_edition = "2024",

226 226


 minimum_edition = "PROTO2",

227 227

228 228


 @@ -418,7 +418,7 @@ build_test(

418 418


 conformance_test(

419 419


 name = "conformance_test",

420 420


 failure_list = "//conformance:failure_list_java.txt",

421

-
 maximum_edition = "2023",

421

+
 maximum_edition = "2024",

422 422


 testee = "//conformance:conformance_java",

423 423


 text_format_failure_list = "//conformance:text_format_failure_list_java.txt",

424 424

Original file line number Diff line number Diff line change


 @@ -4,7 +4,7 @@

4 4


 package com.google.protobuf;

5 5 6 6


 public final class JavaEditionDefaults {

7

-
 public static final String PROTOBUF_INTERNAL_JAVA_EDITION_DEFAULTS = "\n\'\030\204\007\"\003\312>\000*\035\010\001\020\002\030\002 \003(\0010\0028\002@\001\312>\n\010\001\020\001\030\000 \001(\003\n\'\030\347\007\"\003\312>\000*\035\010\002\020\001\030\001 \002(\0010\0018\002@\001\312>\n\010\000\020\001\030\000 \001(\003\n\'\030\350\007\"\023\010\001\020\001\030\001 \002(\0010\001\312>\004\010\000\020\001*\r8\002@\001\312>\006\030\000 \001(\003 \346\007(\350\007";

7

+
 public static final String PROTOBUF_INTERNAL_JAVA_EDITION_DEFAULTS = "\n\'\030\204\007\"\003\312>\000*\035\010\001\020\002\030\002 \003(\0010\0028\002@\001\312>\n\010\001\020\001\030\000 \001(\003\n\'\030\347\007\"\003\312>\000*\035\010\002\020\001\030\001 \002(\0010\0018\002@\001\312>\n\010\000\020\001\030\000 \001(\003\n\'\030\350\007\"\023\010\001\020\001\030\001 \002(\0010\001\312>\004\010\000\020\001*\r8\002@\001\312>\006\030\000 \001(\003\n\'\030\351\007\"\033\010\001\020\001\030\001 \002(\0010\0018\001@\002\312>\010\010\000\020\001\030\000(\001*\005\312>\002 \000 \346\007(\351\007";

8 8 9 9


 private JavaEditionDefaults() {}

10 10

Original file line number Diff line number Diff line change


 @@ -16225,7 +16225,7 @@ upb_ServiceDef* _upb_ServiceDefs_New(upb_DefBuilder* ctx, int n,

16225 16225


 // features. This is used for feature resolution under Editions.

16226 16226


 // NOLINTBEGIN

16227 16227


 // clang-format off

16228

-
 #define UPB_INTERNAL_UPB_EDITION_DEFAULTS "\n\027\030\204\007\"\000*\020\010\001\020\002\030\002 \003(\0010\0028\002@\001\n\027\030\347\007\"\000*\020\010\002\020\001\030\001 \002(\0010\0018\002@\001\n\027\030\350\007\"\014\010\001\020\001\030\001 \002(\0010\001*\0048\002@\001 \346\007(\350\007"

16228

+
 #define UPB_INTERNAL_UPB_EDITION_DEFAULTS "\n\027\030\204\007\"\000*\020\010\001\020\002\030\002 \003(\0010\0028\002@\001\n\027\030\347\007\"\000*\020\010\002\020\001\030\001 \002(\0010\0018\002@\001\n\027\030\350\007\"\014\010\001\020\001\030\001 \002(\0010\001*\0048\002@\001\n\027\030\351\007\"\020\010\001\020\001\030\001 \002(\0010\0018\001@\002*\000 \346\007(\351\007"

16229 16229


 // clang-format on

16230 16230


 // NOLINTEND

16231 16231 Original file line number Diff line number Diff line change


 @@ -16029,7 +16029,7 @@ upb_ServiceDef* _upb_ServiceDefs_New(upb_DefBuilder* ctx, int n,

16029 16029


 // features. This is used for feature resolution under Editions.

16030 16030


 // NOLINTBEGIN

16031 16031


 // clang-format off

16032

-
 #define UPB_INTERNAL_UPB_EDITION_DEFAULTS "\n\027\030\204\007\"\000*\020\010\001\020\002\030\002 \003(\0010\0028\002@\001\n\027\030\347\007\"\000*\020\010\002\020\001\030\001 \002(\0010\0018\002@\001\n\027\030\350\007\"\014\010\001\020\001\030\001 \002(\0010\001*\0048\002@\001 \346\007(\350\007"

16032

+
 #define UPB_INTERNAL_UPB_EDITION_DEFAULTS "\n\027\030\204\007\"\000*\020\010\001\020\002\030\002 \003(\0010\0028\002@\001\n\027\030\347\007\"\000*\020\010\002\020\001\030\001 \002(\0010\0018\002@\001\n\027\030\350\007\"\014\010\001\020\001\030\001 \002(\0010\001*\0048\002@\001\n\027\030\351\007\"\020\010\001\020\001\030\001 \002(\0010\0018\001@\002*\000 \346\007(\351\007"

16033 16033


 // clang-format on

16034 16034


 // NOLINTEND

16035 16035 Original file line number Diff line number Diff line change


 @@ -183,7 +183,7 @@ compile_edition_defaults(

183 183


 srcs = [

184 184


 "//:descriptor_proto",

185 185

],

186

-
 maximum_edition = "2023",

186

+
 maximum_edition = "2024",

187 187


 minimum_edition = "PROTO2",

188 188

189 189

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