Skip to content

Commit a411d51

Browse files
authored
Merge pull request #71 from clio/upgrade_to_ruby_3
Upgrade to ruby 3
2 parents 92d50ad + 9fc8289 commit a411d51

File tree

8 files changed

+6
-153
lines changed

8 files changed

+6
-153
lines changed

.github/workflows/ci.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ jobs:
1414
matrix:
1515
gemfile:
1616
- Gemfile
17-
- Gemfile.5.2
18-
- Gemfile.6.0
1917
- Gemfile.6.1
2018
env:
2119
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
@@ -24,7 +22,7 @@ jobs:
2422
- name: Set up Ruby ${{ matrix.ruby-version }}
2523
uses: ruby/setup-ruby@v1
2624
with:
27-
ruby-version: 2.7
25+
ruby-version: 3.1
2826
- name: Install dependencies
2927
run: bundle install
3028
- name: Run tests

.github/workflows/gem-push.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v4
16-
- name: Set up Ruby 2.7
16+
- name: Set up Ruby 3.1
1717
uses: ruby/setup-ruby@v1
1818
with:
19-
ruby-version: 2.7
19+
ruby-version: 3.1
2020

2121
- name: Publish to RubyGems
2222
env:

Gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
source 'https://rubygems.org'
22

33
gem "activerecord", ">=7"
4+
gem "sqlite3", "~> 1.4"
45
# Specify your gem's dependencies in jit_preloader.gemspec
56
gemspec

Gemfile.5.2

-6
This file was deleted.

Gemfile.5.2.lock

-72
This file was deleted.

lib/jit_preloader.rb

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@
1111
if Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("7.0.0")
1212
require 'jit_preloader/active_record/associations/preloader/ar7_association'
1313
require 'jit_preloader/active_record/associations/preloader/ar7_branch'
14-
elsif Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("6.0.0")
14+
elsif Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("6.1.0")
1515
require 'jit_preloader/active_record/associations/preloader/ar6_association'
16-
elsif Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("5.2.2")
17-
require 'jit_preloader/active_record/associations/preloader/ar5_association'
1816
else
1917
require 'jit_preloader/active_record/associations/preloader/collection_association'
2018
require 'jit_preloader/active_record/associations/preloader/singular_association'

lib/jit_preloader/active_record/associations/preloader/ar5_association.rb

-66
This file was deleted.

lib/jit_preloader/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module JitPreloader
2-
VERSION = "2.1.0"
2+
VERSION = "3.0.0"
33
end

0 commit comments

Comments
 (0)