Skip to content

Commit 5b48a7e

Browse files
committed
[WIP] Allow use with Rails 8.1
1 parent bbc8048 commit 5b48a7e

File tree

5 files changed

+35
-8
lines changed

5 files changed

+35
-8
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
- gemfiles/Gemfile.rails-7.1
2222
- gemfiles/Gemfile.rails-7.2
2323
- gemfiles/Gemfile.rails-8.0
24+
- gemfiles/Gemfile.rails-8.1
2425
orm:
2526
- active_record
2627
- mongoid
@@ -32,19 +33,21 @@ jobs:
3233
- gemfile: gemfiles/Gemfile.rails-7.1
3334
ruby-version: 3.2.9
3435
- gemfile: gemfiles/Gemfile.rails-7.2
35-
ruby-version: 3.3.9
36+
ruby-version: 3.3.10
3637
- gemfile: gemfiles/Gemfile.rails-8.0
37-
ruby-version: 3.4.5
38+
ruby-version: 3.4.8
39+
- gemfile: gemfiles/Gemfile.rails-8.1
40+
ruby-version: 4.0.0
3841
- gemfile: Gemfile
39-
ruby-version: 3.4.5
42+
ruby-version: 4.0.0
4043
orm: active_record
4144
test-db: mysql
4245
- gemfile: Gemfile
43-
ruby-version: 3.4.5
46+
ruby-version: 4.0.0
4447
orm: active_record
4548
test-db: postgresql
4649
- gemfile: Gemfile
47-
ruby-version: 3.4.5
50+
ruby-version: 3.4.8
4851
orm: mongoid
4952
test-db: mongodb
5053

activity_notification.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
1919
s.require_paths = ["lib"]
2020
s.required_ruby_version = '>= 2.1.0'
2121

22-
s.add_dependency 'railties', '>= 7.0.0', '< 8.1'
22+
s.add_dependency 'railties', '>= 7.0.0', '< 8.2'
2323
s.add_dependency 'i18n', '>= 0.5.0'
2424
s.add_dependency 'jquery-rails', '>= 3.1.1'
2525
s.add_dependency 'swagger-blocks', '>= 3.0.0'

gemfiles/Gemfile.rails-8.0

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ gem 'sprockets-rails'
88
group :development do
99
gem 'bullet'
1010
gem 'rack-cors'
11-
gem 'sqlite3'
1211
end
1312

1413
group :test do

gemfiles/Gemfile.rails-8.1

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
source 'https://rubygems.org'
2+
3+
gemspec path: '../'
4+
5+
gem 'rails', '~> 8.1.0'
6+
gem 'sprockets-rails'
7+
8+
group :development do
9+
gem 'bullet'
10+
gem 'rack-cors'
11+
end
12+
13+
group :test do
14+
gem 'rails-controller-testing'
15+
gem 'ammeter'
16+
gem 'timecop'
17+
gem 'committee'
18+
gem 'committee-rails', '< 0.6'
19+
# gem 'coveralls', require: false
20+
gem 'coveralls_reborn', require: false
21+
end
22+
23+
gem 'dotenv-rails', groups: [:development, :test]

spec/rails_app/config/application.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ class Application < Rails::Application
3434
if Gem::Version.new("5.2.0") <= Rails.gem_version && Rails.gem_version < Gem::Version.new("6.0.0") && ENV['AN_TEST_DB'] != 'mongodb'
3535
config.active_record.sqlite3.represent_boolean_as_integer = true
3636
end
37-
config.active_support.to_time_preserves_timezone = :zone
37+
if Rails.gem_version < Gem::Version.new("8.1.0")
38+
config.active_support.to_time_preserves_timezone = :zone
39+
end
3840

3941
# Configure CORS for API mode
4042
if defined?(Rack::Cors)

0 commit comments

Comments
 (0)