Skip to content

Commit aebb7b8

Browse files
authored
Merge branch 'trunk' into py-firefox-driver-fixture
2 parents af73fbb + 627a283 commit aebb7b8

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,8 @@ ruby.bundle_fetch(
307307
"io-console-0.8.1-java": "9457a61a7b23aab11e9e9ff67f71ae81d7f1a6a2e582bb5d65d754cbb546c06f",
308308
"irb-1.15.2": "222f32952e278da34b58ffe45e8634bf4afc2dc7aa9da23fed67e581aa50fdba",
309309
"jar-dependencies-0.5.5": "2972b9fcba4b014e6446a84b5c09674a3e8648b95b71768e729f0e8e40568059",
310-
"json-2.13.2": "02e1f118d434c6b230a64ffa5c8dee07e3ec96244335c392eaed39e1199dbb68",
311-
"json-2.13.2-java": "2e1292c45598a3642216820a821cba89c623f99387b8cb90adb345878f4e5c7d",
310+
"json-2.15.1": "b1c1b2e7c116eb1903e0ce0c374783e6ead8747a0f9eca132d274018ebb80b89",
311+
"json-2.15.1-java": "a6185eebe724a6937f60729e4998276d6b3de3ecc35be34f8e47c1eb40903ecf",
312312
"language_server-protocol-3.17.0.5": "fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc",
313313
"lint_roller-1.1.0": "2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87",
314314
"listen-3.9.0": "db9e4424e0e5834480385197c139cb6b0ae0ef28cc13310cfd1ca78377d59c67",

rb/Gemfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,7 @@ gem 'activesupport', '~> 7.0', require: false, platforms: %i[mri mingw x64_mingw
1010
gem 'curb', '~> 1.0.5', require: false, platforms: %i[mri mingw x64_mingw]
1111
gem 'debug', '~> 1.7', require: false, platforms: %i[mri mingw x64_mingw]
1212
gem 'steep', '~> 1.5.0', require: false, platforms: %i[mri mingw x64_mingw]
13+
14+
# Prism staring with 1.5 fails to build with the following error:
15+
# src/prism.c:8651:62: error: conversion to ‘unsigned int’ from ‘int’ may change the sign of the result [-Werror=sign-conversion]
16+
gem 'prism', ['~> 1.0', '< 1.5']

rb/Gemfile.lock

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ PATH
55
selenium-webdriver (~> 4.2)
66
selenium-webdriver (4.37.0.nightly)
77
base64 (~> 0.2)
8-
json (<= 2.13.2)
98
logger (~> 1.4)
10-
prism (~> 1.0, < 1.5)
119
rexml (~> 3.2, >= 3.2.5)
1210
rubyzip (>= 1.2.2, < 4.0)
1311
websocket (~> 1.0)
@@ -69,8 +67,8 @@ GEM
6967
rdoc (>= 4.0.0)
7068
reline (>= 0.4.2)
7169
jar-dependencies (0.5.5)
72-
json (2.13.2)
73-
json (2.13.2-java)
70+
json (2.15.1)
71+
json (2.15.1-java)
7472
language_server-protocol (3.17.0.5)
7573
lint_roller (1.1.0)
7674
listen (3.9.0)
@@ -201,6 +199,7 @@ DEPENDENCIES
201199
curb (~> 1.0.5)
202200
debug (~> 1.7)
203201
git (~> 1.19)
202+
prism (~> 1.0, < 1.5)
204203
rack (~> 2.0)
205204
rake (~> 13.0)
206205
rspec (~> 3.0)

rb/selenium-webdriver.gemspec

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,7 @@ Gem::Specification.new do |s|
5050
s.require_paths = ['lib']
5151

5252
s.add_dependency 'base64', ['~> 0.2']
53-
s.add_dependency 'json', ['<= 2.13.2']
5453
s.add_dependency 'logger', ['~> 1.4']
55-
s.add_dependency 'prism', ['~> 1.0', '< 1.5']
5654
s.add_dependency 'rexml', ['~> 3.2', '>= 3.2.5']
5755
s.add_dependency 'rubyzip', ['>= 1.2.2', '< 4.0']
5856
s.add_dependency 'websocket', ['~> 1.0']

0 commit comments

Comments
 (0)