Skip to content

Commit 26953e5

Browse files
authored
Support Ruby 3.x through 4.0 (#104)
Updates refinerycms-i18n to Ruby 3, to match refinery/refinerycms#3518. Using Mobility 1.3.x Apart from that most changes are extremely minor.
1 parent 14e6384 commit 26953e5

261 files changed

Lines changed: 250 additions & 57 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/main.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@ jobs:
1010
test:
1111
strategy:
1212
matrix:
13-
database: [ mysql, postgresql ]
14-
ruby: [ 2.7, 2.6 ]
13+
database: [ sqlite3, mysql, postgresql ]
14+
ruby: [ 4.0, 3.4, 3.3, 3.2, 3.1 ]
1515
fail-fast: false
16-
max-parallel: 20
1716
runs-on: ubuntu-latest
1817

1918
env:
@@ -29,7 +28,7 @@ jobs:
2928
name: ${{ matrix.ruby }} ${{ matrix.database }}
3029
steps:
3130
- run: sudo apt-get update && sudo apt-get install libsqlite3-dev -y
32-
- uses: actions/checkout@v2
31+
- uses: actions/checkout@v6
3332
- uses: ruby/setup-ruby@v1
3433
with:
3534
bundler-cache: true

.gitignore

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,3 +87,83 @@ spec/dummy
8787

8888
# Local Gemfile for developing without sharing dependencies
8989
.gemfile
90+
# Rails
91+
.bundle
92+
db/*.sqlite3
93+
db/*.sqlite3-journal
94+
*.log
95+
tmp
96+
tmp/**/*
97+
98+
# Documentation
99+
doc/api
100+
doc/app
101+
.yardoc
102+
.yardopts
103+
coverage
104+
105+
# Public Uploads
106+
public/system/*
107+
public/themes/*
108+
109+
# Public Cache
110+
public/javascripts/cache
111+
public/stylesheets/cache
112+
public/refinery/*
113+
114+
# Vendor Cache
115+
vendor/cache
116+
117+
# Acts as Indexed
118+
index/**/*
119+
120+
# Refinery Specific
121+
*.tmproj
122+
*.autobackupbyrefinery.*
123+
refinerycms-*.gem
124+
125+
# Mac
126+
.DS_Store
127+
128+
# Windows
129+
Thumbs.db
130+
131+
# NetBeans
132+
nbproject
133+
134+
# Eclipse
135+
.project
136+
137+
# Redcar
138+
.redcar
139+
140+
# Rubinius
141+
*.rbc
142+
143+
# Vim
144+
*.swp
145+
*.swo
146+
147+
# RubyMine
148+
.idea
149+
150+
# E-texteditor
151+
.eprj
152+
153+
# Backup
154+
*~
155+
156+
# Capybara Bug
157+
capybara-*html
158+
159+
# sass
160+
.sass-cache
161+
.sass-cache/*
162+
163+
#rvm
164+
.rvmrc
165+
.rvmrc.*
166+
167+
# vendor/extensions dummy applications.
168+
vendor/extensions/**/spec/dummy
169+

Gemfile

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
source "https://rubygems.org"
2-
32
gemspec
4-
5-
git "https://github.com/refinery/refinerycms", branch: "master" do
3+
#
4+
git "https://github.com/anitagraham/refinerycms", branch: "ruby3" do
65
gem "refinerycms"
76

87
group :test do
@@ -18,22 +17,22 @@ gem 'routing-filter', git: 'https://github.com/svenfuchs/routing-filter', branch
1817

1918
# Database Configuration
2019
unless ENV["TRAVIS"]
21-
gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
22-
gem "sqlite3", :platform => :ruby
20+
gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
21+
gem "sqlite3", platform: :ruby
2322
end
2423

2524
if !ENV["TRAVIS"] || ENV["DB"] == "mysql"
26-
gem "activerecord-jdbcmysql-adapter", :platform => :jruby
27-
gem "jdbc-mysql", "= 5.1.13", :platform => :jruby
28-
gem 'mysql2', '~> 0.5.3', :platform => :ruby
25+
gem "activerecord-jdbcmysql-adapter", platform: :jruby
26+
gem "jdbc-mysql", "= 5.1.13", platform: :jruby
27+
gem 'mysql2', '~> 0.5.3', platform: :ruby
2928
end
3029

3130
if !ENV["TRAVIS"] || ENV["DB"] == "postgresql"
32-
gem "activerecord-jdbcpostgresql-adapter", :platform => :jruby
33-
gem "pg", :platform => :ruby
31+
gem "activerecord-jdbcpostgresql-adapter", platform: :jruby
32+
gem "pg", platform: :ruby
3433
end
3534

36-
gem "jruby-openssl", :platform => :jruby
35+
gem "jruby-openssl", platform: :jruby
3736

3837
# Refinery/rails should pull in the proper versions of these
3938
group :assets do

README.md

Lines changed: 26 additions & 4 deletions

Rakefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ end
88
ENGINE_PATH = File.dirname(__FILE__)
99
APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
1010

11-
if File.exists?(APP_RAKEFILE)
12-
load 'rails/tasks/engine.rake'
13-
end
11+
load 'rails/tasks/engine.rake' if File.exist?(APP_RAKEFILE)
1412

1513
require "refinerycms-testing"
1614
Refinery::Testing::Railtie.load_dummy_tasks(ENGINE_PATH)
-643 Bytes
Binary file not shown.
-408 Bytes
Binary file not shown.
-604 Bytes
Binary file not shown.
-591 Bytes
Binary file not shown.
-643 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)