From 1933dd700c21098f9846e5d9e3c4962d5439bc9c Mon Sep 17 00:00:00 2001 From: aguspe Date: Thu, 16 Jan 2025 16:04:06 +0100 Subject: [PATCH 1/6] Update Gemfile.lock and checksums --- MODULE.bazel | 64 ++++++++++++++++++++++--------------------------- rb/Gemfile.lock | 25 +++---------------- 2 files changed, 31 insertions(+), 58 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index b42ab84ef40bc..97d16b9567ab6 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -295,76 +295,68 @@ ruby.bundle_fetch( "ast-2.4.2": "1e280232e6a33754cde542bc5ef85520b74db2aac73ec14acef453784447cc12", "base64-0.2.0": "0f25e9b21a02a0cc0cea8ef92b2041035d39350946e8789c562b2d1a3da01507", "benchmark-0.4.0": "0f12f8c495545e3710c3e4f0480f63f06b4c842cc94cec7f33a956f5180e874a", - "bigdecimal-3.1.8": "a89467ed5a44f8ae01824af49cbc575871fa078332e8f77ea425725c1ffe27be", - "bigdecimal-3.1.8-java": "b9e94c14623fff8575f17a10320852219bbba92ecff4977571503d942687326e", - "concurrent-ruby-1.3.4": "d4aa926339b0a86b5b5054a0a8c580163e6f5dcbdfd0f4bb916b1a2570731c32", - "connection_pool-2.4.1": "0f40cf997091f1f04ff66da67eabd61a9fe0d4928b9a3645228532512fab62f4", + "bigdecimal-3.1.9": "2ffc742031521ad69c2dfc815a98e426a230a3d22aeac1995826a75dabfad8cc", + "concurrent-ruby-1.3.5": "813b3e37aca6df2a21a3b9f1d497f8cbab24a2b94cab325bffe65ee0f6cbebc6", + "connection_pool-2.5.0": "233b92f8d38e038c1349ccea65dd3772727d669d6d2e71f9897c8bf5cd53ebfc", "crack-1.0.0": "c83aefdb428cdc7b66c7f287e488c796f055c0839e6e545fec2c7047743c4a49", - "csv-3.3.0": "0bbd1defdc31134abefed027a639b3723c2753862150f4c3ee61cab71b20d67d", + "csv-3.3.2": "6ff0c135e65e485d1864dde6c1703b60d34cc9e19bed8452834a0b28a519bd4e", "curb-1.0.6": "b369434efa91dc7310d72a74f8a228a5b920e3d5a89b0a3097e4c6a905af6eb2", - "debug-1.9.2": "48e026c0852c7a10c60263e2e527968308958e266231e36d64e3efcabec7e7fc", + "date-3.4.1": "bf268e14ef7158009bfeaec40b5fa3c7271906e88b196d958a89d4b408abe64f", + "debug-1.10.0": "11e28ca74875979e612444104f3972bd5ffb9e79179907d7ad46dba44bd2e7a4", "diff-lcs-1.5.1": "273223dfb40685548436d32b4733aa67351769c7dea621da7d9dd4813e63ddfe", "drb-2.2.1": "e9d472bf785f558b96b25358bae115646da0dbfd45107ad858b0bc0d935cb340", - "ffi-1.17.0": "51630e43425078311c056ca75f961bb3bda1641ab36e44ad4c455e0b0e4a231c", - "ffi-1.17.0-java": "f65f022616970fcde83fe176393eb873a7b959ef2703f94931cf0af6ab55ec7a", - "ffi-1.17.0-x86_64-darwin": "fdcd48c69db3303ef95aec5c64d6275fcf9878a02c0bec0afddc506ceca0f56b", + "ffi-1.17.1-arm64-darwin": "a8e04f79d375742c54ee7f9fff4b4022b87200a4ec0eb082128d3b6559e67b4d", "fileutils-1.7.3": "57271e854b694a87755d76f836f5c57b2c9538ebbaf4b2154bb66addf15eb5da", "git-1.19.1": "b0a422d9f6517353c48a330d6114de4db9e0c82dbe7202964a1d9f1fbc827d70", "hashdiff-1.1.2": "2c30eeded6ed3dce8401d2b5b99e6963fe5f14ed85e60dd9e33c545a44b71a77", "i18n-1.14.6": "dc229a74f5d181f09942dd60ab5d6e667f7392c4ee826f35096db36d1fe3614c", - "io-console-0.7.2": "f0dccff252f877a4f60d04a4dc6b442b185ebffb4b320ab69212a92b48a7a221", - "io-console-0.7.2-java": "73aa382f8832b116613ceaf57b8ff5bf73dfedcaf39f0aa5420e10f63a4543ed", - "irb-1.14.1": "5975003b58d36efaf492380baa982ceedf5aed36967a4d5b40996bc5c66e80f8", - "jar-dependencies-0.4.1": "b2df2f1ecbff15334ce20ea7fdd5b8d8161faab67761ff72c7647d728e40d387", - "json-2.8.2": "dd4fa6c9c81daecf72b86ea36e56ed8955fdbb4d4dc379c93d313a59344486cf", - "json-2.8.2-java": "7a7321efd8fad215a1afe92b5f16546203f193781da2d5c01587600cc00aa302", + "io-console-0.8.0": "cd6a9facbc69871d69b2cb8b926fc6ea7ef06f06e505e81a64f14a470fddefa2", + "irb-1.14.3": "c457f1f2f1438ae9ce5c5be3981ae2138dec7fb894c7d73777eeeb0a6c0d0752", + "json-2.9.1": "d2bdef4644052fad91c1785d48263756fe32fcac08b96a20bb15840e96550d11", "language_server-protocol-3.17.0.3": "3d5c58c02f44a20d972957a9febe386d7e7468ab3900ce6bd2b563dd910c6b3f", "listen-3.9.0": "db9e4424e0e5834480385197c139cb6b0ae0ef28cc13310cfd1ca78377d59c67", - "logger-1.6.1": "3ad9587ed3940bf7897ea64a673971415523f4f7d6b22c5e3af5219705669653", - "minitest-5.25.2": "59b379d63e0058159127b545c4725d3106624c9be2b3e030ddaee825d59e83eb", + "logger-1.6.5": "c3cfe56d01656490ddd103d38b8993d73d86296adebc5f58cefc9ec03741e56b", + "minitest-5.25.4": "9cf2cae25ac4dfc90c988ebc3b917f53c054978b673273da1bd20bcb0778f947", "parallel-1.26.3": "d86babb7a2b814be9f4b81587bf0b6ce2da7d45969fab24d8ae4bf2bb4d4c7ef", - "parser-3.3.6.0": "25d4e67cc4f0f7cab9a2ae1f38e2005b6904d2ea13c34734511d0faad038bc3b", - "psych-5.2.0": "6603fe756bcaf14daa25bc17625f36c90931dcf70452ac1e8da19760dc310573", - "psych-5.2.0-java": "da3a7995e652365faa210d7658a291141c9a15bf05a4d9a48a13856b04f36960", + "parser-3.3.7.0": "7449011771e3e7881297859b849de26a6f4fccd515bece9520a87e7d2116119b", + "psych-5.2.2": "a4a9477c85d3e858086c38cf64e7096abe40d1b1eed248b01020dec0ff9906ab", "public_suffix-6.0.1": "61d44e1cab5cbbbe5b31068481cf16976dd0dc1b6b07bd95617ef8c5e3e00c6f", "racc-1.8.1": "4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f", - "racc-1.8.1-java": "54f2e6d1e1b91c154013277d986f52a90e5ececbe91465d29172e49342732b98", "rack-2.2.10": "e4a5ee3f8f2ba45614a4498114d6dc7da1c51a0f0dd810d891906ea71d3aa72b", "rainbow-3.1.1": "039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a", "rake-13.2.1": "46cb38dae65d7d74b6020a4ac9d48afed8eb8149c040eccf0523bec91907059d", "rb-fsevent-0.11.2": "43900b972e7301d6570f64b850a5aa67833ee7d87b458ee92805d56b7318aefe", "rb-inotify-0.11.1": "a0a700441239b0ff18eb65e3866236cd78613d6b9f78fea1f9ac47a85e47be6e", - "rbs-3.6.1": "ed7273d018556844583d1785ac54194e67eec594d68e317d57fa90ad035532c0", - "rchardet-1.8.0": "693acd5253d5ade81a51940697955f6dd4bb2f0d245bda76a8e23deec70a52c7", - "rdoc-6.8.1": "0128002d1bfc4892bdd780940841e4ca41275f63781fd832d11bc8ba4461462c", - "regexp_parser-2.9.2": "5a27e767ad634f8a4b544520d5cd28a0db7aa1198a5d7c9d7e11d7b3d9066446", - "reline-0.5.11": "868d5f4dbfd9caafa70182f7f6fa258b70baee4e565d7cd9e70b4d5b11a7cb65", - "rexml-3.3.9": "d71875b85299f341edf47d44df0212e7658cbdf35aeb69cefdb63f57af3137c9", + "rbs-3.8.1": "2b6ce37952e267e1d3ad330aabfadbdceac234193a60cc18f25a8f75fa949c1d", + "rchardet-1.9.0": "26889486cdd83b378652baf7603f71d93e431bb11bc237b4cd8c65151af4a590", + "rdoc-6.11.0": "bec66fb9b019be64f7ba7d2cd2aecb283a3a01fef23a95b33e2349c6d1aa0040", + "regexp_parser-2.10.0": "cb6f0ddde88772cd64bff1dbbf68df66d376043fe2e66a9ef77fcb1b0c548c61", + "reline-0.6.0": "57620375dcbe56ec09bac7192bfb7460c716bbf0054dc94345ecaa5438e539d2", + "rexml-3.4.0": "efbea1efba7fa151158e0ee1e643525834da2d8eb4cf744aa68f6480bc9804b2", "rspec-3.13.0": "d490914ac1d5a5a64a0e1400c1d54ddd2a501324d703b8cfe83f458337bab993", "rspec-core-3.13.2": "94fbda6e4738e478f1c7532b7cc241272fcdc8b9eac03a97338b1122e4573300", "rspec-expectations-3.13.3": "0e6b5af59b900147698ea0ff80456c4f2e69cac4394fbd392fbd1ca561f66c58", "rspec-mocks-3.13.2": "2327335def0e1665325a9b617e3af9ae20272741d80ac550336309a7c59abdef", - "rspec-support-3.13.1": "48877d4f15b772b7538f3693c22225f2eda490ba65a0515c4e7cf6f2f17de70f", - "rubocop-1.68.0": "07df508504d81e97174e8d21030f25d52c1be7ee8615939db43f3b377ea6c12b", - "rubocop-ast-1.36.1": "15d89a8953178bc32561d481a3620496e70933a228be1e3b6997b01b8d587b79", + "rspec-support-3.13.2": "cea3a2463fd9b84b9dcc9685efd80ea701aa8f7b3decb3b3ce795ed67737dbec", + "rubocop-1.70.0": "96751f8440b36a0ac6e9a8ab596900803118d83d6b83f2037bf8b3d7a5bc440e", + "rubocop-ast-1.37.0": "9513ac88aaf113d04b52912533ffe46475de1362d4aa41141b51b2455827c080", "rubocop-capybara-2.21.0": "5d264efdd8b6c7081a3d4889decf1451a1cfaaec204d81534e236bc825b280ab", "rubocop-factory_bot-2.26.1": "8de13cd4edcee5ca800f255188167ecef8dbfc3d1fae9f15734e9d2e755392aa", - "rubocop-performance-1.23.0": "34ae78cb1bc5f1a0b34a34a1f9f6eec2cb8b8b9cafa2ce37982021e86fa49171", + "rubocop-performance-1.23.1": "f22f86a795f5e6a6180aac2c6fc172534b173a068d6ed3396d6460523e051b82", "rubocop-rake-0.6.0": "56b6f22189af4b33d4f4e490a555c09f1281b02f4d48c3a61f6e8fe5f401d8db", "rubocop-rspec-2.31.0": "2bae19388d78e1ceace44cd95fd34f3209f4ef20cac1b168d0a1325cbba3d672", "rubocop-rspec_rails-2.29.1": "4ae95abbe9ca5a9b6d8be14e50d230fb5b6ba033b05d4c0981b5b76fc44988e4", "ruby-progressbar-1.13.0": "80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33", - "rubyzip-2.3.2": "3f57e3935dc2255c414484fbf8d673b4909d8a6a57007ed754dde39342d2373f", - "securerandom-0.3.2": "e8b2ffa651dfbbb26eb4bfb8ddcfff94221a93e3f118f39e0f7f94c14fea9dc0", + "rubyzip-2.4.1": "8577c88edc1fde8935eb91064c5cb1aef9ad5494b940cf19c775ee833e075615", + "securerandom-0.4.1": "cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1", "steep-1.5.3": "7c6302a4d5932d0a46176ebc79766e52b853c223a85525aa2f8911e345123b85", "stringio-3.1.2": "204f1828f85cdb39d57cac4abc6dc44b04505a223f131587f2e20ae3729ba131", - "strscan-3.1.0": "01b8a81d214fbf7b5308c6fb51b5972bbfc4a6aa1f166fd3618ba97e0fcd5555", - "strscan-3.1.0-java": "8645aa76e017e21764c6df572d2d79fcc1672284014f5bdbd806278cdbcd11b0", + "strscan-3.1.2": "5529ff36c95fe752b8489f2e6c7f4f230fd9904e0b24fdc6e0833436c63ee2e3", "terminal-table-3.0.2": "f951b6af5f3e00203fb290a669e0a85c5dd5b051b3b023392ccfd67ba5abae91", "tzinfo-2.0.6": "8daf828cc77bcf7d63b0e3bdb6caa47e2272dcfaf4fbfe46f8c3a9df087a829b", "unicode-display_width-2.6.0": "12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a", "webmock-3.24.0": "be01357f6fc773606337ca79f3ba332b7d52cbe5c27587671abc0572dbec7122", - "webrick-1.9.0": "9ee50c57006489960b2a07544f68de6f23dfbee30e7b424167b5c14b72ace964", + "webrick-1.9.1": "b42d3c94f166f3fb73d87e9b359def9b5836c426fc8beacf38f2184a21b2a989", "websocket-1.2.11": "b7e7a74e2410b5e85c25858b26b3322f29161e300935f70a0e0d3c35e0462737", "yard-0.9.37": "a6e910399e78e613f80ba9add9ba7c394b1a935f083cccbef82903a3d2a26992", }, diff --git a/rb/Gemfile.lock b/rb/Gemfile.lock index 61b64a99652fc..2d716ad534b34 100644 --- a/rb/Gemfile.lock +++ b/rb/Gemfile.lock @@ -31,7 +31,6 @@ GEM base64 (0.2.0) benchmark (0.4.0) bigdecimal (3.1.9) - bigdecimal (3.1.9-java) concurrent-ruby (1.3.5) connection_pool (2.5.0) crack (1.0.0) @@ -40,15 +39,12 @@ GEM csv (3.3.2) curb (1.0.6) date (3.4.1) - date (3.4.1-java) debug (1.10.0) irb (~> 1.10) reline (>= 0.3.8) diff-lcs (1.5.1) drb (2.2.1) - ffi (1.17.1) - ffi (1.17.1-java) - ffi (1.17.1-x86_64-darwin) + ffi (1.17.1-arm64-darwin) fileutils (1.7.3) git (1.19.1) addressable (~> 2.8) @@ -57,13 +53,10 @@ GEM i18n (1.14.6) concurrent-ruby (~> 1.0) io-console (0.8.0) - io-console (0.8.0-java) irb (1.14.3) rdoc (>= 4.0.0) reline (>= 0.4.2) - jar-dependencies (0.4.1) json (2.9.1) - json (2.9.1-java) language_server-protocol (3.17.0.3) listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) @@ -77,12 +70,8 @@ GEM psych (5.2.2) date stringio - psych (5.2.2-java) - date - jar-dependencies (>= 0.1.7) public_suffix (6.0.1) racc (1.8.1) - racc (1.8.1-java) rack (2.2.10) rainbow (3.1.1) rake (13.2.1) @@ -92,7 +81,7 @@ GEM rbs (3.8.1) logger rchardet (1.9.0) - rdoc (6.10.0) + rdoc (6.11.0) psych (>= 4.0.0) regexp_parser (2.10.0) reline (0.6.0) @@ -159,7 +148,6 @@ GEM terminal-table (>= 2, < 4) stringio (3.1.2) strscan (3.1.2) - strscan (3.1.2-java) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) tzinfo (2.0.6) @@ -174,14 +162,7 @@ GEM yard (0.9.37) PLATFORMS - java - ruby - universal-java-1.8 - universal-java-17 - universal-java-18 - universal-java-21 - x64-mingw32 - x86_64-darwin-22 + arm64-darwin-24 DEPENDENCIES curb (~> 1.0.5) From 7b2108c0666a9dbf28886dd18c6ba0ddbe3d9f96 Mon Sep 17 00:00:00 2001 From: aguspe Date: Thu, 16 Jan 2025 16:21:57 +0100 Subject: [PATCH 2/6] Platform added and tested locally --- rb/Gemfile.lock | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/rb/Gemfile.lock b/rb/Gemfile.lock index 2d716ad534b34..001ec5bf255fa 100644 --- a/rb/Gemfile.lock +++ b/rb/Gemfile.lock @@ -31,6 +31,7 @@ GEM base64 (0.2.0) benchmark (0.4.0) bigdecimal (3.1.9) + bigdecimal (3.1.9-java) concurrent-ruby (1.3.5) connection_pool (2.5.0) crack (1.0.0) @@ -45,6 +46,7 @@ GEM diff-lcs (1.5.1) drb (2.2.1) ffi (1.17.1-arm64-darwin) + ffi (1.17.1-java) fileutils (1.7.3) git (1.19.1) addressable (~> 2.8) @@ -53,10 +55,13 @@ GEM i18n (1.14.6) concurrent-ruby (~> 1.0) io-console (0.8.0) + io-console (0.8.0-java) irb (1.14.3) rdoc (>= 4.0.0) reline (>= 0.4.2) + jar-dependencies (0.4.1) json (2.9.1) + json (2.9.1-java) language_server-protocol (3.17.0.3) listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) @@ -70,8 +75,12 @@ GEM psych (5.2.2) date stringio + psych (5.2.2-java) + date + jar-dependencies (>= 0.1.7) public_suffix (6.0.1) racc (1.8.1) + racc (1.8.1-java) rack (2.2.10) rainbow (3.1.1) rake (13.2.1) @@ -148,6 +157,7 @@ GEM terminal-table (>= 2, < 4) stringio (3.1.2) strscan (3.1.2) + strscan (3.1.2-java) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) tzinfo (2.0.6) @@ -163,6 +173,7 @@ GEM PLATFORMS arm64-darwin-24 + universal-java-17 DEPENDENCIES curb (~> 1.0.5) From 13f78d5c911186b90d78c8d79aeac5682c712821 Mon Sep 17 00:00:00 2001 From: aguspe Date: Thu, 16 Jan 2025 16:42:19 +0100 Subject: [PATCH 3/6] FIx rubocop issues --- rb/lib/selenium/webdriver/bidi/struct.rb | 2 +- rb/lib/selenium/webdriver/common/logger.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rb/lib/selenium/webdriver/bidi/struct.rb b/rb/lib/selenium/webdriver/bidi/struct.rb index 1e54477818e84..951f09b8ad03a 100644 --- a/rb/lib/selenium/webdriver/bidi/struct.rb +++ b/rb/lib/selenium/webdriver/bidi/struct.rb @@ -23,7 +23,7 @@ class BiDi class Struct < ::Struct class << self def new(*args, &block) - super(*args) do + super do define_method(:initialize) do |**kwargs| converted_kwargs = kwargs.transform_keys { |key| self.class.camel_to_snake(key.to_s).to_sym } super(*converted_kwargs.values_at(*self.class.members)) diff --git a/rb/lib/selenium/webdriver/common/logger.rb b/rb/lib/selenium/webdriver/common/logger.rb index 810b87a8e3c31..7fd2f5c169e4a 100644 --- a/rb/lib/selenium/webdriver/common/logger.rb +++ b/rb/lib/selenium/webdriver/common/logger.rb @@ -194,7 +194,7 @@ def create_logger(name, level:) def discard_or_log(level, message, id) id = Array(id) return if @ignored.intersect?(id) - return if @allowed.any? && (@allowed & id).none? + return if @allowed.any? && !@allowed.intersect?(id) return if ::Logger::Severity.const_get(level.upcase) < @logger.level From d046397a215f1b3edb3d4d1928240efdec031ef1 Mon Sep 17 00:00:00 2001 From: aguspe Date: Thu, 16 Jan 2025 17:13:37 +0100 Subject: [PATCH 4/6] Push new platform and module --- MODULE.bazel | 9 +++++++++ rb/Gemfile.lock | 2 ++ 2 files changed, 11 insertions(+) diff --git a/MODULE.bazel b/MODULE.bazel index 97d16b9567ab6..feac819a45731 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -296,6 +296,7 @@ ruby.bundle_fetch( "base64-0.2.0": "0f25e9b21a02a0cc0cea8ef92b2041035d39350946e8789c562b2d1a3da01507", "benchmark-0.4.0": "0f12f8c495545e3710c3e4f0480f63f06b4c842cc94cec7f33a956f5180e874a", "bigdecimal-3.1.9": "2ffc742031521ad69c2dfc815a98e426a230a3d22aeac1995826a75dabfad8cc", + "bigdecimal-3.1.9-java": "dd9b8f7c870664cd9538a1325ce385ba57a6627969177258c4f0e661a7be4456", "concurrent-ruby-1.3.5": "813b3e37aca6df2a21a3b9f1d497f8cbab24a2b94cab325bffe65ee0f6cbebc6", "connection_pool-2.5.0": "233b92f8d38e038c1349ccea65dd3772727d669d6d2e71f9897c8bf5cd53ebfc", "crack-1.0.0": "c83aefdb428cdc7b66c7f287e488c796f055c0839e6e545fec2c7047743c4a49", @@ -306,13 +307,18 @@ ruby.bundle_fetch( "diff-lcs-1.5.1": "273223dfb40685548436d32b4733aa67351769c7dea621da7d9dd4813e63ddfe", "drb-2.2.1": "e9d472bf785f558b96b25358bae115646da0dbfd45107ad858b0bc0d935cb340", "ffi-1.17.1-arm64-darwin": "a8e04f79d375742c54ee7f9fff4b4022b87200a4ec0eb082128d3b6559e67b4d", + "ffi-1.17.1-java": "2546e11f9592e2b9b6de49eb96d2a378da47b0bb8469d5cbc9881a55c0d55da7", + "ffi-1.17.1-x86_64-linux-gnu": "8c0ade2a5d19f3672bccfe3b58e016ae5f159e3e2e741c856db87fcf07c903d0", "fileutils-1.7.3": "57271e854b694a87755d76f836f5c57b2c9538ebbaf4b2154bb66addf15eb5da", "git-1.19.1": "b0a422d9f6517353c48a330d6114de4db9e0c82dbe7202964a1d9f1fbc827d70", "hashdiff-1.1.2": "2c30eeded6ed3dce8401d2b5b99e6963fe5f14ed85e60dd9e33c545a44b71a77", "i18n-1.14.6": "dc229a74f5d181f09942dd60ab5d6e667f7392c4ee826f35096db36d1fe3614c", "io-console-0.8.0": "cd6a9facbc69871d69b2cb8b926fc6ea7ef06f06e505e81a64f14a470fddefa2", + "io-console-0.8.0-java": "3cc6fd5c66e587145c1fdf8dc40c2e3d851e90722a5d0cc3f38da352f06fe1bd", "irb-1.14.3": "c457f1f2f1438ae9ce5c5be3981ae2138dec7fb894c7d73777eeeb0a6c0d0752", + "jar-dependencies-0.4.1": "b2df2f1ecbff15334ce20ea7fdd5b8d8161faab67761ff72c7647d728e40d387", "json-2.9.1": "d2bdef4644052fad91c1785d48263756fe32fcac08b96a20bb15840e96550d11", + "json-2.9.1-java": "88de8c79b54fee6ae1b4854bc48b8d7089f524cbacaf4596df24f86b10896ee8", "language_server-protocol-3.17.0.3": "3d5c58c02f44a20d972957a9febe386d7e7468ab3900ce6bd2b563dd910c6b3f", "listen-3.9.0": "db9e4424e0e5834480385197c139cb6b0ae0ef28cc13310cfd1ca78377d59c67", "logger-1.6.5": "c3cfe56d01656490ddd103d38b8993d73d86296adebc5f58cefc9ec03741e56b", @@ -320,8 +326,10 @@ ruby.bundle_fetch( "parallel-1.26.3": "d86babb7a2b814be9f4b81587bf0b6ce2da7d45969fab24d8ae4bf2bb4d4c7ef", "parser-3.3.7.0": "7449011771e3e7881297859b849de26a6f4fccd515bece9520a87e7d2116119b", "psych-5.2.2": "a4a9477c85d3e858086c38cf64e7096abe40d1b1eed248b01020dec0ff9906ab", + "psych-5.2.2-java": "dae010e0bbc01e03da5c42cf538705759fb592f42eb9e06baf9bce932c2d7c4e", "public_suffix-6.0.1": "61d44e1cab5cbbbe5b31068481cf16976dd0dc1b6b07bd95617ef8c5e3e00c6f", "racc-1.8.1": "4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f", + "racc-1.8.1-java": "54f2e6d1e1b91c154013277d986f52a90e5ececbe91465d29172e49342732b98", "rack-2.2.10": "e4a5ee3f8f2ba45614a4498114d6dc7da1c51a0f0dd810d891906ea71d3aa72b", "rainbow-3.1.1": "039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a", "rake-13.2.1": "46cb38dae65d7d74b6020a4ac9d48afed8eb8149c040eccf0523bec91907059d", @@ -352,6 +360,7 @@ ruby.bundle_fetch( "steep-1.5.3": "7c6302a4d5932d0a46176ebc79766e52b853c223a85525aa2f8911e345123b85", "stringio-3.1.2": "204f1828f85cdb39d57cac4abc6dc44b04505a223f131587f2e20ae3729ba131", "strscan-3.1.2": "5529ff36c95fe752b8489f2e6c7f4f230fd9904e0b24fdc6e0833436c63ee2e3", + "strscan-3.1.2-java": "4e9379df974b1af28d1bc1bc845ebb7e2bb21a7f9948ac99e1a8c5479881ecec", "terminal-table-3.0.2": "f951b6af5f3e00203fb290a669e0a85c5dd5b051b3b023392ccfd67ba5abae91", "tzinfo-2.0.6": "8daf828cc77bcf7d63b0e3bdb6caa47e2272dcfaf4fbfe46f8c3a9df087a829b", "unicode-display_width-2.6.0": "12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a", diff --git a/rb/Gemfile.lock b/rb/Gemfile.lock index 001ec5bf255fa..a0a6ef08baa3c 100644 --- a/rb/Gemfile.lock +++ b/rb/Gemfile.lock @@ -47,6 +47,7 @@ GEM drb (2.2.1) ffi (1.17.1-arm64-darwin) ffi (1.17.1-java) + ffi (1.17.1-x86_64-linux-gnu) fileutils (1.7.3) git (1.19.1) addressable (~> 2.8) @@ -174,6 +175,7 @@ GEM PLATFORMS arm64-darwin-24 universal-java-17 + x86_64-linux DEPENDENCIES curb (~> 1.0.5) From f74832ab6d7e9146773a627c7b0274a6f024136c Mon Sep 17 00:00:00 2001 From: aguspe Date: Thu, 16 Jan 2025 17:39:26 +0100 Subject: [PATCH 5/6] Formatting fixed --- MODULE.bazel | 38 ++++---------------------------------- rb/Gemfile.lock | 3 +++ 2 files changed, 7 insertions(+), 34 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index feac819a45731..cb32749b56dfb 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -12,10 +12,11 @@ bazel_dep(name = "contrib_rules_jvm", version = "0.27.0") bazel_dep(name = "platforms", version = "0.0.10") # Required for the closure rules -bazel_dep(name = "protobuf", dev_dependency = True, repo_name = "com_google_protobuf", version = "29.2") +bazel_dep(name = "protobuf", version = "29.2", dev_dependency = True, repo_name = "com_google_protobuf") # Required for rules_rust to import the crates properly -bazel_dep(name = "rules_cc", dev_dependency = True, version = "0.0.9") +bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True) + bazel_dep(name = "rules_dotnet", version = "0.17.5") bazel_dep(name = "rules_java", version = "7.12.4") bazel_dep(name = "rules_jvm_external", version = "6.6") @@ -27,21 +28,17 @@ bazel_dep(name = "rules_proto", version = "6.0.2") bazel_dep(name = "rules_ruby", version = "0.13.0") linter = use_extension("@apple_rules_lint//lint:extensions.bzl", "linter") - linter.configure( name = "java-spotbugs", config = "//java:spotbugs-config", ) - linter.configure( name = "rust-rustfmt", config = "//rust:enable-rustfmt", ) - linter.register(name = "rust-rustfmt") node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node") - node.toolchain(node_version = "20.9.0") pnpm = use_extension( @@ -49,11 +46,9 @@ pnpm = use_extension( "pnpm", dev_dependency = True, ) - use_repo(pnpm, "pnpm") npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm") - npm.npm_translate_lock( name = "npm", data = [ @@ -68,7 +63,6 @@ npm.npm_translate_lock( update_pnpm_lock = True, verify_node_modules_ignored = "//:.bazelignore", ) - use_repo(npm, "npm") rules_ts_ext = use_extension( @@ -76,68 +70,52 @@ rules_ts_ext = use_extension( "ext", dev_dependency = True, ) - rules_ts_ext.deps( ts_version = "4.9.5", ) - use_repo(rules_ts_ext, "npm_typescript") esbuild = use_extension("@aspect_rules_esbuild//esbuild:extensions.bzl", "esbuild") - esbuild.toolchain(esbuild_version = "0.23.0") - use_repo(esbuild, "esbuild_toolchains") register_toolchains("@esbuild_toolchains//:all") dotnet = use_extension("@rules_dotnet//dotnet:extensions.bzl", "dotnet") - dotnet.toolchain(dotnet_version = "8.0.203") - use_repo(dotnet, "dotnet_toolchains") selenium_paket = use_extension("//dotnet:paket.nuget_extension.bzl", "nuget_extension") - use_repo(selenium_paket, "paket.nuget") register_toolchains("@dotnet_toolchains//:all") oci = use_extension("@rules_oci//oci:extensions.bzl", "oci") - oci.pull( name = "java_image_base", digest = "sha256:161a1d97d592b3f1919801578c3a47c8e932071168a96267698f4b669c24c76d", image = "gcr.io/distroless/java17", ) - oci.pull( name = "firefox_standalone", digest = "sha256:b6d8279268b3183d0d33e667e82fec1824298902f77718764076de763673124f", image = "index.docker.io/selenium/standalone-firefox", ) - oci.pull( name = "chrome_standalone", digest = "sha256:1b809a961a0a77787a7cccac74ddc5570b7e89747f925b8469ddb9a6624d4ece", image = "index.docker.io/selenium/standalone-chrome", ) - use_repo(oci, "chrome_standalone", "firefox_standalone", "java_image_base") python = use_extension("@rules_python//python/extensions:python.bzl", "python") - python.toolchain( is_default = True, python_version = "3.9", ) - python.toolchain(python_version = "3.10") - python.toolchain(python_version = "3.11") - python.toolchain(python_version = "3.12") - use_repo(python, "pythons_hub") pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip") @@ -162,8 +140,8 @@ register_toolchains("@pythons_hub//:all") # https://github.com/bazelbuild/rules_jvm_external/pull/1079 archive_override( - integrity = "sha256-yS8Qes1PLbYbe10b1WSgl0Auqn/1Wlxg8O3wSr7a/Sg=", module_name = "rules_jvm_external", + integrity = "sha256-yS8Qes1PLbYbe10b1WSgl0Auqn/1Wlxg8O3wSr7a/Sg=", patch_strip = 1, patches = ["//java:rules_jvm_external_javadoc.patch"], strip_prefix = "rules_jvm_external-f572a26116c7ef71d8842dd056c2605782f7be8d", @@ -171,7 +149,6 @@ archive_override( ) java_toolchains = use_extension("@rules_java//java:extensions.bzl", "toolchains") - use_repo( java_toolchains, "remote_java_tools", @@ -188,7 +165,6 @@ use_repo( ) maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") - maven.install( name = "maven", artifacts = [ @@ -267,11 +243,9 @@ maven.install( resolver = "maven", strict_visibility = True, ) - use_repo(maven, "maven", "unpinned_maven") ruby = use_extension("@rules_ruby//ruby:extensions.bzl", "ruby") - ruby.toolchain( name = "ruby", msys2_packages = [ @@ -280,7 +254,6 @@ ruby.toolchain( ], version_file = "//:rb/.ruby-version", ) - ruby.bundle_fetch( name = "bundle", srcs = [ @@ -372,13 +345,11 @@ ruby.bundle_fetch( gemfile = "//:rb/Gemfile", gemfile_lock = "//:rb/Gemfile.lock", ) - use_repo(ruby, "bundle", "ruby", "ruby_toolchains") register_toolchains("@ruby_toolchains//:all") selenium_manager_artifacts = use_extension("//common:selenium_manager.bzl", "selenium_manager_artifacts") - use_repo( selenium_manager_artifacts, "download_sm_linux", @@ -387,7 +358,6 @@ use_repo( ) pin_browsers_extension = use_extension("//common:repositories.bzl", "pin_browsers_extension") - use_repo( pin_browsers_extension, "linux_beta_firefox", diff --git a/rb/Gemfile.lock b/rb/Gemfile.lock index a0a6ef08baa3c..67728731203aa 100644 --- a/rb/Gemfile.lock +++ b/rb/Gemfile.lock @@ -47,6 +47,7 @@ GEM drb (2.2.1) ffi (1.17.1-arm64-darwin) ffi (1.17.1-java) + ffi (1.17.1-x64-mingw-ucrt) ffi (1.17.1-x86_64-linux-gnu) fileutils (1.7.3) git (1.19.1) @@ -173,8 +174,10 @@ GEM yard (0.9.37) PLATFORMS + arm64-darwin-23 arm64-darwin-24 universal-java-17 + x64-mingw-ucrt x86_64-linux DEPENDENCIES From 2fb0c07766790d13b5ef6a069189b1993033a662 Mon Sep 17 00:00:00 2001 From: aguspe Date: Thu, 16 Jan 2025 17:49:27 +0100 Subject: [PATCH 6/6] Add missing platforms and fix module --- MODULE.bazel | 1 + rb/Gemfile.lock | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/MODULE.bazel b/MODULE.bazel index cb32749b56dfb..9d2bd2b420676 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -281,6 +281,7 @@ ruby.bundle_fetch( "drb-2.2.1": "e9d472bf785f558b96b25358bae115646da0dbfd45107ad858b0bc0d935cb340", "ffi-1.17.1-arm64-darwin": "a8e04f79d375742c54ee7f9fff4b4022b87200a4ec0eb082128d3b6559e67b4d", "ffi-1.17.1-java": "2546e11f9592e2b9b6de49eb96d2a378da47b0bb8469d5cbc9881a55c0d55da7", + "ffi-1.17.1-x64-mingw-ucrt": "da79a832aee7ccd3635b4ec5e8a1927aed786e7ea03f2e33e2c06ea4fcece4a0", "ffi-1.17.1-x86_64-linux-gnu": "8c0ade2a5d19f3672bccfe3b58e016ae5f159e3e2e741c856db87fcf07c903d0", "fileutils-1.7.3": "57271e854b694a87755d76f836f5c57b2c9538ebbaf4b2154bb66addf15eb5da", "git-1.19.1": "b0a422d9f6517353c48a330d6114de4db9e0c82dbe7202964a1d9f1fbc827d70", diff --git a/rb/Gemfile.lock b/rb/Gemfile.lock index 67728731203aa..625f58dc54992 100644 --- a/rb/Gemfile.lock +++ b/rb/Gemfile.lock @@ -174,9 +174,16 @@ GEM yard (0.9.37) PLATFORMS + java + ruby + universal-java-1.8 arm64-darwin-23 arm64-darwin-24 universal-java-17 + universal-java-18 + universal-java-21 + x64-mingw32 + x86_64-darwin-22 x64-mingw-ucrt x86_64-linux