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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36b5a24e7baba88f30b55e3c553cc56a50d3f3841e6ef4239f24386772cf36bd
-  data.tar.gz: bfeea5b2214dfa792b61390a271e5c06ac6e82d54d02d179c39ac50fb560d78d
+  metadata.gz: caf4db2b5d0da1df62193ad5036d365f6cfd8680e421c8fe3e5ced69bcb30a79
+  data.tar.gz: 90dfbe4ffbe13e91b3d68319a8d87ff4df967a942ffe4fa36f7db8b26bed725f
 SHA512:
-  metadata.gz: 9ea31f375af01fdcb7c30ca5328e1c9c833c392a53bbd8df51ea9ef20056ba330819da37684d2623952918baafdd4adf55af9a779e7b614eac311ac565a422f0
-  data.tar.gz: 8a61a18a35c270d6027b1a72d59d44fe4ee978d0b9f1e5e054850b5ef14fba532a953887e28103c16172d7b3042ab4171e4a3e06ff20bee5e5819d38e9946e77
+  metadata.gz: 833215249d13c0572451ea60f668e8cd4108e5e451fd7bea03e7b436d0c02ad678401537194f46d535fba884b04beff18a9b06cae757eb15d5b8e8e4fb078f88
+  data.tar.gz: 0bc92fc8995885325b1f9cb737048dca8782811abaa6980d0760a8745965be0f27a2cb1cb818156d682902dd01e68250530d93a3b7c1f81cf4a9bf547508c961

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