From fb1d2357b8a49abb0b5fc7779f681979ed8cf691 Mon Sep 17 00:00:00 2001 From: Simon Neutert Date: Sat, 20 Jan 2024 13:17:05 +0100 Subject: [PATCH] closes Upgrade to Ruby v3.3.x #66 --- .github/workflows/ruby.yml | 8 ++++---- .rubocop.yml | 2 +- .tool-versions | 2 +- CHANGELOG.md | 6 +++++- Dockerfile | 2 +- Dockerfile.prod | 2 +- Gemfile.lock | 8 ++++---- README.md | 2 +- UPGRADING.md | 4 ++++ next-version | 2 +- 10 files changed, 23 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index b1aac87..38d7c1a 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -36,7 +36,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: ["ruby-3.2"] + ruby: ["ruby-3.3"] os: [macos-latest, ubuntu-latest] steps: @@ -49,6 +49,9 @@ jobs: ruby-version: ${{ matrix.ruby }} bundler-cache: true + - name: Rubocop + run: bundle exec rubocop + - name: Creating shared database run: bundle exec rake db:shared:init @@ -63,6 +66,3 @@ jobs: - name: Run tests run: bundle exec rake - - - name: Rubocop - run: bundle exec rubocop diff --git a/.rubocop.yml b/.rubocop.yml index 4ffdb2b..e5ba396 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -19,7 +19,7 @@ inherit_from: .rubocop_todo.yml # value will be used. # AllCops: - TargetRubyVersion: 3.2 + TargetRubyVersion: 3.3 NewCops: enable require: diff --git a/.tool-versions b/.tool-versions index f2a971a..3294aed 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -ruby 3.2.2 +ruby 3.3.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index fd512de..c3e29bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). -## [next] - unreleased +## [next] - yyyy-mm-dd + +- [#72](https://github.com/simonneutert/ka-ching-backend/pull/72) Upgrades Ruby to v3.3.0 - [@simonneutert](https://github.com/simonneutert). + +## [0.4.3] - 2023-12-21 - [#46](https://github.com/simonneutert/ka-ching-backend/pull/46) Bump roda, rubocop, alba and bundler itself - [@simonneutert](https://github.com/simonneutert). - [#47](https://github.com/simonneutert/ka-ching-backend/pull/47) Upgrade alba gem to v3+ - [@simonneutert](https://github.com/simonneutert). diff --git a/Dockerfile b/Dockerfile index cc555c2..19ee3a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.2-slim +FROM ruby:3.3-slim ARG uid=1337 ARG user=killerbuchhalter diff --git a/Dockerfile.prod b/Dockerfile.prod index f8ee424..adb36a9 100644 --- a/Dockerfile.prod +++ b/Dockerfile.prod @@ -1,4 +1,4 @@ -FROM ruby:3.2-slim +FROM ruby:3.3-slim ARG uid=1337 ARG user=killerbuchhalter diff --git a/Gemfile.lock b/Gemfile.lock index eb1e362..0d466aa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -22,12 +22,12 @@ GEM minitest-hooks (1.5.1) minitest (> 5.3) nio4r (2.7.0) - nokogiri (1.15.5) + nokogiri (1.16.0) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.15.5-arm64-darwin) + nokogiri (1.16.0-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.5-x86_64-linux) + nokogiri (1.16.0-x86_64-linux) racc (~> 1.4) oj (3.16.3) bigdecimal (>= 3.0) @@ -137,4 +137,4 @@ DEPENDENCIES solargraph BUNDLED WITH - 2.4.20 + 2.5.5 diff --git a/README.md b/README.md index b5668cc..93b0ae3 100644 --- a/README.md +++ b/README.md @@ -220,7 +220,7 @@ I've been tossing around the term "micro-monolith" for some time. Not sure if it ## Setup and Dependencies -- Ruby 3.x (but 3.2.x is recommended) with the following gems: +- Ruby 3.x (3.3.x is recommended) with the following gems: - [Roda](https://roda.jeremyevans.net/) - [Sequel](https://sequel.jeremyevans.net/) - [Rake](https://github.com/ruby/rake) diff --git a/UPGRADING.md b/UPGRADING.md index b55e673..475fe00 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -1,5 +1,9 @@ # Upgrading ka-ching-backend +## >= 0.5.0 + +Switches to Ruby v3.3 with syntax changes. Rubocop is used to lint the code. This is a breaking change, as v3.3 may not backwards compatible. + ## > 0.4.3 Switches to Ruby v3.2 with syntax changes. Rubocop is used to lint the code. This is a breaking change, as v3.2 may not backwards compatible. diff --git a/next-version b/next-version index 79b0815..992ac75 100644 --- a/next-version +++ b/next-version @@ -1 +1 @@ -v0.4.4 +v0.5.1