google-protobuf 3.18.0.rc.1-x64-mingw32 → 3.18.2-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33245402198eb26d8a1087995960b8c0b5c788704eff121e7a8e3138aa945745
-  data.tar.gz: f51378932892b3f2ff88d5364952c3c2f501fcc13d08c6121729c097ef7b9a94
+  metadata.gz: b037490c7935ea4951d6eb55ee091e0165699b064b3da0812d5ffab907349596
+  data.tar.gz: 69c5ea9625c9b57850b368e0a471c2bb677435729988b02fe79128edd9a2ea84
 SHA512:
-  metadata.gz: 6a9af09d17bcdb3a1fd254c45bb97a87bf7c83ea92f39a69978314b23e3dcd69889d1ca78565224af6796bdff0ab9ca6e4cda40d414fcc330aa64255223e9297
-  data.tar.gz: b2f46095d73cf40a0845b7e603cce96b795d5d57cde46b31d67d9ecf9d2a40096de7ea5ddfb4923714e9825e5cce5b75c8cd031ee8bfec83fc9833d3bf44874b
+  metadata.gz: bf8ff24a15ae2da338be7798905aff6497566f74c88b2ee8ee53fbf6cbde2c1358ff5c42f64eaa11367e9f85b923eb8a16c96891961d2be68324f2333d9a5aa2
+  data.tar.gz: c2f255bce17468abeb81704d9d25cd66dd1f61fc969c4cbfc27396077aa13221d5be28b9123aa941f7dc2729c7c38f4ed5d8fc57f17295dc19061db302cf389b

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: x64-mingw32
 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: