From 11dd9d3ff4ac805f222dab1b1ae121b3085f022d Mon Sep 17 00:00:00 2001 From: MICE Portal Date: Wed, 10 Sep 2025 12:01:30 +0200 Subject: [PATCH 1/2] upgrade ruby --- .github/workflows/ci.yml | 4 +- .ruby-version | 2 +- Gemfile | 2 +- Gemfile.lock | 240 +++++++++++++++++++++++---------------- lib/casclient/version.rb | 2 +- 5 files changed, 147 insertions(+), 103 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0794f92e..cea21390 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,11 +15,11 @@ jobs: strategy: matrix: rvm: - - '3.1' - '3.2' - '3.3' + - '3.4' - name: Ruby ${{ matrix.ruby }} test + name: Ruby ${{ matrix.rvm }} test steps: - name: Add SSH key # this is needed to access private repositories diff --git a/.ruby-version b/.ruby-version index 0aec50e6..3b47f2e4 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.1.4 +3.3.9 diff --git a/Gemfile b/Gemfile index 9dfbe707..4c28f996 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "http://rubygems.org" group :test, :development do - gem "rails", "~> 7.0" + gem "rails", "~> 7.2" gem "sqlite3" gem "rspec" gem "rspec-rails" diff --git a/Gemfile.lock b/Gemfile.lock index 66f8b27a..604c905a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -18,94 +18,114 @@ PATH GEM remote: http://rubygems.org/ specs: - actioncable (7.0.8.4) - actionpack (= 7.0.8.4) - activesupport (= 7.0.8.4) + actioncable (7.2.2.2) + actionpack (= 7.2.2.2) + activesupport (= 7.2.2.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8.4) - actionpack (= 7.0.8.4) - activejob (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) - mail (>= 2.7.1) - net-imap - net-pop - net-smtp - actionmailer (7.0.8.4) - actionpack (= 7.0.8.4) - actionview (= 7.0.8.4) - activejob (= 7.0.8.4) - activesupport (= 7.0.8.4) - mail (~> 2.5, >= 2.5.4) - net-imap - net-pop - net-smtp - rails-dom-testing (~> 2.0) - actionpack (7.0.8.4) - actionview (= 7.0.8.4) - activesupport (= 7.0.8.4) - rack (~> 2.0, >= 2.2.4) + zeitwerk (~> 2.6) + actionmailbox (7.2.2.2) + actionpack (= 7.2.2.2) + activejob (= 7.2.2.2) + activerecord (= 7.2.2.2) + activestorage (= 7.2.2.2) + activesupport (= 7.2.2.2) + mail (>= 2.8.0) + actionmailer (7.2.2.2) + actionpack (= 7.2.2.2) + actionview (= 7.2.2.2) + activejob (= 7.2.2.2) + activesupport (= 7.2.2.2) + mail (>= 2.8.0) + rails-dom-testing (~> 2.2) + actionpack (7.2.2.2) + actionview (= 7.2.2.2) + activesupport (= 7.2.2.2) + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4, < 3.2) + rack-session (>= 1.0.1) rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8.4) - actionpack (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + useragent (~> 0.16) + actiontext (7.2.2.2) + actionpack (= 7.2.2.2) + activerecord (= 7.2.2.2) + activestorage (= 7.2.2.2) + activesupport (= 7.2.2.2) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8.4) - activesupport (= 7.0.8.4) + actionview (7.2.2.2) + activesupport (= 7.2.2.2) builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.8.4) - activesupport (= 7.0.8.4) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (7.2.2.2) + activesupport (= 7.2.2.2) globalid (>= 0.3.6) - activemodel (7.0.8.4) - activesupport (= 7.0.8.4) - activerecord (7.0.8.4) - activemodel (= 7.0.8.4) - activesupport (= 7.0.8.4) - activestorage (7.0.8.4) - actionpack (= 7.0.8.4) - activejob (= 7.0.8.4) - activerecord (= 7.0.8.4) - activesupport (= 7.0.8.4) + activemodel (7.2.2.2) + activesupport (= 7.2.2.2) + activerecord (7.2.2.2) + activemodel (= 7.2.2.2) + activesupport (= 7.2.2.2) + timeout (>= 0.4.0) + activestorage (7.2.2.2) + actionpack (= 7.2.2.2) + activejob (= 7.2.2.2) + activerecord (= 7.2.2.2) + activesupport (= 7.2.2.2) marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (7.0.8.4) - concurrent-ruby (~> 1.0, >= 1.0.2) + activesupport (7.2.2.2) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - tzinfo (~> 2.0) - ast (2.4.2) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + ast (2.4.3) + base64 (0.3.0) + benchmark (0.4.1) + bigdecimal (3.2.3) builder (3.2.4) - concurrent-ruby (1.1.10) + concurrent-ruby (1.3.5) + connection_pool (2.5.4) crass (1.0.6) date (3.3.4) diff-lcs (1.3) - erubi (1.7.1) + drb (2.2.3) + erb (5.0.2) + erubi (1.13.1) globalid (0.6.0) activesupport (>= 5.0) i18n (1.6.0) concurrent-ruby (~> 1.0) + io-console (0.8.1) + irb (1.15.2) + pp (>= 0.6.0) + rdoc (>= 4.0.0) + reline (>= 0.4.2) json (2.6.3) - loofah (2.2.3) + logger (1.7.0) + loofah (2.24.1) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) + nokogiri (>= 1.12.0) + mail (2.8.1) mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp marcel (1.0.4) - method_source (0.9.2) mini_mime (1.1.5) - mini_portile2 (2.8.7) + mini_portile2 (2.8.9) minitest (5.11.3) - net-imap (0.3.7) + net-imap (0.3.9) date net-protocol net-pop (0.1.2) @@ -114,47 +134,66 @@ GEM timeout net-smtp (0.3.4) net-protocol - nio4r (2.7.3) - nokogiri (1.13.10) - mini_portile2 (~> 2.8.0) + nio4r (2.7.4) + nokogiri (1.18.9) + mini_portile2 (~> 2.8.2) racc (~> 1.4) parallel (1.22.1) parser (3.1.3.0) ast (~> 2.4.1) power_assert (1.1.7) + pp (0.6.2) + prettyprint + prettyprint (0.2.0) + psych (5.2.6) + date + stringio racc (1.6.2) - rack (2.2.9) + rack (2.2.17) + rack-session (1.0.2) + rack (< 3) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (7.0.8.4) - actioncable (= 7.0.8.4) - actionmailbox (= 7.0.8.4) - actionmailer (= 7.0.8.4) - actionpack (= 7.0.8.4) - actiontext (= 7.0.8.4) - actionview (= 7.0.8.4) - activejob (= 7.0.8.4) - activemodel (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) + rackup (1.0.1) + rack (< 3) + webrick + rails (7.2.2.2) + actioncable (= 7.2.2.2) + actionmailbox (= 7.2.2.2) + actionmailer (= 7.2.2.2) + actionpack (= 7.2.2.2) + actiontext (= 7.2.2.2) + actionview (= 7.2.2.2) + activejob (= 7.2.2.2) + activemodel (= 7.2.2.2) + activerecord (= 7.2.2.2) + activestorage (= 7.2.2.2) + activesupport (= 7.2.2.2) bundler (>= 1.15.0) - railties (= 7.0.8.4) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + railties (= 7.2.2.2) + rails-dom-testing (2.3.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.2.0) - loofah (~> 2.2, >= 2.2.2) - railties (7.0.8.4) - actionpack (= 7.0.8.4) - activesupport (= 7.0.8.4) - method_source + rails-html-sanitizer (1.6.2) + loofah (~> 2.21) + nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) + railties (7.2.2.2) + actionpack (= 7.2.2.2) + activesupport (= 7.2.2.2) + irb (~> 1.13) + rackup (>= 1.0.0) rake (>= 12.2) - thor (~> 1.0) - zeitwerk (~> 2.5) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) rainbow (3.1.1) rake (12.3.3) + rdoc (6.14.2) + erb + psych (>= 4.0.0) regexp_parser (2.6.2) + reline (0.6.2) + io-console (~> 0.5) rexml (3.2.9) strscan rspec (3.8.0) @@ -202,27 +241,32 @@ GEM rubocop-rspec (2.15.0) rubocop (~> 1.33) ruby-progressbar (1.11.0) + securerandom (0.4.1) sqlite3 (1.5.4) mini_portile2 (~> 2.8.0) - strscan (3.1.0) + stringio (3.1.7) + strscan (3.1.5) test-unit (3.2.9) power_assert - thor (1.0.1) - timeout (0.3.2) + thor (1.4.0) + timeout (0.4.3) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.3.0) - websocket-driver (0.7.6) + useragent (0.16.11) + webrick (1.9.1) + websocket-driver (0.7.7) + base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.6.16) + zeitwerk (2.6.18) PLATFORMS ruby DEPENDENCIES konvenit_style! - rails (~> 7.0) + rails (~> 7.2) rspec rspec-expectations rspec-rails @@ -231,4 +275,4 @@ DEPENDENCIES test-unit (~> 3.0) BUNDLED WITH - 2.3.12 + 2.6.9 diff --git a/lib/casclient/version.rb b/lib/casclient/version.rb index 5ed5d694..635efde6 100644 --- a/lib/casclient/version.rb +++ b/lib/casclient/version.rb @@ -2,7 +2,7 @@ module CASClient #:nodoc: module VERSION #:nodoc: MAJOR = 2 MINOR = 0 - TINY = 99 + TINY = 100 STRING = [MAJOR, MINOR, TINY].join('.') end From e9d6448355b7b3279646cc6b07fd152e2697e4bb Mon Sep 17 00:00:00 2001 From: MICE Portal Date: Wed, 10 Sep 2025 12:06:36 +0200 Subject: [PATCH 2/2] Update Gemfile.lock --- Gemfile.lock | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 604c905a..923618bd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -111,7 +111,9 @@ GEM pp (>= 0.6.0) rdoc (>= 4.0.0) reline (>= 0.4.2) - json (2.6.3) + json (2.13.2) + language_server-protocol (3.17.0.5) + lint_roller (1.1.0) logger (1.7.0) loofah (2.24.1) crass (~> 1.0.2) @@ -138,13 +140,15 @@ GEM nokogiri (1.18.9) mini_portile2 (~> 2.8.2) racc (~> 1.4) - parallel (1.22.1) - parser (3.1.3.0) + parallel (1.27.0) + parser (3.3.9.0) ast (~> 2.4.1) + racc power_assert (1.1.7) pp (0.6.2) prettyprint prettyprint (0.2.0) + prism (1.4.0) psych (5.2.6) date stringio @@ -191,11 +195,9 @@ GEM rdoc (6.14.2) erb psych (>= 4.0.0) - regexp_parser (2.6.2) + regexp_parser (2.11.2) reline (0.6.2) io-console (~> 0.5) - rexml (3.2.9) - strscan rspec (3.8.0) rspec-core (~> 3.8.0) rspec-expectations (~> 3.8.0) @@ -217,18 +219,20 @@ GEM rspec-mocks (~> 3.8.0) rspec-support (~> 3.8.0) rspec-support (3.8.3) - rubocop (1.40.0) + rubocop (1.80.2) json (~> 2.3) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.1.0) parallel (~> 1.10) - parser (>= 3.1.2.1) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.23.0, < 2.0) + regexp_parser (>= 2.9.3, < 3.0) + rubocop-ast (>= 1.46.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.24.1) - parser (>= 3.1.1.0) + unicode-display_width (>= 2.4.0, < 4.0) + rubocop-ast (1.46.0) + parser (>= 3.3.7.2) + prism (~> 1.4) rubocop-checkstyle_formatter (0.6.0) rubocop (>= 1.14.0) rubocop-performance (1.15.2) @@ -240,19 +244,20 @@ GEM rubocop (>= 1.33.0, < 2.0) rubocop-rspec (2.15.0) rubocop (~> 1.33) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) securerandom (0.4.1) sqlite3 (1.5.4) mini_portile2 (~> 2.8.0) stringio (3.1.7) - strscan (3.1.5) test-unit (3.2.9) power_assert thor (1.4.0) timeout (0.4.3) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.3.0) + unicode-display_width (3.2.0) + unicode-emoji (~> 4.1) + unicode-emoji (4.1.0) useragent (0.16.11) webrick (1.9.1) websocket-driver (0.7.7)