Skip to content

Commit 5e257bd

Browse files
ziraqyoungziraqyoung
committed
Upgrade to Rails 7
- `annotate` gem doesnot support Active Record 7, there is a PR for it but not yet merged ctran/annotate_models#915 - Remove `rexml` gem, turn out rails 7 has fixed this for Ruby 3
1 parent e74f71b commit 5e257bd

File tree

3 files changed

+108
-103
lines changed

3 files changed

+108
-103
lines changed

‎Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
44
ruby "3.0.1"
55

66
# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
7-
gem "rails", "~> 7.0.0.rc1"
7+
gem "rails", "~> 7.0.0"
88

99
# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
1010
gem "sprockets-rails", ">= 3.4.1"
@@ -63,7 +63,7 @@ group :development do
6363
# Add speed badges [https://github.com/MiniProfiler/rack-mini-profiler]
6464
gem "rack-mini-profiler", ">= 2.3.3"
6565

66-
gem 'annotate', '~> 3.1', '>= 3.1.1'
66+
gem 'annotate', github: 'sebyx07/annotate_models'
6767
# Speed up commands on slow machines / big apps [https://github.com/rails/spring]
6868
# gem "spring"
6969
end
@@ -74,7 +74,7 @@ group :test do
7474
gem "selenium-webdriver", "~> 4.0"
7575
gem "webdrivers", "~> 5.0"
7676
# rexml no default in ruby 3.0, -> required for specs
77-
gem 'rexml', '~> 3.2'
77+
# gem 'rexml', '~> 3.2'
7878
# pretty minitest ouput
7979
gem 'minitest', '~> 5.14'
8080
gem 'minitest-reporters', '~> 1.4'

‎Gemfile.lock

Lines changed: 69 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,69 @@
1+
GIT
2+
remote: https://github.com/sebyx07/annotate_models.git
3+
revision: dd57d470f074f4f9cccd4909ac4a038d4ee7f915
4+
specs:
5+
annotate (3.1.1)
6+
activerecord (>= 3.2, < 8.0)
7+
rake (>= 10.4, < 14.0)
8+
19
GEM
210
remote: https://rubygems.org/
311
specs:
4-
actioncable (7.0.0.rc1)
5-
actionpack (= 7.0.0.rc1)
6-
activesupport (= 7.0.0.rc1)
12+
actioncable (7.0.0)
13+
actionpack (= 7.0.0)
14+
activesupport (= 7.0.0)
715
nio4r (~> 2.0)
816
websocket-driver (>= 0.6.1)
9-
actionmailbox (7.0.0.rc1)
10-
actionpack (= 7.0.0.rc1)
11-
activejob (= 7.0.0.rc1)
12-
activerecord (= 7.0.0.rc1)
13-
activestorage (= 7.0.0.rc1)
14-
activesupport (= 7.0.0.rc1)
17+
actionmailbox (7.0.0)
18+
actionpack (= 7.0.0)
19+
activejob (= 7.0.0)
20+
activerecord (= 7.0.0)
21+
activestorage (= 7.0.0)
22+
activesupport (= 7.0.0)
1523
mail (>= 2.7.1)
16-
actionmailer (7.0.0.rc1)
17-
actionpack (= 7.0.0.rc1)
18-
actionview (= 7.0.0.rc1)
19-
activejob (= 7.0.0.rc1)
20-
activesupport (= 7.0.0.rc1)
24+
actionmailer (7.0.0)
25+
actionpack (= 7.0.0)
26+
actionview (= 7.0.0)
27+
activejob (= 7.0.0)
28+
activesupport (= 7.0.0)
2129
mail (~> 2.5, >= 2.5.4)
2230
rails-dom-testing (~> 2.0)
23-
actionpack (7.0.0.rc1)
24-
actionview (= 7.0.0.rc1)
25-
activesupport (= 7.0.0.rc1)
31+
actionpack (7.0.0)
32+
actionview (= 7.0.0)
33+
activesupport (= 7.0.0)
2634
rack (~> 2.0, >= 2.2.0)
2735
rack-test (>= 0.6.3)
2836
rails-dom-testing (~> 2.0)
2937
rails-html-sanitizer (~> 1.0, >= 1.2.0)
30-
actiontext (7.0.0.rc1)
31-
actionpack (= 7.0.0.rc1)
32-
activerecord (= 7.0.0.rc1)
33-
activestorage (= 7.0.0.rc1)
34-
activesupport (= 7.0.0.rc1)
38+
actiontext (7.0.0)
39+
actionpack (= 7.0.0)
40+
activerecord (= 7.0.0)
41+
activestorage (= 7.0.0)
42+
activesupport (= 7.0.0)
3543
globalid (>= 0.6.0)
3644
nokogiri (>= 1.8.5)
37-
actionview (7.0.0.rc1)
38-
activesupport (= 7.0.0.rc1)
45+
actionview (7.0.0)
46+
activesupport (= 7.0.0)
3947
builder (~> 3.1)
4048
erubi (~> 1.4)
4149
rails-dom-testing (~> 2.0)
4250
rails-html-sanitizer (~> 1.1, >= 1.2.0)
43-
activejob (7.0.0.rc1)
44-
activesupport (= 7.0.0.rc1)
51+
activejob (7.0.0)
52+
activesupport (= 7.0.0)
4553
globalid (>= 0.3.6)
46-
activemodel (7.0.0.rc1)
47-
activesupport (= 7.0.0.rc1)
48-
activerecord (7.0.0.rc1)
49-
activemodel (= 7.0.0.rc1)
50-
activesupport (= 7.0.0.rc1)
51-
activestorage (7.0.0.rc1)
52-
actionpack (= 7.0.0.rc1)
53-
activejob (= 7.0.0.rc1)
54-
activerecord (= 7.0.0.rc1)
55-
activesupport (= 7.0.0.rc1)
54+
activemodel (7.0.0)
55+
activesupport (= 7.0.0)
56+
activerecord (7.0.0)
57+
activemodel (= 7.0.0)
58+
activesupport (= 7.0.0)
59+
activestorage (7.0.0)
60+
actionpack (= 7.0.0)
61+
activejob (= 7.0.0)
62+
activerecord (= 7.0.0)
63+
activesupport (= 7.0.0)
5664
marcel (~> 1.0)
5765
mini_mime (>= 1.1.0)
58-
activesupport (7.0.0.rc1)
66+
activesupport (7.0.0)
5967
concurrent-ruby (~> 1.0, >= 1.0.2)
6068
i18n (>= 1.6, < 2)
6169
minitest (>= 5.1)
@@ -65,9 +73,6 @@ GEM
6573
alphavantagerb (1.4.0)
6674
httparty (>= 0.15.6)
6775
humanize (>= 1.7.0)
68-
annotate (3.1.1)
69-
activerecord (>= 3.2, < 7.0)
70-
rake (>= 10.4, < 14.0)
7176
ansi (1.5.0)
7277
bindex (0.8.1)
7378
bootsnap (1.9.3)
@@ -88,7 +93,7 @@ GEM
8893
crack (0.4.5)
8994
rexml
9095
crass (1.0.6)
91-
cssbundling-rails (0.2.7)
96+
cssbundling-rails (0.2.8)
9297
railties (>= 6.0.0)
9398
debug (1.3.4)
9499
irb (>= 1.3.6)
@@ -141,7 +146,7 @@ GEM
141146
mime-types-data (~> 3.2015)
142147
mime-types-data (3.2021.1115)
143148
mini_mime (1.1.2)
144-
minitest (5.14.4)
149+
minitest (5.15.0)
145150
minitest-reporters (1.4.3)
146151
ansi
147152
builder
@@ -169,28 +174,28 @@ GEM
169174
rack (>= 1.2.0)
170175
rack-test (1.1.0)
171176
rack (>= 1.0, < 3)
172-
rails (7.0.0.rc1)
173-
actioncable (= 7.0.0.rc1)
174-
actionmailbox (= 7.0.0.rc1)
175-
actionmailer (= 7.0.0.rc1)
176-
actionpack (= 7.0.0.rc1)
177-
actiontext (= 7.0.0.rc1)
178-
actionview (= 7.0.0.rc1)
179-
activejob (= 7.0.0.rc1)
180-
activemodel (= 7.0.0.rc1)
181-
activerecord (= 7.0.0.rc1)
182-
activestorage (= 7.0.0.rc1)
183-
activesupport (= 7.0.0.rc1)
177+
rails (7.0.0)
178+
actioncable (= 7.0.0)
179+
actionmailbox (= 7.0.0)
180+
actionmailer (= 7.0.0)
181+
actionpack (= 7.0.0)
182+
actiontext (= 7.0.0)
183+
actionview (= 7.0.0)
184+
activejob (= 7.0.0)
185+
activemodel (= 7.0.0)
186+
activerecord (= 7.0.0)
187+
activestorage (= 7.0.0)
188+
activesupport (= 7.0.0)
184189
bundler (>= 1.15.0)
185-
railties (= 7.0.0.rc1)
190+
railties (= 7.0.0)
186191
rails-dom-testing (2.0.3)
187192
activesupport (>= 4.2.0)
188193
nokogiri (>= 1.6)
189194
rails-html-sanitizer (1.4.2)
190195
loofah (~> 2.3)
191-
railties (7.0.0.rc1)
192-
actionpack (= 7.0.0.rc1)
193-
activesupport (= 7.0.0.rc1)
196+
railties (7.0.0)
197+
actionpack (= 7.0.0)
198+
activesupport (= 7.0.0)
194199
method_source
195200
rake (>= 12.2)
196201
thor (~> 1.0)
@@ -221,8 +226,9 @@ GEM
221226
stimulus-rails (0.7.3)
222227
rails (>= 6.0.0)
223228
thor (1.1.0)
224-
turbo-rails (0.9.0)
225-
rails (>= 6.0.0)
229+
turbo-rails (0.9.1)
230+
actionpack (>= 6.0.0)
231+
railties (>= 6.0.0)
226232
tzinfo (2.0.4)
227233
concurrent-ruby (~> 1.0)
228234
vcr (6.0.0)
@@ -251,7 +257,7 @@ PLATFORMS
251257

252258
DEPENDENCIES
253259
alphavantagerb (~> 1.4)
254-
annotate (~> 3.1, >= 3.1.1)
260+
annotate!
255261
bootsnap (>= 1.4.4)
256262
capybara (~> 3.26)
257263
cssbundling-rails (~> 0.2)
@@ -266,9 +272,8 @@ DEPENDENCIES
266272
pg (~> 1.1)
267273
puma (~> 5.0)
268274
rack-mini-profiler (>= 2.3.3)
269-
rails (~> 7.0.0.rc1)
275+
rails (~> 7.0.0)
270276
redis (~> 4.0)
271-
rexml (~> 3.2)
272277
selenium-webdriver (~> 4.0)
273278
sprockets-rails (>= 3.4.1)
274279
stimulus-rails (~> 0.6)
@@ -283,4 +288,4 @@ RUBY VERSION
283288
ruby 3.0.1p64
284289

285290
BUNDLED WITH
286-
2.2.31
291+
2.2.33

‎yarn.lock

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,12 @@ braces@^3.0.1, braces@~3.0.2:
188188
fill-range "^7.0.1"
189189

190190
browserslist@^4.17.5:
191-
version "4.18.1"
192-
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.18.1.tgz#60d3920f25b6860eb917c6c7b185576f4d8b017f"
193-
integrity sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ==
191+
version "4.19.1"
192+
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.1.tgz#4ac0435b35ab655896c31d53018b6dd5e9e4c9a3"
193+
integrity sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==
194194
dependencies:
195-
caniuse-lite "^1.0.30001280"
196-
electron-to-chromium "^1.3.896"
195+
caniuse-lite "^1.0.30001286"
196+
electron-to-chromium "^1.4.17"
197197
escalade "^3.1.1"
198198
node-releases "^2.0.1"
199199
picocolors "^1.0.0"
@@ -213,10 +213,10 @@ camelcase-css@^2.0.1:
213213
resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5"
214214
integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==
215215

216-
caniuse-lite@^1.0.30001272, caniuse-lite@^1.0.30001280:
217-
version "1.0.30001283"
218-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001283.tgz#8573685bdae4d733ef18f78d44ba0ca5fe9e896b"
219-
integrity sha512-9RoKo841j1GQFSJz/nCXOj0sD7tHBtlowjYlrqIUS812x9/emfBLBt6IyMz1zIaYc/eRL8Cs6HPUVi2Hzq4sIg==
216+
caniuse-lite@^1.0.30001272, caniuse-lite@^1.0.30001286:
217+
version "1.0.30001292"
218+
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001292.tgz#4a55f61c06abc9595965cfd77897dc7bc1cdc456"
219+
integrity sha512-jnT4Tq0Q4ma+6nncYQVe7d73kmDmE9C3OGTx3MvW7lBM/eY1S1DZTMBON7dqV481RhNiS5OxD7k9JQvmDOTirw==
220220

221221
chalk@^2.0.0:
222222
version "2.4.2"
@@ -274,21 +274,21 @@ color-name@^1.0.0, color-name@~1.1.4:
274274
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
275275
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
276276

277-
color-string@^1.7.4:
278-
version "1.7.4"
279-
resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.7.4.tgz#79a7bf242610a8aa1b5e2681f3bf6bcfa666245f"
280-
integrity sha512-nVdUvPVgZMpRQad5dcsCMOSB5BXLljklTiaxS6ehhKxDsAI5sD7k5VmFuBt1y3Rlym8uulc/ANUN/bMWtBu6Sg==
277+
color-string@^1.9.0:
278+
version "1.9.0"
279+
resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.0.tgz#63b6ebd1bec11999d1df3a79a7569451ac2be8aa"
280+
integrity sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==
281281
dependencies:
282282
color-name "^1.0.0"
283283
simple-swizzle "^0.2.2"
284284

285285
color@^4.0.1:
286-
version "4.0.2"
287-
resolved "https://registry.yarnpkg.com/color/-/color-4.0.2.tgz#8bdb639132a37ae8823fd672de5180d0988fca80"
288-
integrity sha512-fSu0jW2aKQG2FHlDywqdFPdabJHsUdZ0xabSt3wFZdcgRKtLnUHs19nUtuFuLGVMFhINGgfZEIjbUOsGZXGu7Q==
286+
version "4.1.0"
287+
resolved "https://registry.yarnpkg.com/color/-/color-4.1.0.tgz#9502e6a2dcacb26adf4c60910a27628d010b3de3"
288+
integrity sha512-o2rkkxyLGgYoeUy1OodXpbPAQNmlNBrirQ8ODO8QutzDiDMNdezSOZLNnusQ6pUpCQJUsaJIo9DZJKqa2HgH7A==
289289
dependencies:
290290
color-convert "^2.0.1"
291-
color-string "^1.7.4"
291+
color-string "^1.9.0"
292292

293293
commander@^8.0.0:
294294
version "8.3.0"
@@ -350,10 +350,10 @@ dlv@^1.1.3:
350350
resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79"
351351
integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==
352352

353-
electron-to-chromium@^1.3.896:
354-
version "1.4.4"
355-
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.4.tgz#57311918524c1a26878c330537f967804d43788a"
356-
integrity sha512-teHtgwcmVcL46jlFvAaqjyiTLWuMrUQO1JqV303JKB4ysXG6m8fXSFhbjal9st0r9mNskI22AraJZorb1VcLVg==
353+
electron-to-chromium@^1.4.17:
354+
version "1.4.26"
355+
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.26.tgz#d71b9da220543cf10614a576c3d5ebbe43d96efb"
356+
integrity sha512-cA1YwlRzO6TGp7yd3+KAqh9Tt6Z4CuuKqsAJP6uF/H5MQryjAGDhMhnY5cEXo8MaRCczpzSBhMPdqRIodkbZYw==
357357

