Handle jruby versioning correctly for jar dependency

Author: mkruskal-google

WORKSPACE

@@ -77,7 +77,6 @@ register_toolchains("@system_ruby//:toolchain")
 load("@system_ruby//:bundle.bzl", "ruby_bundle")
 ruby_bundle(
     name = "protobuf_bundle",
-    bundler_version = "2.3.17",
     srcs = ["//ruby:google-protobuf.gemspec"],
     gemfile = "//ruby:Gemfile",
 )

maven_install.json

@@ -1,8 +1,8 @@
 {
     "dependency_tree": {
         "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-        "__INPUT_ARTIFACTS_HASH": 1092524136,
-        "__RESOLVED_ARTIFACTS_HASH": -621579158,
+        "__INPUT_ARTIFACTS_HASH": -1875290602,
+        "__RESOLVED_ARTIFACTS_HASH": -1248440885,
         "conflict_resolution": {
             "com.google.errorprone:error_prone_annotations:2.5.1": "com.google.errorprone:error_prone_annotations:2.11.0"
         },
@@ -651,18 +651,6 @@
                 "sha256": "66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9",
                 "url": "https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"
             },
-            {
-                "coord": "org.jruby:jruby-complete:9.2.20.1",
-                "dependencies": [],
-                "directDependencies": [],
-                "file": "v1/https/repo1.maven.org/maven2/org/jruby/jruby-complete/9.2.20.1/jruby-complete-9.2.20.1.jar",
-                "mirror_urls": [
-                    "https://repo1.maven.org/maven2/org/jruby/jruby-complete/9.2.20.1/jruby-complete-9.2.20.1.jar",
-                    "https://repo.maven.apache.org/maven2/org/jruby/jruby-complete/9.2.20.1/jruby-complete-9.2.20.1.jar"
-                ],
-                "sha256": "c1bbc2ab5f0c5ca45cc5aa937060f35a321a480202e451eb9242fc14938b8289",
-                "url": "https://repo1.maven.org/maven2/org/jruby/jruby-complete/9.2.20.1/jruby-complete-9.2.20.1.jar"
-            },
             {
                 "coord": "org.mockito:mockito-core:4.3.1",
                 "dependencies": [

protobuf_deps.bzl

@@ -13,7 +13,6 @@ PROTOBUF_MAVEN_ARTIFACTS = [
     "com.google.truth:truth:1.1.2",
     "junit:junit:4.13.2",
     "org.mockito:mockito-core:4.3.1",
-    "org.jruby:jruby-complete:9.2.20.1"
 ]
 
 def _github_archive(repo, commit, **kwargs):
@@ -111,8 +110,8 @@ def protobuf_deps():
         _github_archive(
             name = "rules_ruby",
             repo = "https://github.com/protocolbuffers/rules_ruby",
-            commit = "b8f651f80a5fad90d4db6e486b0ae047a8a46640",
-            sha256 = "87c566c9c703e95e0a945a99d0c16c721a10be05cde671a8112182b00ae26c62",
+            commit = "59732544ce3a4bc4e8e4d4e8c8f318c931c17eae",
+            sha256 = "4fc45adf1056c824afde9a52b743b915eeada3633539eb1dbd641a66dc9f4c4f",
         )
 
     if not native.existing_rule("rules_jvm_external"):

ruby/BUILD.bazel

@@ -41,8 +41,8 @@ conformance_test(
     testee = "//conformance:conformance_ruby",
     text_format_failure_list = "//conformance:text_format_failure_list_ruby.txt",
     target_compatible_with = select({
-        "@rules_ruby//ruby/runtime:config_jruby": ["@platforms//:incompatible"],
-        "//conditions:default": [],
+        "@rules_ruby//ruby/runtime:config_ruby": [],
+        "//conditions:default": ["@platforms//:incompatible"],
     }),
 )
 

ruby/src/main/java/BUILD.bazel

@@ -10,10 +10,14 @@ java_library(
         "google/ProtobufJavaService.java"
     ],
     deps = [
-        "@maven//:org_jruby_jruby_complete",
+        "@rules_ruby//ruby/runtime:jars",
         "//java/core",
         "//java/util",
     ],
+    target_compatible_with = select({
+        "@rules_ruby//ruby/runtime:config_jruby": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
     visibility = ["//ruby:__subpackages__"],
 )