google-protobuf 3.18.0.rc.1-x86-linux → 3.18.2-x86-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fa9928445d29031ea4ad6d79c83e4cad35ef0cf8a4aeaf8d5818202bf3edcd9
-  data.tar.gz: c53bf8399f4d75b44b8986a8b7ec62065e230056cb2781d1445c969d71660152
+  metadata.gz: a222992500aaf57089f63c0e51d8c4c2fe6f0aed392e772056b61ba51b74821d
+  data.tar.gz: 4cdcdfe9d3bd6c0b5bd3a458e17d481fb931adaf38ed5e4fdc5edd9d3f330831
 SHA512:
-  metadata.gz: 97414d4f2b42466a41ce779645a56849d142aa33a98c0f5a3787512313375f3393f4c8b6105cd826367173436d4357a3339f2a5071a45b214ba42650193fd4c5
-  data.tar.gz: b0d7a9ebf79e4f0a3ffda830a66a2f911ff91f7ef10dd8e3040198c7889a548436c1bdc0feeed5f04678d43a9f80c08e449a03a02a59c64619b9136a652517e3
+  metadata.gz: 64f7dc3952b3d0045821ca317bc09e86c35ea9fa044a87f0f13f8ce24728b8171f7ca42df960ad9c44b7e63e421f304bc269b3dc31ec3bd984e8d17991d661d7
+  data.tar.gz: c646caed2b8ff3a716bd32f097ca79e1c8646ce764cc5daaf19fd7c02153e40e248d19799f2e61b6bd72673c345f32e8f95acedfffb22ba5933cf0d9f9890f33

data/ext/google/protobuf_c/repeated_field.c

@@ -551,6 +551,7 @@ VALUE RepeatedField_plus(VALUE _self, VALUE list) {
     RepeatedField* dupped = ruby_to_RepeatedField(dupped_);
     upb_array *dupped_array = RepeatedField_GetMutable(dupped_);
     upb_arena* arena = Arena_get(dupped->arena);
+    Arena_fuse(list_rptfield->arena, arena);
     int size = upb_array_size(list_rptfield->array);
     int i;
 

data/lib/google/protobuf/descriptor_dsl.rb

@@ -301,8 +301,8 @@ module Google
           internal_add_field(:LABEL_REQUIRED, name, type, number, type_class, options)
         end
 
-        def repeated(name, type, number, type_class = nil)
-          internal_add_field(:LABEL_REPEATED, name, type, number, type_class, nil)
+        def repeated(name, type, number, type_class = nil, options=nil)
+          internal_add_field(:LABEL_REPEATED, name, type, number, type_class, options)
         end
 
         def oneof(name, &block)

data/tests/basic.rb

@@ -168,6 +168,17 @@ module BasicTest
       assert_equal nil, m.singular_msg
     end
 
+    def test_import_proto2
+      m = TestMessage.new
+      assert !m.has_optional_proto2_submessage?
+      m.optional_proto2_submessage = ::FooBar::Proto2::TestImportedMessage.new
+      assert m.has_optional_proto2_submessage?
+      assert TestMessage.descriptor.lookup('optional_proto2_submessage').has?(m)
+
+      m.clear_optional_proto2_submessage
+      assert !m.has_optional_proto2_submessage?
+    end
+
     def test_clear_repeated_fields
       m = TestMessage.new
 
@@ -487,6 +498,7 @@ module BasicTest
         :optional_int64=>0,
         :optional_msg=>nil,
         :optional_msg2=>nil,
+        :optional_proto2_submessage=>nil,
         :optional_string=>"foo",
         :optional_uint32=>0,
         :optional_uint64=>0,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google-protobuf
 version: !ruby/object:Gem::Version
-  version: 3.18.0.rc.1
+  version: 3.18.2
 platform: x86-linux
 authors:
 - Protobuf Authors
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-19 00:00:00.000000000 Z
+date: 2022-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock
@@ -100,8 +100,6 @@ files:
 - ext/google/protobuf_c/ruby-upb.c
 - ext/google/protobuf_c/ruby-upb.h
 - ext/google/protobuf_c/wrap_memcpy.c
-- lib/google/2.3/protobuf_c.so
-- lib/google/2.4/protobuf_c.so
 - lib/google/2.5/protobuf_c.so
 - lib/google/2.6/protobuf_c.so
 - lib/google/2.7/protobuf_c.so
@@ -129,8 +127,8 @@ homepage: https://developers.google.com/protocol-buffers
 licenses:
 - BSD-3-Clause
 metadata:
-  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v3.18.0-rc1/ruby
-post_install_message: 
+  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v3.18.2/ruby
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,18 +136,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
   - - "<"
     - !ruby/object:Gem::Version
       version: 3.1.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key: 
+rubygems_version: 3.3.4
+signing_key:
 specification_version: 4
 summary: Protocol Buffers
 test_files: