Skip to content

Commit

Permalink
use ruby 3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@omohokcoj
omohokcoj committed Jan 1, 2023
1 parent 8147b7d commit df4b91a
Show file tree
Hide file tree
Showing 7 changed files with 90 additions and 87 deletions.
2 changes: 1 addition & 1 deletion .tool-versions
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby 3.1.0
ruby 3.2.0
6 changes: 3 additions & 3 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.1.0-alpine as webpacker
FROM ruby:3.2.0-alpine as webpacker

ENV RAILS_ENV=production
ENV NODE_ENV=production
Expand All @@ -20,7 +20,7 @@ COPY ./app/packs ./app/packs

RUN echo "gem 'shakapacker'" > Gemfile && ./bin/webpacker

FROM ruby:3.1.0-alpine as assets
FROM ruby:3.2.0-alpine as assets

WORKDIR /opt

Expand All @@ -34,7 +34,7 @@ COPY ./vendor/motor-admin/ui ./

RUN yarn build:prod

FROM ruby:3.1.0-alpine as app
FROM ruby:3.2.0-alpine as app

ENV RAILS_ENV=production
ENV BUNDLE_WITHOUT="development:test"
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source 'https://rubygems.org'

ruby '3.1.0'
ruby '3.2.0'

gem 'activerecord-sqlserver-adapter'
gem 'ar_lazy_preload'
Expand Down
155 changes: 79 additions & 76 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,66 +79,66 @@ GEM
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
ar_lazy_preload (1.0.0)
addressable (2.8.1)
public_suffix (>= 2.0.2, < 6.0)
ar_lazy_preload (1.1.2)
rails (>= 5.2)
ast (2.4.2)
audited (5.1.0)
activerecord (>= 5.0, < 7.1)
aws-eventstream (1.2.0)
aws-partitions (1.594.0)
aws-sdk-core (3.131.1)
aws-partitions (1.686.0)
aws-sdk-core (3.168.4)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.57.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sdk-kms (1.61.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.114.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sdk-s3 (1.117.2)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
aws-sigv4 (1.5.0)
aws-sigv4 (1.5.2)
aws-eventstream (~> 1, >= 1.0.2)
bcrypt (3.1.18)
bindex (0.8.1)
bootsnap (1.13.0)
bootsnap (1.15.0)
msgpack (~> 1.2)
brakeman (5.2.3)
brakeman (5.4.0)
builder (3.2.4)
byebug (11.1.3)
cancancan (3.4.0)
coderay (1.1.3)
concurrent-ruby (1.1.10)
crass (1.0.6)
date (3.3.3)
declarative (0.0.20)
devise (4.8.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
digest (3.1.0)
digest-crc (0.6.4)
rake (>= 12.0.0, < 14.0.0)
dotenv (2.7.6)
erubi (1.11.0)
dotenv (2.8.1)
erubi (1.12.0)
et-orbi (1.2.7)
tzinfo
faraday (2.3.0)
faraday-net_http (~> 2.0)
faraday (2.7.2)
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-net_http (2.0.3)
faraday-net_http (3.0.2)
fast_blank (1.0.1)
ffi (1.15.5)
fugit (1.8.0)
et-orbi (~> 1, >= 1.2.7)
raabro (~> 1.4)
globalid (1.0.0)
activesupport (>= 5.0)
google-apis-core (0.5.0)
google-apis-core (0.9.2)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
Expand All @@ -147,25 +147,25 @@ GEM
retriable (>= 2.0, < 4.a)
rexml
webrick
google-apis-iamcredentials_v1 (0.10.0)
google-apis-core (>= 0.4, < 2.a)
google-apis-storage_v1 (0.14.0)
google-apis-core (>= 0.4, < 2.a)
google-apis-iamcredentials_v1 (0.16.0)
google-apis-core (>= 0.9.1, < 2.a)
google-apis-storage_v1 (0.19.0)
google-apis-core (>= 0.9.0, < 2.a)
google-cloud-core (1.6.0)
google-cloud-env (~> 1.0)
google-cloud-errors (~> 1.0)
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-cloud-errors (1.2.0)
google-cloud-storage (1.36.2)
google-cloud-errors (1.3.0)
google-cloud-storage (1.44.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-iamcredentials_v1 (~> 0.1)
google-apis-storage_v1 (~> 0.1)
google-apis-storage_v1 (~> 0.19.0)
google-cloud-core (~> 1.6)
googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
googleauth (1.1.3)
googleauth (1.3.0)
faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
Expand All @@ -178,67 +178,68 @@ GEM
image_processing (1.12.2)
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
jmespath (1.6.1)
jwt (2.3.0)
launchy (2.5.0)
addressable (~> 2.7)
jmespath (1.6.2)
json (2.6.3)
jwt (2.6.0)
launchy (2.5.2)
addressable (~> 2.8)
letter_opener (1.8.1)
launchy (>= 2.2, < 3)
lograge (0.12.0)
actionpack (>= 4)
activesupport (>= 4)
railties (>= 4)
request_store (~> 1.0)
loofah (2.19.0)
loofah (2.19.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mail (2.8.0)
mini_mime (>= 0.1.1)
net-imap
net-pop
net-smtp
marcel (1.0.2)
memoist (0.16.2)
method_source (1.0.0)
mini_magick (4.11.0)
mini_magick (4.12.0)
mini_mime (1.1.2)
mini_portile2 (2.8.0)
minitest (5.16.3)
mini_portile2 (2.8.1)
minitest (5.17.0)
msgpack (1.6.0)
multi_json (1.15.0)
mysql2 (0.5.3)
net-imap (0.3.1)
mysql2 (0.5.4)
net-imap (0.3.4)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.1.3)
net-protocol (0.2.1)
timeout
net-smtp (0.3.1)
digest
net-smtp (0.3.3)
net-protocol
timeout
nio4r (2.5.8)
nokogiri (1.13.9)
nokogiri (1.13.10)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
nokogiri (1.13.9-x86_64-darwin)
racc (~> 1.4)
oj (3.13.13)
oj (3.13.23)
orm_adapter (0.5.0)
os (1.1.4)
parallel (1.22.1)
parser (3.1.2.0)
parser (3.1.3.0)
ast (~> 2.4.1)
pg (1.2.3)
pg (1.4.5)
pry (0.14.1)
coderay (~> 1.1)
method_source (~> 1.0)
pry-rails (0.3.9)
pry (>= 0.10.4)
public_suffix (4.0.7)
puma (5.6.4)
public_suffix (5.0.1)
puma (6.0.1)
nio4r (~> 2.0)
raabro (1.4.0)
racc (1.6.0)
rack (2.2.4)
rack-proxy (0.7.2)
racc (1.6.2)
rack (2.2.5)
rack-proxy (0.7.4)
rack
rack-test (2.0.2)
rack (>= 1.3)
Expand All @@ -259,8 +260,8 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.4.3)
loofah (~> 2.3)
rails-html-sanitizer (1.4.4)
loofah (~> 2.19, >= 2.19.1)
railties (7.0.4)
actionpack (= 7.0.4)
activesupport (= 7.0.4)
Expand All @@ -270,7 +271,7 @@ GEM
zeitwerk (~> 2.5)
rainbow (3.1.1)
rake (13.0.6)
regexp_parser (2.5.0)
regexp_parser (2.6.1)
representable (3.2.0)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
Expand All @@ -282,52 +283,54 @@ GEM
railties (>= 5.0)
retriable (3.1.2)
rexml (3.2.5)
rubocop (1.30.1)
rubocop (1.41.1)
json (~> 2.3)
parallel (~> 1.10)
parser (>= 3.1.0.0)
parser (>= 3.1.2.1)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.18.0, < 2.0)
rubocop-ast (>= 1.23.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.18.0)
rubocop-ast (1.24.1)
parser (>= 3.1.1.0)
rubocop-performance (1.14.2)
rubocop-performance (1.15.2)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
rubocop-rails (2.15.2)
rubocop-rails (2.17.4)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.7.0, < 2.0)
rubocop-rspec (2.11.1)
rubocop (~> 1.19)
rubocop (>= 1.33.0, < 2.0)
rubocop-rspec (2.16.0)
rubocop (~> 1.33)
ruby-progressbar (1.11.0)
ruby-vips (2.1.4)
ffi (~> 1.12)
ruby2_keywords (0.0.5)
semantic_range (3.0.0)
shakapacker (6.5.4)
shakapacker (6.5.5)
activesupport (>= 5.2)
rack-proxy (>= 0.6.1)
railties (>= 5.2)
semantic_range (>= 2.3.0)
signet (0.16.1)
signet (0.17.0)
addressable (~> 2.8)
faraday (>= 0.17.5, < 3.0)
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
sqlite3 (1.4.2)
sqlite3 (1.5.4)
mini_portile2 (~> 2.8.0)
thor (1.2.1)
timeout (0.3.0)
timeout (0.3.1)
tiny_tds (2.1.5)
trailblazer-option (0.1.2)
tzinfo (2.0.5)
concurrent-ruby (~> 1.0)
tzinfo-data (1.2022.1)
tzinfo-data (1.2022.7)
tzinfo (>= 1.0.0)
uber (0.1.0)
unicode-display_width (2.1.0)
unicode-display_width (2.3.0)
warden (1.2.9)
rack (>= 2.0.9)
web-console (4.2.0)
Expand All @@ -341,7 +344,7 @@ GEM
websocket-extensions (0.1.5)
yard (0.9.28)
webrick (~> 1.7.0)
zeitwerk (2.6.1)
zeitwerk (2.6.6)

PLATFORMS
ruby
Expand Down Expand Up @@ -383,7 +386,7 @@ DEPENDENCIES
yard

RUBY VERSION
ruby 3.1.0p0
ruby 3.2.0p0

BUNDLED WITH
2.3.25
2 changes: 1 addition & 1 deletion bin/motor-admin
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ require 'dotenv'

dotenv_filename = 'motor-admin.env'

if File.exists?(dotenv_filename)
if File.exist?(dotenv_filename)
Dotenv.load(dotenv_filename)
elsif ENV['SECRET_KEY_BASE'].to_s.empty?
require 'securerandom'
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"postcss-preset-env": "^6.7.0",
"sass": "^1.37.5",
"sass-loader": "^12.1.0",
"shakapacker": "6.5.4",
"shakapacker": "6.5.5",
"terser-webpack-plugin": "5",
"view3": "https://github.com/omohokcoj/view3#motor-admin",
"vue": "^3.0.0",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit df4b91a

Please sign in to comment.