Skip to content

Commit c6dbb36

Browse files
zendesk-edytarozzendesk-edytaroz
authored
Merge pull request #49 from zendesk/edytaroz/rails-main-fix
Rails main fix
2 parents 8dd4ee1 + c649bfd commit c6dbb36

11 files changed

+118
-109
lines changed

‎.github/workflows/ci.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,13 @@ jobs:
88
strategy:
99
matrix:
1010
ruby-version:
11-
- '2.7'
12-
- '3.0'
1311
- '3.1'
1412
- '3.2'
1513
gemfile:
16-
- rails6.0
1714
- rails6.1
1815
- rails7.0
1916
- rails7.1
17+
- rails7.2
2018
env:
2119
BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
2220
steps:

‎.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7
1+
3.1.4

‎Gemfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PATH
22
remote: .
33
specs:
44
migration_tools (1.10.0)
5-
activerecord (>= 6.0.0)
5+
activerecord (>= 6.1.0)
66

77
GEM
88
remote: https://rubygems.org/

‎gemfiles/rails6.0.gemfile.lock

-97
This file was deleted.

‎gemfiles/rails6.1.gemfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PATH
22
remote: ..
33
specs:
44
migration_tools (1.10.0)
5-
activerecord (>= 6.0.0)
5+
activerecord (>= 6.1.0)
66

77
GEM
88
remote: https://rubygems.org/

‎gemfiles/rails7.0.gemfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PATH
22
remote: ..
33
specs:
44
migration_tools (1.10.0)
5-
activerecord (>= 6.0.0)
5+
activerecord (>= 6.1.0)
66

77
GEM
88
remote: https://rubygems.org/

‎gemfiles/rails7.1.gemfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PATH
22
remote: ..
33
specs:
44
migration_tools (1.10.0)
5-
activerecord (>= 6.0.0)
5+
activerecord (>= 6.1.0)
66

77
GEM
88
remote: https://rubygems.org/

‎gemfiles/rails6.0.gemfile renamed to ‎gemfiles/rails7.2.gemfile

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

3-
gem "activerecord", "~> 6.0.0"
3+
gem "activerecord", "~> 7.2.0"
44
gem "sqlite3", "~> 1.4"
55

66
gemspec path: ".."

‎gemfiles/rails7.2.gemfile.lock

+108
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
PATH
2+
remote: ..
3+
specs:
4+
migration_tools (1.10.0)
5+
activerecord (>= 6.1.0)
6+
7+
GEM
8+
remote: https://rubygems.org/
9+
specs:
10+
activemodel (7.2.0)
11+
activesupport (= 7.2.0)
12+
activerecord (7.2.0)
13+
activemodel (= 7.2.0)
14+
activesupport (= 7.2.0)
15+
timeout (>= 0.4.0)
16+
activesupport (7.2.0)
17+
base64
18+
bigdecimal
19+
concurrent-ruby (~> 1.0, >= 1.3.1)
20+
connection_pool (>= 2.2.5)
21+
drb
22+
i18n (>= 1.6, < 2)
23+
logger (>= 1.4.2)
24+
minitest (>= 5.1)
25+
securerandom (>= 0.3)
26+
tzinfo (~> 2.0, >= 2.0.5)
27+
ast (2.4.2)
28+
base64 (0.2.0)
29+
bigdecimal (3.1.8)
30+
bump (0.10.0)
31+
concurrent-ruby (1.3.4)
32+
connection_pool (2.4.1)
33+
drb (2.2.1)
34+
i18n (1.14.5)
35+
concurrent-ruby (~> 1.0)
36+
json (2.7.2)
37+
language_server-protocol (3.17.0.3)
38+
lint_roller (1.1.0)
39+
logger (1.6.0)
40+
minitest (5.25.1)
41+
minitest-rg (5.3.0)
42+
minitest (~> 5.0)
43+
mocha (2.4.5)
44+
ruby2_keywords (>= 0.0.5)
45+
parallel (1.26.3)
46+
parser (3.3.4.2)
47+
ast (~> 2.4.1)
48+
racc
49+
racc (1.8.1)
50+
rainbow (3.1.1)
51+
rake (13.2.1)
52+
regexp_parser (2.9.2)
53+
rexml (3.3.5)
54+
strscan
55+
rubocop (1.65.1)
56+
json (~> 2.3)
57+
language_server-protocol (>= 3.17.0)
58+
parallel (~> 1.10)
59+
parser (>= 3.3.0.2)
60+
rainbow (>= 2.2.2, < 4.0)
61+
regexp_parser (>= 2.4, < 3.0)
62+
rexml (>= 3.2.5, < 4.0)
63+
rubocop-ast (>= 1.31.1, < 2.0)
64+
ruby-progressbar (~> 1.7)
65+
unicode-display_width (>= 2.4.0, < 3.0)
66+
rubocop-ast (1.32.1)
67+
parser (>= 3.3.1.0)
68+
rubocop-performance (1.21.1)
69+
rubocop (>= 1.48.1, < 2.0)
70+
rubocop-ast (>= 1.31.1, < 2.0)
71+
ruby-progressbar (1.13.0)
72+
ruby2_keywords (0.0.5)
73+
securerandom (0.3.1)
74+
sqlite3 (1.7.3)
75+
standard (1.40.0)
76+
language_server-protocol (~> 3.17.0.2)
77+
lint_roller (~> 1.0)
78+
rubocop (~> 1.65.0)
79+
standard-custom (~> 1.0.0)
80+
standard-performance (~> 1.4)
81+
standard-custom (1.0.2)
82+
lint_roller (~> 1.0)
83+
rubocop (~> 1.50)
84+
standard-performance (1.4.0)
85+
lint_roller (~> 1.1)
86+
rubocop-performance (~> 1.21.0)
87+
strscan (3.1.0)
88+
timeout (0.4.1)
89+
tzinfo (2.0.6)
90+
concurrent-ruby (~> 1.0)
91+
unicode-display_width (2.5.0)
92+
93+
PLATFORMS
94+
ruby
95+
96+
DEPENDENCIES
97+
activerecord (~> 7.2.0)
98+
bump
99+
migration_tools!
100+
minitest
101+
minitest-rg
102+
mocha
103+
rake
104+
sqlite3 (~> 1.4)
105+
standard
106+
107+
BUNDLED WITH
108+
2.5.11

‎gemfiles/rails_main.gemfile

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

33
gem "activerecord", github: "rails/rails", branch: "main"
4-
gem "sqlite3", "~> 1.4"
4+
gem "sqlite3", "~> 2.0"
55

66
gemspec path: ".."

‎migration_tools.gemspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ Gem::Specification.new "migration_tools", "1.10.0" do |s|
77
s.files = `git ls-files lib`.split("\n")
88
s.license = "Apache-2.0"
99

10-
s.required_ruby_version = ">= 2.7.0"
10+
s.required_ruby_version = ">= 3.1.0"
1111

12-
s.add_runtime_dependency "activerecord", ">= 6.0.0"
12+
s.add_runtime_dependency "activerecord", ">= 6.1.0"
1313

1414
s.add_development_dependency "rake"
1515
s.add_development_dependency "bump"

0 commit comments

Comments
 (0)