Skip to content

Commit 43444d1

Browse files
authored
Update Ruby and SQLite dependencies (#265)
* chore: Update Ruby and SQLite dependencies (#262) Update Ruby version to 3.3.1 and SQLite version to 2.0.2 in gemspec and Appraisals file. Also, update the RubyGems and Bundler versions in the gem-publish workflow. * Update Appraisals and gem versions (#264) * chore: Update Appraisals and Action names * chore: Bump Apartment gem version to 3.0.2 * chore: Update SQLite database configuration for test environment * Revert SQLite dependency changes in Appraisals * Fix jruby and Rails 7.0 JDBC version * chore: Update JDBC adapters to version 70.0 for Rails 7.0 and 71.0 for Rails 7.1 * Downgrade SQLite dep to < 2.0
1 parent 55c7ca6 commit 43444d1

10 files changed

+33
-49
lines changed

.github/workflows/gem-publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Ruby Gem Publish
1+
name: Publish to RubyGems
22
on:
33
push:
44
branches: [ 'main' ]

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Ruby
1+
name: RSpec
22
on:
33
push:
44
branches:

.github/workflows/rubocop.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Ruby
1+
name: Rubocop
22
on:
33
push:
44
branches:

Appraisals

+21-20
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
appraise 'rails-6-1' do
44
gem 'rails', '~> 6.1.0'
55
platforms :ruby do
6-
gem 'sqlite3', '~> 2.0'
6+
gem 'sqlite3', '~> 1.4'
77
end
88
platforms :jruby do
99
gem 'activerecord-jdbc-adapter', '~> 61.0'
@@ -15,35 +15,36 @@ end
1515
appraise 'rails-7-0' do
1616
gem 'rails', '~> 7.0.0'
1717
platforms :ruby do
18-
gem 'sqlite3', '~> 2.0'
18+
gem 'sqlite3', '~> 1.4'
1919
end
2020
platforms :jruby do
21-
gem 'activerecord-jdbc-adapter', '~> 61.0'
22-
gem 'activerecord-jdbcpostgresql-adapter', '~> 61.0'
23-
gem 'activerecord-jdbcmysql-adapter', '~> 61.0'
21+
gem 'activerecord-jdbc-adapter', '~> 70.0'
22+
gem 'activerecord-jdbcpostgresql-adapter', '~> 70.0'
23+
gem 'activerecord-jdbcmysql-adapter', '~> 70.0'
2424
end
2525
end
2626

2727
appraise 'rails-7-1' do
2828
gem 'rails', '~> 7.1.0'
2929
platforms :ruby do
30-
gem 'sqlite3', '~> 2.0'
30+
gem 'sqlite3', '~> 1.6'
3131
end
3232
platforms :jruby do
33-
gem 'activerecord-jdbc-adapter', '~> 61.0'
34-
gem 'activerecord-jdbcpostgresql-adapter', '~> 61.0'
35-
gem 'activerecord-jdbcmysql-adapter', '~> 61.0'
33+
gem 'activerecord-jdbc-adapter', '~> 71.0'
34+
gem 'activerecord-jdbcpostgresql-adapter', '~> 71.0'
35+
gem 'activerecord-jdbcmysql-adapter', '~> 71.0'
3636
end
3737
end
3838

39-
appraise 'rails-master' do
40-
gem 'rails', git: 'https://github.com/rails/rails.git'
41-
platforms :ruby do
42-
gem 'sqlite3', '~> 2.0'
43-
end
44-
platforms :jruby do
45-
gem 'activerecord-jdbc-adapter', '~> 61.0'
46-
gem 'activerecord-jdbcpostgresql-adapter', '~> 61.0'
47-
gem 'activerecord-jdbcmysql-adapter', '~> 61.0'
48-
end
49-
end
39+
# Install Rails from the main branch are failing
40+
# appraise 'rails-master' do
41+
# gem 'rails', git: 'https://github.com/rails/rails.git'
42+
# platforms :ruby do
43+
# gem 'sqlite3', '~> 2.0'
44+
# end
45+
# platforms :jruby do
46+
# gem 'activerecord-jdbc-adapter', '~> 61.0'
47+
# gem 'activerecord-jdbcpostgresql-adapter', '~> 61.0'
48+
# gem 'activerecord-jdbcmysql-adapter', '~> 61.0'
49+
# end
50+
# end

gemfiles/rails_7_0.gemfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ platforms :ruby do
99
end
1010

1111
platforms :jruby do
12-
gem "activerecord-jdbc-adapter", "~> 70.1"
13-
gem "activerecord-jdbcpostgresql-adapter", "~> 70.1"
14-
gem "activerecord-jdbcmysql-adapter", "~> 70.1"
12+
gem "activerecord-jdbc-adapter", "~> 70.0"
13+
gem "activerecord-jdbcpostgresql-adapter", "~> 70.0"
14+
gem "activerecord-jdbcmysql-adapter", "~> 70.0"
1515
end
1616

1717
gemspec path: "../"

gemfiles/rails_7_1.gemfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ platforms :ruby do
99
end
1010

1111
platforms :jruby do
12-
gem "activerecord-jdbc-adapter", "~> 61.0"
13-
gem "activerecord-jdbcpostgresql-adapter", "~> 61.0"
14-
gem "activerecord-jdbcmysql-adapter", "~> 61.0"
12+
gem "activerecord-jdbc-adapter", "~> 71.0"
13+
gem "activerecord-jdbcpostgresql-adapter", "~> 71.0"
14+
gem "activerecord-jdbcmysql-adapter", "~> 71.0"
1515
end
1616

1717
gemspec path: "../"

gemfiles/rails_master.gemfile

-17
This file was deleted.

lib/apartment/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
22

33
module Apartment
4-
VERSION = '3.0.1'
4+
VERSION = '3.0.2'
55
end

ros-apartment.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@ Gem::Specification.new do |s|
5757
else
5858
s.add_development_dependency 'mysql2', '~> 0.5'
5959
s.add_development_dependency 'pg', '~> 1.5'
60-
s.add_development_dependency 'sqlite3', '~> 2.0.2'
60+
s.add_development_dependency 'sqlite3', '< 2.0'
6161
end
6262
end

spec/config/database.yml.sample

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@ connections:
4545

4646
sqlite:
4747
adapter: sqlite3
48-
database: <%= File.expand_path('../spec/dummy/db', __FILE__) %>/default.sqlite3
48+
database: <%= File.expand_path('../spec/dummy/db', __FILE__) %>/test.sqlite3
4949
<% end %>

0 commit comments

Comments
 (0)