358358
error-ex@^1.3.1:
359359
version "1.3.2"
@@ -588,9 +588,9 @@ hex-color-regex@^1.1.0:
588588
integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
589589

590590
highcharts@^9.3.0:
591-
version "9.3.1"
592-
resolved "https://registry.yarnpkg.com/highcharts/-/highcharts-9.3.1.tgz#dbeb39c2e5b298b02ccc459103f5f1c8daea1264"
593-
integrity sha512-T5BjvY2CDtqlKRbid1Jd22psBp8tV9+7fm+x7h+EZuXF0OVDLR5128sRuC6WCWVss4cTVzS6PKnlnXKfYskIhw==
591+
version "9.3.2"
592+
resolved "https://registry.yarnpkg.com/highcharts/-/highcharts-9.3.2.tgz#20b34f7277169a48d7b5691f74705e8addc78cd3"
593+
integrity sha512-I/48gNMvs3hZxZnPRUqLbnlrGZJJ7YPPVr1+fYeZ35p4pSZAOwTmAGbptrjBr7JlF52HmJH9zMbt/I4TPLu9Pg==
594594

595595
hsl-regex@^1.0.0:
596596
version "1.0.0"
@@ -895,9 +895,9 @@ postcss-nested@5.0.6:
895895
postcss-selector-parser "^6.0.6"
896896

897897
postcss-selector-parser@^6.0.6:
898-
version "6.0.6"
899-
resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea"
900-
integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==
898+
version "6.0.7"
899+
resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.7.tgz#48404830a635113a71fd79397de8209ed05a66fc"
900+
integrity sha512-U+b/Deoi4I/UmE6KOVPpnhS7I7AYdKbhGcat+qTQ27gycvaACvNEw11ba6RrkwVmDVRW7sigWgLj4/KbbJjeDA==
901901
dependencies:
902902
cssesc "^3.0.0"
903903
util-deprecate "^1.0.2"
@@ -908,14 +908,14 @@ postcss-value-parser@^3.3.0:
908908
integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
909909

910910
postcss-value-parser@^4.1.0:
911-
version "4.1.0"
912-
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
913-
integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
911+
version "4.2.0"
912+
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
913+
integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
914914

915915
postcss@^8.1.6, postcss@^8.3.5, postcss@^8.3.8:
916-
version "8.4.4"
917-
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.4.tgz#d53d4ec6a75fd62557a66bb41978bf47ff0c2869"
918-
integrity sha512-joU6fBsN6EIer28Lj6GDFoC/5yOZzLCfn0zHAn/MYXI7aPt4m4hK5KC5ovEZXy+lnCjmYIbQWngvju2ddyEr8Q==
916+
version "8.4.5"
917+
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.5.tgz#bae665764dfd4c6fcc24dc0fdf7e7aa00cc77f95"
918+
integrity sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==
919919
dependencies:
920920
nanoid "^3.1.30"
921921
picocolors "^1.0.0"
@@ -927,9 +927,9 @@ pretty-hrtime@^1.0.3:
927927
integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=
928928

929929
purgecss@^4.0.3:
930-
version "4.1.1"
931-
resolved "https://registry.yarnpkg.com/purgecss/-/purgecss-4.1.1.tgz#d2bedc58fea3629b67abb6070d3827294092f270"
932-
integrity sha512-oVNNzN9tRVoRCeITtpC3ofLU5wGLLYayXkOELeSr0FjwSVdxNK1GbIAvDQNSm5X1WFXGkfcb9JbvTsS2G364/w==
930+
version "4.1.3"
931+
resolved "https://registry.yarnpkg.com/purgecss/-/purgecss-4.1.3.tgz#683f6a133c8c4de7aa82fe2746d1393b214918f7"
932+
integrity sha512-99cKy4s+VZoXnPxaoM23e5ABcP851nC2y2GROkkjS8eJaJtlciGavd7iYAw2V84WeBqggZ12l8ef44G99HmTaw==
933933
dependencies:
934934
commander "^8.0.0"
935935
glob "^7.1.7"

0 commit comments

Comments
 (0)