Skip to content

Commit

Permalink
Merge pull request #934 from DavyJonesLocker/chore/sqlite3
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
tagliala authored Apr 22, 2024
2 parents 3bf3ded + 541252f commit dbeb740
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ end

appraise 'rails-edge' do
gem 'rails', git: 'https://github.com/rails/rails.git', branch: 'main'
gem 'sqlite3'
end
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## main / unreleased

* [ENHANCEMENT] Test against Ruby 3.3
* [ENHANCEMENT] Update QUnit to 2.20.0
* [ENHANCEMENT] Update QUnit to 2.20.1

## 22.1.1 / 2023-10-08

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ gem 'shotgun'
gem 'simplecov'
gem 'simplecov-lcov'
gem 'sinatra'
gem 'sqlite3'
gem 'sqlite3', '~> 1.4' # Ref: rails/rails#51592
gem 'webrick'
2 changes: 1 addition & 1 deletion gemfiles/rails_6.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ gem "shotgun"
gem "simplecov"
gem "simplecov-lcov"
gem "sinatra"
gem "sqlite3"
gem "sqlite3", "~> 1.4"
gem "webrick"
gem "rails", "~> 6.1.0"

Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_7.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ gem "shotgun"
gem "simplecov"
gem "simplecov-lcov"
gem "sinatra"
gem "sqlite3"
gem "sqlite3", "~> 1.4"
gem "webrick"
gem "rails", "~> 7.0.0"

Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_7.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ gem "shotgun"
gem "simplecov"
gem "simplecov-lcov"
gem "sinatra"
gem "sqlite3"
gem "sqlite3", "~> 1.4"
gem "webrick"
gem "rails", "~> 7.1.0"

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"@rollup/plugin-babel": "^6.0.4",
"@rollup/plugin-node-resolve": "^15.2.2",
"chrome-launcher": "^1.1.1",
"puppeteer-core": "^22.6.2",
"rollup": "^4.14.0",
"puppeteer-core": "^22.6.5",
"rollup": "^4.16.1",
"rollup-plugin-copy": "^3.5.0",
"standard": "^17.1.0"
},
Expand Down
2 changes: 1 addition & 1 deletion test/javascript/server.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def call(env)
use AssetPath, urls: ['/vendor/assets/javascripts'], root: File.expand_path('../', $LOAD_PATH.find { |p| p.include?('jquery-rails') })

DEFAULT_JQUERY_VERSION = '3.7.1'
QUNIT_VERSION = '2.20.0'
QUNIT_VERSION = '2.20.1'

helpers do
def jquery_version
Expand Down

0 comments on commit dbeb740

Please sign in to comment.