diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dc4bbdb..9d13d68 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,7 +31,7 @@ jobs: with: ruby-version: 3.3 bundler-cache: true - rubygems: '3.6.9' + rubygems: '3.7.2' - name: Switch to SSH remotes for the Git repository run: git-ssh-remotes diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 611c982..84cd2b9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,7 +19,7 @@ jobs: fail-fast: false matrix: ruby: ['3.3', '3.4', '4.0'] - rails: ['7.2', '8.0', '8.1'] + rails: ['8.0', '8.1'] env: BUNDLE_GEMFILE: 'gemfiles/rails_${{ matrix.rails }}.gemfile' steps: @@ -36,7 +36,7 @@ jobs: with: ruby-version: ${{ matrix.ruby }} bundler-cache: true - rubygems: '3.6.9' + rubygems: '3.7.2' - name: Run the gem tests run: make test diff --git a/.rubocop.yml b/.rubocop.yml index 7c0742f..da7fe7d 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -15,7 +15,7 @@ AllCops: SuggestExtensions: false DisplayCopNames: true TargetRubyVersion: 3.3 - TargetRailsVersion: 7.2 + TargetRailsVersion: 8.0 Exclude: - bin/**/* - vendor/**/* diff --git a/Appraisals b/Appraisals index 441f01d..55e7a84 100644 --- a/Appraisals +++ b/Appraisals @@ -1,11 +1,5 @@ # frozen_string_literal: true -appraise 'rails-7.2' do - gem 'activejob', '~> 7.2.0' - gem 'activerecord', '~> 7.2.0' - gem 'activesupport', '~> 7.2.0' -end - appraise 'rails-8.0' do gem 'activejob', '~> 8.0.0' gem 'activerecord', '~> 8.0.0' diff --git a/CHANGELOG.md b/CHANGELOG.md index a9dc57c..61837dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ### next -* TODO: Replace this bullet point with an actual description of a change. +* Dropped Rails 7.1 support (#22) ### 2.6.0 (19 January 2026) diff --git a/Dockerfile b/Dockerfile index 03a5668..5deb6c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM hausgold/ruby:3.3 LABEL org.opencontainers.image.authors="containers@hausgold.de" # Update system gem -RUN gem update --system '3.4.22' +RUN gem update --system '3.7.2' # Install system packages and the latest bundler RUN apt-get update -yqqq && \ @@ -11,7 +11,7 @@ RUN apt-get update -yqqq && \ ca-certificates \ bash-completion inotify-tools && \ echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && /usr/sbin/locale-gen && \ - gem install bundler -v '~> 2.6.9' --no-document --no-prerelease + gem install bundler -v '~> 2.7.2' --no-document --no-prerelease # Add new web user RUN mkdir /app && \ diff --git a/countless.gemspec b/countless.gemspec index cb7a832..9f2d2d7 100644 --- a/countless.gemspec +++ b/countless.gemspec @@ -34,7 +34,7 @@ Gem::Specification.new do |spec| spec.required_ruby_version = '>= 3.3' - spec.add_dependency 'activesupport', '>= 7.2' + spec.add_dependency 'activesupport', '>= 8.0' spec.add_dependency 'ostruct', '>= 0.6' spec.add_dependency 'zeitwerk', '~> 2.6' end diff --git a/gemfiles/rails_7.2.gemfile b/gemfiles/rails_7.2.gemfile deleted file mode 100644 index b31832f..0000000 --- a/gemfiles/rails_7.2.gemfile +++ /dev/null @@ -1,21 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "appraisal", "~> 2.4" -gem "benchmark-ips", "~> 2.10" -gem "bundler", ">= 2.6", "< 5" -gem "guard-rspec", "~> 4.7" -gem "irb", "~> 1.2" -gem "rspec", "~> 3.12" -gem "rubocop" -gem "rubocop-rails" -gem "rubocop-rspec" -gem "simplecov", ">= 0.22" -gem "yard", ">= 0.9.28" -gem "yard-activesupport-concern", ">= 0.0.1" -gem "activejob", "~> 7.2.0" -gem "activerecord", "~> 7.2.0" -gem "activesupport", "~> 7.2.0" - -gemspec path: "../"