Skip to content

Commit 06f5b39

Browse files
committed
Updates dependencies and locks to ActiveRecord < 6
1 parent 2830748 commit 06f5b39

File tree

2 files changed

+42
-39
lines changed

2 files changed

+42
-39
lines changed

Gemfile.lock

Lines changed: 41 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
11
PATH
22
remote: .
33
specs:
4-
scenic_sqlserver_adapter (0.1.0)
5-
activerecord (>= 4.0)
4+
scenic_sqlserver_adapter (0.1.1)
5+
activerecord (>= 4.0, < 6)
66
scenic (~> 1.4)
77

88
GEM
99
remote: https://rubygems.org/
1010
specs:
11-
actionpack (5.1.4)
12-
actionview (= 5.1.4)
13-
activesupport (= 5.1.4)
11+
actionpack (5.2.3)
12+
actionview (= 5.2.3)
13+
activesupport (= 5.2.3)
1414
rack (~> 2.0)
1515
rack-test (>= 0.6.3)
1616
rails-dom-testing (~> 2.0)
1717
rails-html-sanitizer (~> 1.0, >= 1.0.2)
18-
actionview (5.1.4)
19-
activesupport (= 5.1.4)
18+
actionview (5.2.3)
19+
activesupport (= 5.2.3)
2020
builder (~> 3.1)
2121
erubi (~> 1.4)
2222
rails-dom-testing (~> 2.0)
2323
rails-html-sanitizer (~> 1.0, >= 1.0.3)
24-
activemodel (5.1.4)
25-
activesupport (= 5.1.4)
26-
activerecord (5.1.4)
27-
activemodel (= 5.1.4)
28-
activesupport (= 5.1.4)
29-
arel (~> 8.0)
30-
activesupport (5.1.4)
24+
activemodel (5.2.3)
25+
activesupport (= 5.2.3)
26+
activerecord (5.2.3)
27+
activemodel (= 5.2.3)
28+
activesupport (= 5.2.3)
29+
arel (>= 9.0)
30+
activesupport (5.2.3)
3131
concurrent-ruby (~> 1.0, >= 1.0.2)
32-
i18n (~> 0.7)
32+
i18n (>= 0.7, < 2)
3333
minitest (~> 5.1)
3434
tzinfo (~> 1.1)
35-
arel (8.0.0)
35+
arel (9.0.0)
3636
builder (3.2.3)
37-
concurrent-ruby (1.0.5)
38-
crass (1.0.3)
37+
concurrent-ruby (1.1.5)
38+
crass (1.0.4)
3939
diff-lcs (1.3)
40-
erubi (1.7.0)
41-
i18n (0.9.1)
40+
erubi (1.8.0)
41+
i18n (1.6.0)
4242
concurrent-ruby (~> 1.0)
43-
loofah (2.1.1)
43+
loofah (2.2.3)
4444
crass (~> 1.0.2)
4545
nokogiri (>= 1.5.9)
46-
method_source (0.9.0)
47-
mini_portile2 (2.3.0)
48-
minitest (5.11.1)
49-
nokogiri (1.8.1)
50-
mini_portile2 (~> 2.3.0)
51-
rack (2.0.3)
52-
rack-test (0.8.2)
46+
method_source (0.9.2)
47+
mini_portile2 (2.4.0)
48+
minitest (5.11.3)
49+
nokogiri (1.10.4)
50+
mini_portile2 (~> 2.4.0)
51+
rack (2.0.7)
52+
rack-test (1.1.0)
5353
rack (>= 1.0, < 3)
5454
rails-dom-testing (2.0.3)
5555
activesupport (>= 4.2.0)
5656
nokogiri (>= 1.6)
57-
rails-html-sanitizer (1.0.3)
58-
loofah (~> 2.0)
59-
railties (5.1.4)
60-
actionpack (= 5.1.4)
61-
activesupport (= 5.1.4)
57+
rails-html-sanitizer (1.2.0)
58+
loofah (~> 2.2, >= 2.2.2)
59+
railties (5.2.3)
60+
actionpack (= 5.2.3)
61+
activesupport (= 5.2.3)
6262
method_source
6363
rake (>= 0.8.7)
64-
thor (>= 0.18.1, < 2.0)
64+
thor (>= 0.19.0, < 2.0)
6565
rake (10.5.0)
6666
rspec (3.7.0)
6767
rspec-core (~> 3.7.0)
@@ -76,12 +76,14 @@ GEM
7676
diff-lcs (>= 1.2.0, < 2.0)
7777
rspec-support (~> 3.7.0)
7878
rspec-support (3.7.0)
79-
scenic (1.4.1)
79+
rspec_junit_formatter (0.4.1)
80+
rspec-core (>= 2, < 4, != 2.12.0)
81+
scenic (1.5.1)
8082
activerecord (>= 4.0.0)
8183
railties (>= 4.0.0)
82-
thor (0.20.0)
84+
thor (0.20.3)
8385
thread_safe (0.3.6)
84-
tzinfo (1.2.4)
86+
tzinfo (1.2.5)
8587
thread_safe (~> 0.1)
8688

8789
PLATFORMS
@@ -91,7 +93,8 @@ DEPENDENCIES
9193
bundler (~> 1.16)
9294
rake (~> 10.0)
9395
rspec (~> 3.0)
96+
rspec_junit_formatter
9497
scenic_sqlserver_adapter!
9598

9699
BUNDLED WITH
97-
1.16.0
100+
1.17.1

scenic_sqlserver_adapter.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
2727
spec.require_paths = ["lib"]
2828

2929
spec.add_dependency "scenic", "~> 1.4"
30-
spec.add_dependency "activerecord", ">= 4.0"
30+
spec.add_dependency "activerecord", [">= 4.0", "< 6"]
3131

3232
spec.add_development_dependency "bundler", "~> 1.16"
3333
spec.add_development_dependency "rake", "~> 10.0"

0 commit comments

Comments
 (0)