Skip to content

Commit 6d55c89

Browse files
authored
Merge pull request #46 from Shopify/vs/restrict_ruby_lsp_dependency
Restrict ruby-lsp dependency version
2 parents dca96e0 + 247fc69 commit 6d55c89

File tree

3 files changed

+8
-20
lines changed

3 files changed

+8
-20
lines changed

Gemfile

-3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,3 @@ gem "rubocop-sorbet", "~> 0.7", require: false
1818

1919
gem "sorbet-static-and-runtime"
2020
gem "tapioca", "~> 0.11", require: false
21-
22-
# TODO: stop pointing at main on the next Ruby LSP release
23-
gem "ruby-lsp", github: "Shopify/ruby-lsp", branch: "main"

Gemfile.lock

+7-16
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,9 @@
1-
GIT
2-
remote: https://github.com/Shopify/ruby-lsp.git
3-
revision: c30616958f7a0505ad5f9dedac82d441c1f2cac3
4-
branch: main
5-
specs:
6-
ruby-lsp (0.4.4)
7-
language_server-protocol (~> 3.17.0)
8-
sorbet-runtime
9-
syntax_tree (>= 6.1.1, < 7)
10-
111
PATH
122
remote: .
133
specs:
144
ruby-lsp-rails (0.1.0)
155
rails (>= 6.0)
16-
ruby-lsp (>= 0.4.0)
6+
ruby-lsp (~> 0.4.5)
177
sorbet-runtime (>= 0.5.9897)
188

199
GEM
@@ -114,7 +104,6 @@ GEM
114104
marcel (1.0.2)
115105
method_source (1.0.0)
116106
mini_mime (1.1.2)
117-
mini_portile2 (2.8.1)
118107
minitest (5.18.0)
119108
mocha (2.0.2)
120109
ruby2_keywords (>= 0.0.5)
@@ -129,11 +118,10 @@ GEM
129118
net-protocol
130119
netrc (0.11.0)
131120
nio4r (2.5.9)
132-
nokogiri (1.14.3)
133-
mini_portile2 (~> 2.8.0)
134-
racc (~> 1.4)
135121
nokogiri (1.14.3-arm64-darwin)
136122
racc (~> 1.4)
123+
nokogiri (1.14.3-x86_64-linux)
124+
racc (~> 1.4)
137125
parallel (1.22.1)
138126
parser (3.2.2.0)
139127
ast (~> 2.4.1)
@@ -201,6 +189,10 @@ GEM
201189
rubocop (~> 1.50)
202190
rubocop-sorbet (0.7.0)
203191
rubocop (>= 0.90.0)
192+
ruby-lsp (0.4.5)
193+
language_server-protocol (~> 3.17.0)
194+
sorbet-runtime
195+
syntax_tree (>= 6.1.1, < 7)
204196
ruby-progressbar (1.13.0)
205197
ruby2_keywords (0.0.5)
206198
sorbet (0.5.10782)
@@ -260,7 +252,6 @@ DEPENDENCIES
260252
rubocop-rake (~> 0.6.0)
261253
rubocop-shopify (~> 2.13)
262254
rubocop-sorbet (~> 0.7)
263-
ruby-lsp!
264255
ruby-lsp-rails!
265256
sorbet-static-and-runtime
266257
sqlite3

ruby-lsp-rails.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ Gem::Specification.new do |spec|
2222
end
2323

2424
spec.add_dependency("rails", ">= 6.0")
25-
spec.add_dependency("ruby-lsp", ">= 0.4.0")
25+
spec.add_dependency("ruby-lsp", "~> 0.4.5")
2626
spec.add_dependency("sorbet-runtime", ">= 0.5.9897")
2727
end

0 commit comments

Comments
 (0)