Skip to content

Commit 5f72203

Browse files
authored
Merge pull request #32 from zendesk/bquorning.fix-deprecation-warnings
Fix deprecation warnings
2 parents 5320d5f + c060739 commit 5f72203

14 files changed

+131
-129
lines changed

Gemfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
source "https://rubygems.org"
22

33
gemspec
4-
5-
gem "iconv", :platform => :ruby_20

Gemfile.lock

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,40 +7,40 @@ PATH
77
GEM
88
remote: https://rubygems.org/
99
specs:
10-
activemodel (6.0.2.1)
11-
activesupport (= 6.0.2.1)
12-
activerecord (6.0.2.1)
13-
activemodel (= 6.0.2.1)
14-
activesupport (= 6.0.2.1)
15-
activesupport (6.0.2.1)
10+
activemodel (6.0.4.1)
11+
activesupport (= 6.0.4.1)
12+
activerecord (6.0.4.1)
13+
activemodel (= 6.0.4.1)
14+
activesupport (= 6.0.4.1)
15+
activesupport (6.0.4.1)
1616
concurrent-ruby (~> 1.0, >= 1.0.2)
1717
i18n (>= 0.7, < 2)
1818
minitest (~> 5.1)
1919
tzinfo (~> 1.1)
20-
zeitwerk (~> 2.2)
21-
bump (0.9.0)
22-
concurrent-ruby (1.1.6)
23-
i18n (1.8.2)
20+
zeitwerk (~> 2.2, >= 2.2.2)
21+
bump (0.10.0)
22+
concurrent-ruby (1.1.9)
23+
i18n (1.8.10)
2424
concurrent-ruby (~> 1.0)
25-
iconv (1.0.8)
26-
minitest (5.14.0)
25+
minitest (5.14.4)
2726
minitest-rg (5.2.0)
2827
minitest (~> 5.0)
29-
mocha (1.11.2)
30-
rake (13.0.1)
28+
mocha (1.13.0)
29+
rake (13.0.6)
3130
sqlite3 (1.4.2)
3231
thread_safe (0.3.6)
33-
tzinfo (1.2.6)
32+
tzinfo (1.2.9)
3433
thread_safe (~> 0.1)
3534
wwtd (1.4.1)
36-
zeitwerk (2.3.0)
35+
zeitwerk (2.4.2)
3736

3837
PLATFORMS
39-
ruby
38+
x86_64-darwin-19
39+
x86_64-darwin-20
40+
x86_64-linux
4041

4142
DEPENDENCIES
4243
bump
43-
iconv
4444
migration_tools!
4545
minitest
4646
minitest-rg
@@ -50,4 +50,4 @@ DEPENDENCIES
5050
wwtd
5151

5252
BUNDLED WITH
53-
2.1.4
53+
2.2.27

gemfiles/rails4.2.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source "https://rubygems.org"
22

3-
gem "iconv", platform: :ruby_20
43
gem "activerecord", "~> 4.2.0", require: "active_record"
4+
gem 'sqlite3', '~> 1.3.6'
55

66
gemspec path: "../"

gemfiles/rails4.2.gemfile.lock

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,51 +7,47 @@ PATH
77
GEM
88
remote: https://rubygems.org/
99
specs:
10-
activemodel (4.2.10)
11-
activesupport (= 4.2.10)
10+
activemodel (4.2.11.3)
11+
activesupport (= 4.2.11.3)
1212
builder (~> 3.1)
13-
activerecord (4.2.10)
14-
activemodel (= 4.2.10)
15-
activesupport (= 4.2.10)
13+
activerecord (4.2.11.3)
14+
activemodel (= 4.2.11.3)
15+
activesupport (= 4.2.11.3)
1616
arel (~> 6.0)
17-
activesupport (4.2.10)
17+
activesupport (4.2.11.3)
1818
i18n (~> 0.7)
1919
minitest (~> 5.1)
2020
thread_safe (~> 0.3, >= 0.3.4)
2121
tzinfo (~> 1.1)
2222
arel (6.0.4)
23-
builder (3.2.3)
24-
bump (0.5.4)
25-
concurrent-ruby (1.0.5)
26-
i18n (0.9.1)
23+
builder (3.2.4)
24+
bump (0.10.0)
25+
concurrent-ruby (1.1.9)
26+
i18n (0.9.5)
2727
concurrent-ruby (~> 1.0)
28-
iconv (1.0.4)
29-
metaclass (0.0.4)
30-
minitest (5.10.3)
28+
minitest (5.14.4)
3129
minitest-rg (5.2.0)
3230
minitest (~> 5.0)
33-
mocha (1.3.0)
34-
metaclass (~> 0.0.1)
35-
rake (12.3.0)
31+
mocha (1.13.0)
32+
rake (13.0.6)
3633
sqlite3 (1.3.13)
3734
thread_safe (0.3.6)
38-
tzinfo (1.2.4)
35+
tzinfo (1.2.9)
3936
thread_safe (~> 0.1)
40-
wwtd (1.3.0)
37+
wwtd (1.4.1)
4138

4239
PLATFORMS
4340
ruby
4441

4542
DEPENDENCIES
4643
activerecord (~> 4.2.0)
4744
bump
48-
iconv
4945
migration_tools!
5046
minitest
5147
minitest-rg
5248
mocha
5349
rake
54-
sqlite3
50+
sqlite3 (~> 1.3.6)
5551
wwtd
5652

5753
BUNDLED WITH

gemfiles/rails5.0.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
source "https://rubygems.org"
22

33
gem "activerecord", "~> 5.0.0"
4+
gem 'sqlite3', '~> 1.3.6'
45

56
gemspec path: "../"

gemfiles/rails5.0.gemfile.lock

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,37 @@ PATH
77
GEM
88
remote: https://rubygems.org/
99
specs:
10-
activemodel (5.0.0)
11-
activesupport (= 5.0.0)
12-
activerecord (5.0.0)
13-
activemodel (= 5.0.0)
14-
activesupport (= 5.0.0)
10+
activemodel (5.0.7.2)
11+
activesupport (= 5.0.7.2)
12+
activerecord (5.0.7.2)
13+
activemodel (= 5.0.7.2)
14+
activesupport (= 5.0.7.2)
1515
arel (~> 7.0)
16-
activesupport (5.0.0)
16+
activesupport (5.0.7.2)
1717
concurrent-ruby (~> 1.0, >= 1.0.2)
18-
i18n (~> 0.7)
18+
i18n (>= 0.7, < 2)
1919
minitest (~> 5.1)
2020
tzinfo (~> 1.1)
21-
arel (7.0.0)
22-
bump (0.5.3)
23-
concurrent-ruby (1.0.2)
24-
i18n (0.7.0)
25-
metaclass (0.0.4)
26-
minitest (5.9.0)
21+
arel (7.1.4)
22+
bump (0.10.0)
23+
concurrent-ruby (1.1.9)
24+
i18n (1.8.10)
25+
concurrent-ruby (~> 1.0)
26+
minitest (5.14.4)
2727
minitest-rg (5.2.0)
2828
minitest (~> 5.0)
29-
mocha (1.1.0)
30-
metaclass (~> 0.0.1)
31-
rake (10.5.0)
32-
sqlite3 (1.3.11)
33-
thread_safe (0.3.5)
34-
tzinfo (1.2.2)
29+
mocha (1.13.0)
30+
rake (13.0.6)
31+
sqlite3 (1.3.13)
32+
thread_safe (0.3.6)
33+
tzinfo (1.2.9)
3534
thread_safe (~> 0.1)
36-
wwtd (1.3.0)
35+
wwtd (1.4.1)
3736

3837
PLATFORMS
39-
ruby
38+
x86_64-darwin-19
39+
x86_64-darwin-20
40+
x86_64-linux
4041

4142
DEPENDENCIES
4243
activerecord (~> 5.0.0)
@@ -46,8 +47,8 @@ DEPENDENCIES
4647
minitest-rg
4748
mocha
4849
rake
49-
sqlite3
50+
sqlite3 (~> 1.3.6)
5051
wwtd
5152

5253
BUNDLED WITH
53-
1.17.3
54+
2.2.27

gemfiles/rails5.1.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
source "https://rubygems.org"
22

33
gem "activerecord", "~> 5.1.0"
4+
gem "sqlite3", "~> 1.3", ">= 1.3.6"
45

56
gemspec path: "../"

gemfiles/rails5.1.gemfile.lock

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,37 @@ PATH
77
GEM
88
remote: https://rubygems.org/
99
specs:
10-
activemodel (5.1.0)
11-
activesupport (= 5.1.0)
12-
activerecord (5.1.0)
13-
activemodel (= 5.1.0)
14-
activesupport (= 5.1.0)
10+
activemodel (5.1.7)
11+
activesupport (= 5.1.7)
12+
activerecord (5.1.7)
13+
activemodel (= 5.1.7)
14+
activesupport (= 5.1.7)
1515
arel (~> 8.0)
16-
activesupport (5.1.0)
16+
activesupport (5.1.7)
1717
concurrent-ruby (~> 1.0, >= 1.0.2)
18-
i18n (~> 0.7)
18+
i18n (>= 0.7, < 2)
1919
minitest (~> 5.1)
2020
tzinfo (~> 1.1)
2121
arel (8.0.0)
22-
bump (0.5.3)
23-
concurrent-ruby (1.0.5)
24-
i18n (0.8.1)
25-
metaclass (0.0.4)
26-
minitest (5.10.1)
22+
bump (0.10.0)
23+
concurrent-ruby (1.1.9)
24+
i18n (1.8.10)
25+
concurrent-ruby (~> 1.0)
26+
minitest (5.14.4)
2727
minitest-rg (5.2.0)
2828
minitest (~> 5.0)
29-
mocha (1.2.1)
30-
metaclass (~> 0.0.1)
31-
rake (12.0.0)
32-
sqlite3 (1.3.13)
29+
mocha (1.13.0)
30+
rake (13.0.6)
31+
sqlite3 (1.4.2)
3332
thread_safe (0.3.6)
34-
tzinfo (1.2.3)
33+
tzinfo (1.2.9)
3534
thread_safe (~> 0.1)
36-
wwtd (1.3.0)
35+
wwtd (1.4.1)
3736

3837
PLATFORMS
39-
ruby
38+
x86_64-darwin-19
39+
x86_64-darwin-20
40+
x86_64-linux
4041

4142
DEPENDENCIES
4243
activerecord (~> 5.1.0)
@@ -46,8 +47,8 @@ DEPENDENCIES
4647
minitest-rg
4748
mocha
4849
rake
49-
sqlite3
50+
sqlite3 (~> 1.3, >= 1.3.6)
5051
wwtd
5152

5253
BUNDLED WITH
53-
1.17.3
54+
2.2.27

gemfiles/rails5.2.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
source "https://rubygems.org"
22

33
gem "activerecord", "~> 5.2.0"
4+
gem "sqlite3", "~> 1.3", ">= 1.3.6"
45

56
gemspec path: "../"

gemfiles/rails5.2.gemfile.lock

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,37 +7,37 @@ PATH
77
GEM
88
remote: https://rubygems.org/
99
specs:
10-
activemodel (5.2.0)
11-
activesupport (= 5.2.0)
12-
activerecord (5.2.0)
13-
activemodel (= 5.2.0)
14-
activesupport (= 5.2.0)
10+
activemodel (5.2.6)
11+
activesupport (= 5.2.6)
12+
activerecord (5.2.6)
13+
activemodel (= 5.2.6)
14+
activesupport (= 5.2.6)
1515
arel (>= 9.0)
16-
activesupport (5.2.0)
16+
activesupport (5.2.6)
1717
concurrent-ruby (~> 1.0, >= 1.0.2)
1818
i18n (>= 0.7, < 2)
1919
minitest (~> 5.1)
2020
tzinfo (~> 1.1)
2121
arel (9.0.0)
22-
bump (0.6.1)
23-
concurrent-ruby (1.0.5)
24-
i18n (1.0.1)
22+
bump (0.10.0)
23+
concurrent-ruby (1.1.9)
24+
i18n (1.8.10)
2525
concurrent-ruby (~> 1.0)
26-
metaclass (0.0.4)
27-
minitest (5.11.3)
26+
minitest (5.14.4)
2827
minitest-rg (5.2.0)
2928
minitest (~> 5.0)
30-
mocha (1.5.0)
31-
metaclass (~> 0.0.1)
32-
rake (12.3.1)
33-
sqlite3 (1.3.13)
29+
mocha (1.13.0)
30+
rake (13.0.6)
31+
sqlite3 (1.4.2)
3432
thread_safe (0.3.6)
35-
tzinfo (1.2.5)
33+
tzinfo (1.2.9)
3634
thread_safe (~> 0.1)
37-
wwtd (1.3.0)
35+
wwtd (1.4.1)
3836

3937
PLATFORMS
40-
ruby
38+
x86_64-darwin-19
39+
x86_64-darwin-20
40+
x86_64-linux
4141

4242
DEPENDENCIES
4343
activerecord (~> 5.2.0)
@@ -47,8 +47,8 @@ DEPENDENCIES
4747
minitest-rg
4848
mocha
4949
rake
50-
sqlite3
50+
sqlite3 (~> 1.3, >= 1.3.6)
5151
wwtd
5252

5353
BUNDLED WITH
54-
1.17.3
54+
2.2.27

0 commit comments

Comments
 (0)