Skip to content

Update protobuf to v29.3 #395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 11, 2025
Merged

Update protobuf to v29.3 #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
777980b
Update google-protobuf to v29.3
v0idpwn Jan 11, 2025
f0c4a70
Add exceptions for new failing tests
v0idpwn Jan 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions conformance/exemptions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,10 @@ Recommended.Proto2.JsonInput.FieldNameExtension.Validator
Recommended.Proto3.JsonInput.IgnoreUnknownEnumStringValueInMapValue.ProtobufOutput
Recommended.Proto3.JsonInput.IgnoreUnknownEnumStringValueInOptionalField.ProtobufOutput
Recommended.Proto3.JsonInput.IgnoreUnknownEnumStringValueInRepeatedField.ProtobufOutput
Recommended.Proto2.JsonInput.IgnoreUnknownEnumStringValueInMapPart.ProtobufOutput
Recommended.Proto2.JsonInput.IgnoreUnknownEnumStringValueInMapValue.ProtobufOutput
Recommended.Proto2.JsonInput.IgnoreUnknownEnumStringValueInOptionalField.ProtobufOutput
Recommended.Proto2.JsonInput.IgnoreUnknownEnumStringValueInRepeatedField.ProtobufOutput
Recommended.Proto2.JsonInput.IgnoreUnknownEnumStringValueInRepeatedPart.ProtobufOutput
Recommended.Proto3.JsonInput.IgnoreUnknownEnumStringValueInMapPart.ProtobufOutput
Recommended.Proto3.JsonInput.IgnoreUnknownEnumStringValueInRepeatedPart.ProtobufOutput
2 changes: 1 addition & 1 deletion lib/elixirpb.pb.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ defmodule Elixirpb.FileOptions do

use Protobuf, protoc_gen_elixir_version: "0.13.0", syntax: :proto2

field :module_prefix, 1, optional: true, type: :string
field :module_prefix, 1, optional: true, type: :string, json_name: "modulePrefix"
end
1 change: 1 addition & 0 deletions lib/elixirpb/pb_extension.pb.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
defmodule Elixirpb.PbExtension do
@moduledoc false

use Protobuf, protoc_gen_elixir_version: "0.13.0"

extend Google.Protobuf.FileOptions, :file, 1047, optional: true, type: Elixirpb.FileOptions
Expand Down
40 changes: 30 additions & 10 deletions lib/google/protobuf/compiler/plugin.pb.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ defmodule Google.Protobuf.Compiler.CodeGeneratorResponse.Feature do

field :FEATURE_NONE, 0
field :FEATURE_PROTO3_OPTIONAL, 1
field :FEATURE_SUPPORTS_EDITIONS, 2
end

defmodule Google.Protobuf.Compiler.Version do
@moduledoc false

use Protobuf, syntax: :proto2, protoc_gen_elixir_version: "0.13.0"
use Protobuf, protoc_gen_elixir_version: "0.13.0", syntax: :proto2

field :major, 1, optional: true, type: :int32
field :minor, 2, optional: true, type: :int32
Expand All @@ -21,31 +22,50 @@ end
defmodule Google.Protobuf.Compiler.CodeGeneratorRequest do
@moduledoc false

use Protobuf, syntax: :proto2, protoc_gen_elixir_version: "0.13.0"
use Protobuf, protoc_gen_elixir_version: "0.13.0", syntax: :proto2

field :file_to_generate, 1, repeated: true, type: :string
field :file_to_generate, 1, repeated: true, type: :string, json_name: "fileToGenerate"
field :parameter, 2, optional: true, type: :string
field :proto_file, 15, repeated: true, type: Google.Protobuf.FileDescriptorProto
field :compiler_version, 3, optional: true, type: Google.Protobuf.Compiler.Version

field :proto_file, 15,
repeated: true,
type: Google.Protobuf.FileDescriptorProto,
json_name: "protoFile"

field :source_file_descriptors, 17,
repeated: true,
type: Google.Protobuf.FileDescriptorProto,
json_name: "sourceFileDescriptors"

field :compiler_version, 3,
optional: true,
type: Google.Protobuf.Compiler.Version,
json_name: "compilerVersion"
end

defmodule Google.Protobuf.Compiler.CodeGeneratorResponse.File do
@moduledoc false

use Protobuf, syntax: :proto2, protoc_gen_elixir_version: "0.13.0"
use Protobuf, protoc_gen_elixir_version: "0.13.0", syntax: :proto2

field :name, 1, optional: true, type: :string
field :insertion_point, 2, optional: true, type: :string
field :insertion_point, 2, optional: true, type: :string, json_name: "insertionPoint"
field :content, 15, optional: true, type: :string
field :generated_code_info, 16, optional: true, type: Google.Protobuf.GeneratedCodeInfo

field :generated_code_info, 16,
optional: true,
type: Google.Protobuf.GeneratedCodeInfo,
json_name: "generatedCodeInfo"
end

defmodule Google.Protobuf.Compiler.CodeGeneratorResponse do
@moduledoc false

use Protobuf, syntax: :proto2, protoc_gen_elixir_version: "0.13.0"
use Protobuf, protoc_gen_elixir_version: "0.13.0", syntax: :proto2

field :error, 1, optional: true, type: :string
field :supported_features, 2, optional: true, type: :uint64
field :supported_features, 2, optional: true, type: :uint64, json_name: "supportedFeatures"
field :minimum_edition, 3, optional: true, type: :int32, json_name: "minimumEdition"
field :maximum_edition, 4, optional: true, type: :int32, json_name: "maximumEdition"
field :file, 15, repeated: true, type: Google.Protobuf.Compiler.CodeGeneratorResponse.File
end
Loading
Loading