google-protobuf 3.18.0.rc.1-universal-darwin → 3.18.2-universal-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19f0215a230ff6c7cc342a1d3d8933215d9a7f7f13f6c4fff9f3cf1916fe4430
-  data.tar.gz: 7f96df0ff5b646062a2bfe41116ab360392f2dc3ac1ecf84d940d754d8652018
+  metadata.gz: b4e8c0d368d75c18636e6748fc878ebfd441d4edecf8b711eb2a8e79ae409d35
+  data.tar.gz: 57001381314b068030d87560b40784b236f82cea5e6595cf51d1bd516e04ea13
 SHA512:
-  metadata.gz: e7db7af463fd938f7e9f62ada868757c75238d5925abebf7e9d01a5490934b0a7c0efe85b66c95b3f5a751d677b88690de62e160f37461596ced46ae0ebdc7cb
-  data.tar.gz: 1c7bc8162c2889ed21f3c2605f25bf1756df2a0f859133dd2d3e322c6083dac552130058bc78a0e2216d4564f8615029faa22451a1933ae9fb935d2f97c83362
+  metadata.gz: caf4dfb2e8bf6681811503ac57634101fe2bced2066a42d4ab3bba9d4918ffc1725776c7672ccaa9d86b3f5c57ee1d3c363aaa71cab06c6999ec5ffe9dd83ab1
+  data.tar.gz: 0d52452eadad7e047fb1ce77d1bedb148fbb88c4d0213da06708a480f9239e1e9a1bcde29bb7407ff1d6f140b79c333b637fd6bcbc17874a70f8bbeec76eaeb1

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: universal-darwin
 authors:
 - Protobuf Authors
 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.bundle
-- lib/google/2.4/protobuf_c.bundle
 - lib/google/2.5/protobuf_c.bundle
 - lib/google/2.6/protobuf_c.bundle
 - lib/google/2.7/protobuf_c.bundle
@@ -129,7 +127,7 @@ 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
+  source_code_uri: https://github.com/protocolbuffers/protobuf/tree/v3.18.2/ruby
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -138,17 +136,17 @@ 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.26
+rubygems_version: 3.3.4
 signing_key: 
 specification_version: 4
 summary: Protocol Buffers