Adopt FFI

.bazelrc

@@ -1 +1,5 @@
 build --cxxopt=-std=c++14 --host_cxxopt=-std=c++14
+common --action_env=PATH
+common --action_env=GEM_HOME
+common --action_env=GEM_PATH
+common --test_env=BAZEL=true

.github/workflows/codespell.yml

@@ -13,4 +13,4 @@ jobs:
         with:
           check_filenames: true
           skip: ./.git,./conformance/third_party,*.snk,*.pb,*.pb.cc,*.pb.h,./src/google/protobuf/testdata,./objectivec/Tests,./python/compatibility_tests/v2.5.0/tests/google/protobuf/internal,./.github/workflows/codespell.yml
-          ignore_words_list: "alow,alse,ba,cleare,copyable,cloneable,dedup,dur,errorprone,files',fo,fundementals,hel,importd,inout,leapyear,nd,nin,ois,ons,parseable,process',te,testof,ue,unparseable,wasn,wee,gae,keyserver,objext,od,optin,streem,sur,falsy"
+          ignore_words_list: "alow,alse,ba,cleare,copyable,cloneable,dedup,dur,errorprone,files',fo,fundementals,hel,importd,inout,leapyear,nd,nin,ois,ons,parseable,process',te,testof,ue,unparseable,wasn,wee,gae,keyserver,objext,od,optin,streem,sur,falsy,upto"

conformance/failure_list_jruby.txt

@@ -1,6 +1,3 @@
-Recommended.FieldMaskNumbersDontRoundTrip.JsonOutput
-Recommended.FieldMaskPathsDontRoundTrip.JsonOutput
-Recommended.FieldMaskTooManyUnderscore.JsonOutput
 Recommended.Proto2.JsonInput.FieldNameExtension.Validator
 Recommended.Proto2.ProtobufInput.ValidDataRepeated.BOOL.PackedInput.PackedOutput.ProtobufOutput
 Recommended.Proto2.ProtobufInput.ValidDataRepeated.BOOL.UnpackedInput.PackedOutput.ProtobufOutput
@@ -30,33 +27,6 @@ Recommended.Proto2.ProtobufInput.ValidDataRepeated.UINT32.PackedInput.PackedOutp
 Recommended.Proto2.ProtobufInput.ValidDataRepeated.UINT32.UnpackedInput.PackedOutput.ProtobufOutput
 Recommended.Proto2.ProtobufInput.ValidDataRepeated.UINT64.PackedInput.PackedOutput.ProtobufOutput
 Recommended.Proto2.ProtobufInput.ValidDataRepeated.UINT64.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto3.JsonInput.BoolFieldAllCapitalFalse
-Recommended.Proto3.JsonInput.BoolFieldAllCapitalTrue
-Recommended.Proto3.JsonInput.BoolFieldCamelCaseFalse
-Recommended.Proto3.JsonInput.BoolFieldCamelCaseTrue
-Recommended.Proto3.JsonInput.BoolFieldDoubleQuotedFalse
-Recommended.Proto3.JsonInput.BoolFieldDoubleQuotedTrue
-Recommended.Proto3.JsonInput.BoolMapFieldKeyNotQuoted
-Recommended.Proto3.JsonInput.DoubleFieldInfinityNotQuoted
-Recommended.Proto3.JsonInput.DoubleFieldNanNotQuoted
-Recommended.Proto3.JsonInput.DoubleFieldNegativeInfinityNotQuoted
-Recommended.Proto3.JsonInput.FieldMaskInvalidCharacter
-Recommended.Proto3.JsonInput.FieldNameDuplicate
-Recommended.Proto3.JsonInput.FieldNameNotQuoted
-Recommended.Proto3.JsonInput.FloatFieldInfinityNotQuoted
-Recommended.Proto3.JsonInput.FloatFieldNanNotQuoted
-Recommended.Proto3.JsonInput.FloatFieldNegativeInfinityNotQuoted
-Recommended.Proto3.JsonInput.Int32MapFieldKeyNotQuoted
-Recommended.Proto3.JsonInput.Int64MapFieldKeyNotQuoted
-Recommended.Proto3.JsonInput.JsonWithComments
-Recommended.Proto3.JsonInput.StringFieldSingleQuoteBoth
-Recommended.Proto3.JsonInput.StringFieldSingleQuoteKey
-Recommended.Proto3.JsonInput.StringFieldSingleQuoteValue
-Recommended.Proto3.JsonInput.StringFieldSurrogateInWrongOrder
-Recommended.Proto3.JsonInput.StringFieldUnpairedHighSurrogate
-Recommended.Proto3.JsonInput.StringFieldUnpairedLowSurrogate
-Recommended.Proto3.JsonInput.Uint32MapFieldKeyNotQuoted
-Recommended.Proto3.JsonInput.Uint64MapFieldKeyNotQuoted
 Recommended.Proto3.ProtobufInput.ValidDataOneofBinary.MESSAGE.Merge.ProtobufOutput
 Recommended.Proto3.ProtobufInput.ValidDataRepeated.BOOL.PackedInput.UnpackedOutput.ProtobufOutput
 Recommended.Proto3.ProtobufInput.ValidDataRepeated.BOOL.UnpackedInput.UnpackedOutput.ProtobufOutput
