Skip to content

Commit

Permalink
Update Appraisals and gem versions (#264)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
mnovelo authored May 24, 2024
1 parent 5b15dfb commit 7fc490a
Show file tree
Hide file tree
Showing 10 changed files with 33 additions and 49 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gem-publish.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Ruby Gem Publish
name: Publish to RubyGems
on:
push:
branches: [ 'main' ]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Ruby
name: RSpec
on:
push:
branches:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Ruby
name: Rubocop
on:
push:
branches:
Expand Down
41 changes: 21 additions & 20 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
appraise 'rails-6-1' do
gem 'rails', '~> 6.1.0'
platforms :ruby do
gem 'sqlite3', '~> 2.0'
gem 'sqlite3', '~> 1.4'
end
platforms :jruby do
gem 'activerecord-jdbc-adapter', '~> 61.0'
Expand All @@ -15,35 +15,36 @@ end
appraise 'rails-7-0' do
gem 'rails', '~> 7.0.0'
platforms :ruby do
gem 'sqlite3', '~> 2.0'
gem 'sqlite3', '~> 1.4'
end
platforms :jruby do
gem 'activerecord-jdbc-adapter', '~> 61.0'
gem 'activerecord-jdbcpostgresql-adapter', '~> 61.0'
gem 'activerecord-jdbcmysql-adapter', '~> 61.0'
gem 'activerecord-jdbc-adapter', '~> 70.0'
gem 'activerecord-jdbcpostgresql-adapter', '~> 70.0'
gem 'activerecord-jdbcmysql-adapter', '~> 70.0'
end
end

appraise 'rails-7-1' do
gem 'rails', '~> 7.1.0'
platforms :ruby do
gem 'sqlite3', '~> 2.0'
gem 'sqlite3', '~> 1.6'
end
platforms :jruby do
gem 'activerecord-jdbc-adapter', '~> 61.0'
gem 'activerecord-jdbcpostgresql-adapter', '~> 61.0'
gem 'activerecord-jdbcmysql-adapter', '~> 61.0'
gem 'activerecord-jdbc-adapter', '~> 71.0'
gem 'activerecord-jdbcpostgresql-adapter', '~> 71.0'
gem 'activerecord-jdbcmysql-adapter', '~> 71.0'
end
end

appraise 'rails-master' do
gem 'rails', git: 'https://github.com/rails/rails.git'
platforms :ruby do
gem 'sqlite3', '~> 2.0'
end
platforms :jruby do
gem 'activerecord-jdbc-adapter', '~> 61.0'
gem 'activerecord-jdbcpostgresql-adapter', '~> 61.0'
gem 'activerecord-jdbcmysql-adapter', '~> 61.0'
end
end
# Install Rails from the main branch are failing
# appraise 'rails-master' do
# gem 'rails', git: 'https://github.com/rails/rails.git'
# platforms :ruby do
# gem 'sqlite3', '~> 2.0'
# end
# platforms :jruby do
# gem 'activerecord-jdbc-adapter', '~> 61.0'
# gem 'activerecord-jdbcpostgresql-adapter', '~> 61.0'
# gem 'activerecord-jdbcmysql-adapter', '~> 61.0'
# end
# end
6 changes: 3 additions & 3 deletions gemfiles/rails_7_0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ platforms :ruby do
end

platforms :jruby do
gem "activerecord-jdbc-adapter", "~> 70.1"
gem "activerecord-jdbcpostgresql-adapter", "~> 70.1"
gem "activerecord-jdbcmysql-adapter", "~> 70.1"
gem "activerecord-jdbc-adapter", "~> 70.0"
gem "activerecord-jdbcpostgresql-adapter", "~> 70.0"
gem "activerecord-jdbcmysql-adapter", "~> 70.0"
end

gemspec path: "../"
6 changes: 3 additions & 3 deletions gemfiles/rails_7_1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ platforms :ruby do
end

platforms :jruby do
gem "activerecord-jdbc-adapter", "~> 61.0"
gem "activerecord-jdbcpostgresql-adapter", "~> 61.0"
gem "activerecord-jdbcmysql-adapter", "~> 61.0"
gem "activerecord-jdbc-adapter", "~> 71.0"
gem "activerecord-jdbcpostgresql-adapter", "~> 71.0"
gem "activerecord-jdbcmysql-adapter", "~> 71.0"
end

gemspec path: "../"
17 changes: 0 additions & 17 deletions gemfiles/rails_master.gemfile

This file was deleted.

2 changes: 1 addition & 1 deletion lib/apartment/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module Apartment
VERSION = '3.0.1'
VERSION = '3.0.2'
end
2 changes: 1 addition & 1 deletion ros-apartment.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,6 @@ Gem::Specification.new do |s|
else
s.add_development_dependency 'mysql2', '~> 0.5'
s.add_development_dependency 'pg', '~> 1.5'
s.add_development_dependency 'sqlite3', '~> 2.0.2'
s.add_development_dependency 'sqlite3', '< 2.0'
end
end
2 changes: 1 addition & 1 deletion spec/config/database.yml.sample
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ connections:

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

0 comments on commit 7fc490a

Please sign in to comment.