Skip to content

Commit 00ae805

Browse files
Merge pull request #50 from jonashellmann/upgrade-ruby-to-3.4
Upgrade ruby to 3.4
2 parents 77c3867 + 14a1aa4 commit 00ae805

File tree

6 files changed

+43
-39
lines changed

6 files changed

+43
-39
lines changed

.github/workflows/ruby.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Set up Ruby
1313
uses: ruby/setup-ruby@v1
1414
with:
15-
ruby-version: 3.2
15+
ruby-version: 3.4
1616
bundler-cache: true
1717
- name: Install dependencies
1818
run: |

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:3.0.2
1+
FROM ruby:3.4.2
22

33
LABEL org.opencontainers.image.authors="Jonas Hellmann <mail@jonas-hellmann.de>"
44

Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ source 'https://rubygems.org'
22

33

44
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
5-
gem 'rails', '>=7.1.4.1'
5+
gem 'rails', '~> 7.1.5.1'
66
# Use sqlite3 as the database for Active Record
7-
gem 'sqlite3', '~> 1.4'
7+
gem 'sqlite3', '>= 2.1'
88
gem 'mysql2', '~> 0.5'
99
# Use SCSS for stylesheets
10-
gem 'sass-rails', '~> 5.0'
10+
gem 'sassc-rails'
1111
# Use Uglifier as compressor for JavaScript assets
1212
gem 'uglifier', '>= 1.3.0'
1313
# See https://github.com/rails/execjs#readme for more supported runtimes

Gemfile.lock

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ GEM
101101
erubi (1.13.1)
102102
execjs (2.10.0)
103103
ffi (1.17.1)
104+
ffi (1.17.1-x86_64-linux-gnu)
104105
globalid (1.2.1)
105106
activesupport (>= 6.1)
106107
hashery (2.1.2)
@@ -132,10 +133,11 @@ GEM
132133
net-smtp
133134
marcel (1.0.4)
134135
mini_mime (1.1.5)
136+
mini_portile2 (2.8.8)
135137
minitest (5.25.4)
136138
mutex_m (0.3.0)
137139
mysql2 (0.5.6)
138-
net-imap (0.4.19)
140+
net-imap (0.5.6)
139141
date
140142
net-protocol
141143
net-pop (0.1.2)
@@ -145,7 +147,10 @@ GEM
145147
net-smtp (0.5.1)
146148
net-protocol
147149
nio4r (2.7.4)
148-
nokogiri (1.17.2-x86_64-linux)
150+
nokogiri (1.18.3)
151+
mini_portile2 (~> 2.8.2)
152+
racc (~> 1.4)
153+
nokogiri (1.18.3-x86_64-linux-gnu)
149154
racc (~> 1.4)
150155
ostruct (0.6.1)
151156
pdf-reader (2.14.1)
@@ -161,16 +166,16 @@ GEM
161166
date
162167
stringio
163168
racc (1.8.1)
164-
rack (2.2.11)
169+
rack (3.1.10)
165170
rack-cors (2.0.2)
166171
rack (>= 2.0.0)
167-
rack-session (1.0.2)
168-
rack (< 3)
172+
rack-session (2.1.0)
173+
base64 (>= 0.1.0)
174+
rack (>= 3.0.0)
169175
rack-test (2.2.0)
170176
rack (>= 1.3)
171-
rackup (1.0.1)
172-
rack (< 3)
173-
webrick
177+
rackup (2.2.1)
178+
rack (>= 3)
174179
rails (7.1.5.1)
175180
actioncable (= 7.1.5.1)
176181
actionmailbox (= 7.1.5.1)
@@ -201,39 +206,34 @@ GEM
201206
thor (~> 1.0, >= 1.2.2)
202207
zeitwerk (~> 2.6)
203208
rake (13.2.1)
204-
rb-fsevent (0.11.2)
205-
rb-inotify (0.11.1)
206-
ffi (~> 1.0)
207209
rdoc (6.12.0)
208210
psych (>= 4.0.0)
209211
reline (0.6.0)
210212
io-console (~> 0.5)
211213
ruby-rc4 (0.1.5)
212-
sass (3.7.4)
213-
sass-listen (~> 4.0.0)
214-
sass-listen (4.0.0)
215-
rb-fsevent (~> 0.9, >= 0.9.4)
216-
rb-inotify (~> 0.9, >= 0.9.7)
217-
sass-rails (5.1.0)
218-
railties (>= 5.2.0)
219-
sass (~> 3.1)
220-
sprockets (>= 2.8, < 4.0)
221-
sprockets-rails (>= 2.0, < 4.0)
222-
tilt (>= 1.1, < 3)
214+
sassc (2.4.0)
215+
ffi (~> 1.9)
216+
sassc-rails (2.1.2)
217+
railties (>= 4.0.0)
218+
sassc (>= 2.0)
219+
sprockets (> 3.0)
220+
sprockets-rails
221+
tilt
223222
sdoc (1.1.0)
224223
rdoc (>= 5.0)
225-
securerandom (0.3.2)
224+
securerandom (0.4.1)
226225
spring (4.2.1)
227-
sprockets (3.7.5)
228-
base64
226+
sprockets (4.2.1)
229227
concurrent-ruby (~> 1.0)
230-
rack (> 1, < 3)
228+
rack (>= 2.2.4, < 4)
231229
sprockets-rails (3.5.2)
232230
actionpack (>= 6.1)
233231
activesupport (>= 6.1)
234232
sprockets (>= 3.0.0)
235-
sqlite3 (1.7.3-x86_64-linux)
236-
stringio (3.1.3)
233+
sqlite3 (2.6.0)
234+
mini_portile2 (~> 2.8.0)
235+
sqlite3 (2.6.0-x86_64-linux-gnu)
236+
stringio (3.1.5)
237237
thor (1.3.2)
238238
tilt (2.6.0)
239239
timeout (0.4.3)
@@ -256,9 +256,10 @@ GEM
256256
base64
257257
websocket-extensions (>= 0.1.0)
258258
websocket-extensions (0.1.5)
259-
zeitwerk (2.6.18)
259+
zeitwerk (2.7.2)
260260

261261
PLATFORMS
262+
ruby
262263
x86_64-linux
263264

264265
DEPENDENCIES
@@ -272,15 +273,15 @@ DEPENDENCIES
272273
mysql2 (~> 0.5)
273274
pdf-reader
274275
rack-cors
275-
rails (>= 7.1.4.1)
276-
sass-rails (~> 5.0)
276+
rails (~> 7.1.5.1)
277+
sassc-rails
277278
sdoc (~> 1.1.0)
278279
spring
279-
sqlite3 (~> 1.4)
280+
sqlite3 (>= 2.1)
280281
turbolinks
281282
uglifier (>= 1.3.0)
282283
web-console (~> 2.0)
283284
webrick (>= 1.8.2)
284285

285286
BUNDLED WITH
286-
2.2.22
287+
2.6.2

app/assets/config/manifest.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
//= link_tree ../images
2+
//= link_directory ../javascripts .js
3+
//= link_directory ../stylesheets .css

app/controllers/version_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ class VersionController < ApplicationController
33

44
# GET /version
55
def version
6-
version = '1.5.11'
6+
version = '1.5.12'
77
json_response(version: version)
88
end
99
end

0 commit comments

Comments
 (0)