Skip to content

Commit

Permalink
Bump Ruby version to 2.7.5 + Bundler 2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
reidab committed Dec 31, 2021
1 parent 8d29fc8 commit 2a5c4d6
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.5.9
2.7.5
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
FROM ruby:2.5.9
FROM ruby:2.7.5
ARG git_sha
ENV LANG C.UTF-8
RUN apt-get update \
&& apt-get install --no-install-recommends -y libpq-dev postgresql-client sqlite3 libsqlite3-dev libssl-dev nodejs \
&& rm -rf /var/lib/apt/lists/*
RUN gem install bundler -v '< 2' \
&& bundle config --global frozen 1 \
RUN bundle config --global frozen 1 \
&& bundle config github.https true \
&& bundle config set deployment 'true'
COPY Gemfile Gemfile.lock .ruby-version /app/
Expand Down
40 changes: 20 additions & 20 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GIT
remote: git://github.com/fusion94/paper_trail_manager.git
remote: https://github.com/fusion94/paper_trail_manager.git
revision: b8630cd0e3318ad0929b80a701a18175402a4944
ref: b8630cd0e3318ad0929b80a701a18175402a4944
specs:
Expand Down Expand Up @@ -71,25 +71,25 @@ GEM
activemodel-serializers-xml (~> 1.0)
acts-as-taggable-on (~> 8.1)
bluecloth (~> 2.2)
font-awesome-rails (~> 4.7.0)
font-awesome-rails (~> 4.7)
formtastic (~> 4.0)
geokit (>= 1.9, < 1.14)
htmlentities (~> 4.3)
jquery-rails (>= 4.4.0)
jquery-ui-rails (>= 6.0.1)
jquery-rails (~> 4.4)
jquery-ui-rails (~> 6.0)
loofah (~> 2.0)
loofah-activerecord (>= 1.2, < 3.0)
lucene_query (= 0.1)
microformats (>= 4.0.7, < 4.3.0)
nokogiri
rack-contrib (~> 2.3)
rails (~> 5.0)
rails (~> 5.2)
rails-observers
rails_autolink (~> 1.1)
recaptcha (>= 5.3)
recaptcha (~> 5.8)
rest-client (~> 2.0)
ri_cal (~> 0.8.8)
sassc-rails (>= 2.1.2)
sassc-rails (~> 2.1)
sunspot_rails (~> 2.1)
utf8-cleaner (>= 0.0.6, < 1.1.0)
validate_url
Expand Down Expand Up @@ -122,12 +122,12 @@ GEM
faraday-patron (1.0.0)
faraday-rack (1.0.0)
ffi (1.15.4)
font-awesome-rails (4.7.0.7)
railties (>= 3.2, < 7)
font-awesome-rails (4.7.0.8)
railties (>= 3.2, < 8.0)
formtastic (4.0.0)
actionpack (>= 5.2.0)
geokit (1.13.1)
globalid (0.5.2)
globalid (1.0.0)
activesupport (>= 5.0)
highline (2.0.3)
htmlentities (4.3.4)
Expand All @@ -150,7 +150,7 @@ GEM
activesupport (>= 4)
railties (>= 4)
request_store (~> 1.0)
loofah (2.12.0)
loofah (2.13.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
loofah-activerecord (2.0.0)
Expand All @@ -163,12 +163,12 @@ GEM
microformats (4.2.1)
json (~> 2.2)
nokogiri (~> 1.10)
mime-types (3.3.1)
mime-types (3.4.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2021.0901)
mime-types-data (3.2021.1115)
mini_mime (1.1.2)
mini_portile2 (2.6.1)
minitest (5.14.4)
minitest (5.15.0)
multi_json (1.15.0)
multipart-post (2.1.1)
netrc (0.11.0)
Expand Down Expand Up @@ -243,7 +243,7 @@ GEM
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
ri_cal (0.8.8)
rsolr (2.3.0)
rsolr (2.4.0)
builder (>= 2.1.2)
faraday (>= 0.9.0)
rspec-core (3.9.3)
Expand Down Expand Up @@ -289,9 +289,9 @@ GEM
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.2)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets-rails (3.4.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sqlite3 (1.4.2)
sunspot (2.5.0)
Expand Down Expand Up @@ -340,7 +340,7 @@ DEPENDENCIES
paper_trail_manager!
progress_bar
puma
rails (~> 5.0)
rails (~> 5.2)
rails_12factor
rake (< 11.0)
recaptcha
Expand All @@ -353,4 +353,4 @@ DEPENDENCIES
web-console (~> 2.0)

BUNDLED WITH
1.17.3
2.1.4

0 comments on commit 2a5c4d6

Please sign in to comment.