Skip to content

Commit

Permalink
Try to pull out sqlite/mysql
Browse files Browse the repository at this point in the history
  • Loading branch information
billdueber committed Jan 22, 2025
1 parent fc3c772 commit 4e5b701
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 13 deletions.
18 changes: 9 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -140,15 +140,15 @@ gem "standard"

# Databases

if defined? JRUBY_VERSION
gem "jdbc-sqlite3"
gem "jdbc-mysql"
else
gem "sqlite3", "~>1.3.13"
# AR won't work with the latest mysql2, apparently
# See https://stackoverflow.com/questions/49407254/gemloaderror-cant-activate-mysql2-0-5-0-3-18-already-activated-mysq
gem "mysql2", "< 0.5.0", require: false
end
# if defined? JRUBY_VERSION
# gem "jdbc-sqlite3"
# gem "jdbc-mysql"
# else
# gem "sqlite3", "~>1.3.13"
# # AR won't work with the latest mysql2, apparently
# # See https://stackoverflow.com/questions/49407254/gemloaderror-cant-activate-mysql2-0-5-0-3-18-already-activated-mysq
# gem "mysql2", "< 0.5.0", require: false
# end

# JS and CSS
gem "sass-rails", "~> 5.0"
Expand Down
4 changes: 0 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,6 @@ GEM
mini_mime (1.1.2)
minitest (5.18.0)
multi_json (1.15.0)
mysql2 (0.4.10)
nestive (0.6.0)
rails (>= 3.0.0)
net-imap (0.3.4)
Expand Down Expand Up @@ -385,7 +384,6 @@ GEM
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sqlite3 (1.3.13)
standard (1.25.3)
language_server-protocol (~> 3.17.0.2)
rubocop (~> 1.48.1)
Expand Down Expand Up @@ -466,7 +464,6 @@ DEPENDENCIES
loofah (>= 2.3.1)
mail_form (~> 1.7)
middle_english_dictionary!
mysql2 (< 0.5.0)
nestive (= 0.6.0)
nio4r (= 2.5.2)
nokogiri (>= 1.10.10)
Expand All @@ -493,7 +490,6 @@ DEPENDENCIES
simplecov
solr_cloud-connection (>= 0.6.0)
sprockets (~> 3.7.2)
sqlite3 (~> 1.3.13)
standard
traject
ttl_memoizeable
Expand Down

0 comments on commit 4e5b701

Please sign in to comment.