@@ -86,10 +56,6 @@ Recommended.Proto3.ProtobufInput.ValidDataRepeated.UINT32.PackedInput.UnpackedOu
 Recommended.Proto3.ProtobufInput.ValidDataRepeated.UINT32.UnpackedInput.UnpackedOutput.ProtobufOutput
 Recommended.Proto3.ProtobufInput.ValidDataRepeated.UINT64.PackedInput.UnpackedOutput.ProtobufOutput
 Recommended.Proto3.ProtobufInput.ValidDataRepeated.UINT64.UnpackedInput.UnpackedOutput.ProtobufOutput
-Required.Proto3.JsonInput.EnumFieldNotQuoted
-Required.Proto3.JsonInput.Int32FieldLeadingZero
-Required.Proto3.JsonInput.Int32FieldNegativeWithLeadingZero
-Required.Proto3.JsonInput.Int32FieldPlusSign
-Required.Proto3.JsonInput.RepeatedFieldWrongElementTypeExpectingStringsGotBool
-Required.Proto3.JsonInput.RepeatedFieldWrongElementTypeExpectingStringsGotInt
-Required.Proto3.JsonInput.StringFieldNotAString
+Required.Proto3.JsonInput.DurationNegativeNanos.JsonOutput
+Required.Proto3.JsonInput.DurationNegativeNanos.ProtobufOutput
+Required.Proto3.JsonInput.DurationNegativeSeconds.JsonOutput

kokoro/linux/jruby92/continuous.cfg

@@ -6,7 +6,7 @@ timeout_mins: 120
 
 env_vars {
   key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/ruby/linux:jruby-9.2.20.1-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
+  value: "gcr.io/protobuf-build/ruby/linux:jruby-9.2.20.1-ef6c39622a830821ce540804f815a8466b8fdc27"
 }
 
 env_vars {

kokoro/linux/jruby92/presubmit.cfg

@@ -6,7 +6,7 @@ timeout_mins: 120
 
 env_vars {
   key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/ruby/linux:jruby-9.2.20.1-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
+  value: "gcr.io/protobuf-build/ruby/linux:jruby-9.2.20.1-ef6c39622a830821ce540804f815a8466b8fdc27"
 }
 
 env_vars {

kokoro/linux/jruby93/continuous.cfg

@@ -6,7 +6,7 @@ timeout_mins: 120
 
 env_vars {
   key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/ruby/linux:jruby-9.3.4.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
+  value: "gcr.io/protobuf-build/ruby/linux:jruby-9.3.4.0-ef6c39622a830821ce540804f815a8466b8fdc27"
 }
 
 env_vars {

kokoro/linux/jruby93/presubmit.cfg

@@ -6,7 +6,7 @@ timeout_mins: 120
 
 env_vars {
   key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/ruby/linux:jruby-9.3.4.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
+  value: "gcr.io/protobuf-build/ruby/linux:jruby-9.3.4.0-ef6c39622a830821ce540804f815a8466b8fdc27"
 }
 
 env_vars {

kokoro/linux/ruby25/continuous.cfg

@@ -6,7 +6,7 @@ timeout_mins: 120
 
 env_vars {
   key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/ruby/linux:ruby-2.5.1-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
+  value: "gcr.io/protobuf-build/ruby/linux:ruby-2.5.1-ef6c39622a830821ce540804f815a8466b8fdc27"
 }
 
 env_vars {

kokoro/linux/ruby25/presubmit.cfg

@@ -6,7 +6,7 @@ timeout_mins: 120
 
 env_vars {
   key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/ruby/linux:ruby-2.5.1-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
+  value: "gcr.io/protobuf-build/ruby/linux:ruby-2.5.1-ef6c39622a830821ce540804f815a8466b8fdc27"
 }
 
 env_vars {

kokoro/linux/ruby26/continuous.cfg

@@ -6,7 +6,7 @@ timeout_mins: 120
 
 env_vars {
   key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/ruby/linux:ruby-2.6.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
+  value: "gcr.io/protobuf-build/ruby/linux:ruby-2.6.0-ef6c39622a830821ce540804f815a8466b8fdc27"
 }
 
 env_vars {

kokoro/linux/ruby26/presubmit.cfg

@@ -6,7 +6,7 @@ timeout_mins: 120
 
 env_vars {
   key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/ruby/linux:ruby-2.6.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
+  value: "gcr.io/protobuf-build/ruby/linux:ruby-2.6.0-ef6c39622a830821ce540804f815a8466b8fdc27"
 }
 
 env_vars {

kokoro/linux/ruby27/continuous.cfg

@@ -6,7 +6,7 @@ timeout_mins: 120
 
 env_vars {
   key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/ruby/linux:ruby-2.7.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
+  value: "gcr.io/protobuf-build/ruby/linux:ruby-2.7.0-ef6c39622a830821ce540804f815a8466b8fdc27"
 }
 
 env_vars {

kokoro/linux/ruby27/presubmit.cfg

@@ -6,7 +6,7 @@ timeout_mins: 120
 
 env_vars {
   key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/ruby/linux:ruby-2.7.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
+  value: "gcr.io/protobuf-build/ruby/linux:ruby-2.7.0-ef6c39622a830821ce540804f815a8466b8fdc27"
 }
 
 env_vars {

kokoro/linux/ruby30/continuous.cfg

@@ -6,7 +6,7 @@ timeout_mins: 120
 
 env_vars {
   key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/ruby/linux:ruby-3.0.2-2f706fd1ab49f4e97af769388be486069b63efee"
+  value: "gcr.io/protobuf-build/ruby/linux:ruby-3.0.2-ef6c39622a830821ce540804f815a8466b8fdc27"
 }
 
 env_vars {

kokoro/linux/ruby30/presubmit.cfg

@@ -6,7 +6,7 @@ timeout_mins: 120
 
 env_vars {
   key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/ruby/linux:ruby-3.0.2-2f706fd1ab49f4e97af769388be486069b63efee"
+  value: "gcr.io/protobuf-build/ruby/linux:ruby-3.0.2-ef6c39622a830821ce540804f815a8466b8fdc27"
 }
 
 env_vars {

kokoro/linux/ruby31/continuous.cfg

@@ -6,7 +6,7 @@ timeout_mins: 120
 
 env_vars {
   key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/ruby/linux:ruby-3.1.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
+  value: "gcr.io/protobuf-build/ruby/linux:ruby-3.1.0-ef6c39622a830821ce540804f815a8466b8fdc27"
 }
 
 env_vars {

kokoro/linux/ruby31/presubmit.cfg

@@ -6,7 +6,7 @@ timeout_mins: 120
 
 env_vars {
   key: "CONTAINER_IMAGE"
-  value: "gcr.io/protobuf-build/ruby/linux:ruby-3.1.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8"
+  value: "gcr.io/protobuf-build/ruby/linux:ruby-3.1.0-ef6c39622a830821ce540804f815a8466b8fdc27"
 }
 
 env_vars {

kokoro/release/ruby/linux/ruby/ruby_build.sh

@@ -12,8 +12,8 @@ export PROTOC=$PWD/protoc
 
 umask 0022
 pushd ruby
-gem install bundler -v 2.1.4
-bundle update && bundle exec rake gem:native
+gem install bundler
+bundle update && bundle exec rake gem
 ls pkg
 mv pkg/* $ARTIFACT_DIR
 popd

kokoro/release/ruby/linux/ruby/ruby_build_environment.sh

@@ -4,6 +4,5 @@ set +ex
 [[ -s /etc/profile.d/rvm.sh ]] && . /etc/profile.d/rvm.sh
 set -e  # rvm commands are very verbose
 rvm --default use ruby-2.4.1
-# The version needs to be updated if the version specified in Gemfile.lock is changed
-gem install bundler -v '1.17.3'
+gem install bundler
 set -ex

kokoro/release/ruby/macos/ruby/ruby_build.sh

@@ -8,7 +8,8 @@ export PROTOC=$PWD/bazel-bin/protoc
 
 umask 0022
 pushd ruby
-bundle update && bundle exec rake gem:native
+gem install bundler
+bundle update && bundle exec rake gem
 ls pkg
 mv pkg/* $ARTIFACT_DIR
 popd

ruby/.gitignore

@@ -1,8 +1,7 @@
 *.bundle
 tags
 .idea/
-lib/google/protobuf_java.jar
-protobuf-jruby.iml
+*.iml
 target/
 pkg/
 tmp/

ruby/BUILD.bazel

@@ -26,43 +26,31 @@ filegroup(
     name = "srcs",
     srcs = glob([
         "lib/**/*.rb",
-        "src/**/*.proto",
+        "ext/**/*.{c,h}}",
     ]) + [
         "Gemfile",
         "Rakefile",
         "google-protobuf.gemspec",
-        "pom.xml",
     ],
 )
 
 internal_ruby_extension(
     name = "protobuf_c_mac",
-    extension = "lib/google/protobuf_c.bundle",
+    extension = "ext/google/x86_64-darwin/libprotobuf_c.bundle",
     deps = glob(["ext/google/protobuf_c/*"]),
     target_compatible_with = select({
-        ":java_ruby": ["@platforms//:incompatible"],
+        "@platforms//os:linux": ["@platforms//:incompatible"],
         "//conditions:default": ["@platforms//os:osx"],
     }),
 )
 
 internal_ruby_extension(
     name = "protobuf_c",
-    extension = "lib/google/protobuf_c.so",
+    extension = "ext/google/x86_64-linux/libprotobuf_c.so",
     deps = glob(["ext/google/protobuf_c/*"]),
     target_compatible_with = select({
-        ":java_ruby": ["@platforms//:incompatible"],
         "@platforms//os:osx": ["@platforms//:incompatible"],
-        "//conditions:default": [],
-    }),
-)
-
-internal_ruby_extension(
-    name = "protobuf_java",
-    extension = "lib/google/protobuf_java.jar",
-    deps = glob(["src/**/*.java"]),
-    target_compatible_with = select({
-        ":java_ruby": [],
-        "//conditions:default": ["@platforms//:incompatible"],
+        "//conditions:default": ["@platforms//os:linux"],
     }),
 )
 
@@ -72,7 +60,6 @@ filegroup(
         ":srcs",
         "//third_party/utf8_range:all_files",
     ] + select({
-        ":java_ruby": [":protobuf_java"],
         "@bazel_tools//src/conditions:darwin": [":protobuf_c_mac"],
         "//conditions:default": [":protobuf_c"],
     }),
@@ -116,7 +103,7 @@ inline_sh_test(
     ],
     cmd = """
         pushd `dirname $(location Rakefile)`
-        RUBYLIB=../src:tests:. BAZEL=true rake test
+        RUBYLIB=../src:tests:. rake test
         popd
     """,
 )
@@ -134,9 +121,15 @@ inline_sh_test(
     ],
     cmd = """
         pushd `dirname $(location Rakefile)`
-        RUBYLIB=../src:tests:. BAZEL=true rake gc_test
+        RUBYLIB=../src:tests:. rake gc_test
         popd
     """,
+    timeout = "long",
+    # Under JRuby, GC.stress is a no-op, so skip running this test.
+    target_compatible_with = select({
+        ":java_ruby": ["@platforms//:incompatible"],
+        "//conditions:default": [],
+    }),
 )
 
 conformance_test(

ruby/README.md

@@ -59,12 +59,6 @@ To build this Ruby extension, you will need:
 * Ruby development headers
 * a C compiler
 
-To Build the JRuby extension, you will need:
-
-* Maven
-* The latest version of the protobuf java library (see ../java/README.md)
-* Install JRuby via rbenv or RVM
-
 First switch to the desired platform with rbenv or RVM.
 
 Then install the required Ruby gems: