Skip to content

Commit

Permalink
Merge pull request #34 from yahonda/support_rails_700
Browse files Browse the repository at this point in the history 
Support Rails 7.0.0
  • Loading branch information
@hooopo
hooopo authored Dec 23, 2021
2 parents deca938 + 5b455b8 commit 7bc2b3d
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 80 deletions.
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ gem 'pry'

gem 'rubocop', '~> 1.18'

gem 'rails', git: 'https://github.com/pingcap/rails.git', branch: 'main'
gem 'rails', git: 'https://github.com/pingcap/rails.git', branch: '7-0-stable'

gem 'byebug', '~> 11.1'

Expand Down
150 changes: 72 additions & 78 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,94 +1,94 @@
GIT
remote: https://github.com/pingcap/rails.git
revision: 176d31adedef4128a0bd90c909eb904d95694ef9
branch: main
revision: 3438e76abf6134b44f5d5fab2c4868e5f11eec29
branch: 7-0-stable
specs:
actioncable (7.0.0.alpha)
actionpack (= 7.0.0.alpha)
activesupport (= 7.0.0.alpha)
actioncable (7.0.0)
actionpack (= 7.0.0)
activesupport (= 7.0.0)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (7.0.0.alpha)
actionpack (= 7.0.0.alpha)
activejob (= 7.0.0.alpha)
activerecord (= 7.0.0.alpha)
activestorage (= 7.0.0.alpha)
activesupport (= 7.0.0.alpha)
actionmailbox (7.0.0)
actionpack (= 7.0.0)
activejob (= 7.0.0)
activerecord (= 7.0.0)
activestorage (= 7.0.0)
activesupport (= 7.0.0)
mail (>= 2.7.1)
actionmailer (7.0.0.alpha)
actionpack (= 7.0.0.alpha)
actionview (= 7.0.0.alpha)
activejob (= 7.0.0.alpha)
activesupport (= 7.0.0.alpha)
actionmailer (7.0.0)
actionpack (= 7.0.0)
actionview (= 7.0.0)
activejob (= 7.0.0)
activesupport (= 7.0.0)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (7.0.0.alpha)
actionview (= 7.0.0.alpha)
activesupport (= 7.0.0.alpha)
actionpack (7.0.0)
actionview (= 7.0.0)
activesupport (= 7.0.0)
rack (~> 2.0, >= 2.2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.0.alpha)
actionpack (= 7.0.0.alpha)
activerecord (= 7.0.0.alpha)
activestorage (= 7.0.0.alpha)
activesupport (= 7.0.0.alpha)
actiontext (7.0.0)
actionpack (= 7.0.0)
activerecord (= 7.0.0)
activestorage (= 7.0.0)
activesupport (= 7.0.0)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.0.alpha)
activesupport (= 7.0.0.alpha)
actionview (7.0.0)
activesupport (= 7.0.0)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (7.0.0.alpha)
activesupport (= 7.0.0.alpha)
activejob (7.0.0)
activesupport (= 7.0.0)
globalid (>= 0.3.6)
activemodel (7.0.0.alpha)
activesupport (= 7.0.0.alpha)
activerecord (7.0.0.alpha)
activemodel (= 7.0.0.alpha)
activesupport (= 7.0.0.alpha)
activestorage (7.0.0.alpha)
actionpack (= 7.0.0.alpha)
activejob (= 7.0.0.alpha)
activerecord (= 7.0.0.alpha)
activesupport (= 7.0.0.alpha)
marcel (~> 1.0.0)
activemodel (7.0.0)
activesupport (= 7.0.0)
activerecord (7.0.0)
activemodel (= 7.0.0)
activesupport (= 7.0.0)
activestorage (7.0.0)
actionpack (= 7.0.0)
activejob (= 7.0.0)
activerecord (= 7.0.0)
activesupport (= 7.0.0)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.0.alpha)
activesupport (7.0.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.5.0.beta)
rails (7.0.0.alpha)
actioncable (= 7.0.0.alpha)
actionmailbox (= 7.0.0.alpha)
actionmailer (= 7.0.0.alpha)
actionpack (= 7.0.0.alpha)
actiontext (= 7.0.0.alpha)
actionview (= 7.0.0.alpha)
activejob (= 7.0.0.alpha)
activemodel (= 7.0.0.alpha)
activerecord (= 7.0.0.alpha)
activestorage (= 7.0.0.alpha)
activesupport (= 7.0.0.alpha)
rails (7.0.0)
actioncable (= 7.0.0)
actionmailbox (= 7.0.0)
actionmailer (= 7.0.0)
actionpack (= 7.0.0)
actiontext (= 7.0.0)
actionview (= 7.0.0)
activejob (= 7.0.0)
activemodel (= 7.0.0)
activerecord (= 7.0.0)
activestorage (= 7.0.0)
activesupport (= 7.0.0)
bundler (>= 1.15.0)
railties (= 7.0.0.alpha)
sprockets-rails (>= 2.0.0)
railties (7.0.0.alpha)
actionpack (= 7.0.0.alpha)
activesupport (= 7.0.0.alpha)
railties (= 7.0.0)
railties (7.0.0)
actionpack (= 7.0.0)
activesupport (= 7.0.0)
method_source
rake (>= 0.13)
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)

PATH
remote: .
specs:
activerecord-tidb-adapter (7.0.0)
activerecord (~> 7.0.0.alpha)
activerecord (~> 7.0.0)
mysql2

GEM
Expand All @@ -102,26 +102,26 @@ GEM
concurrent-ruby (1.1.9)
crass (1.0.6)
erubi (1.10.0)
globalid (0.5.2)
globalid (1.0.0)
activesupport (>= 5.0)
i18n (1.8.10)
i18n (1.8.11)
concurrent-ruby (~> 1.0)
loofah (2.12.0)
loofah (2.13.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (1.0.1)
marcel (1.0.2)
method_source (1.0.0)
mini_mime (1.1.0)
mini_mime (1.1.2)
minitest (5.14.4)
minitest-excludes (2.0.1)
minitest (~> 5.0)
mysql2 (0.5.3)
nio4r (2.5.8)
nokogiri (1.12.3-x86_64-darwin)
nokogiri (1.12.5-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.12.3-x86_64-linux)
nokogiri (1.12.5-x86_64-linux)
racc (~> 1.4)
parallel (1.20.1)
parser (3.0.2.0)
Expand All @@ -130,14 +130,14 @@ GEM
pry (0.14.1)
coderay (~> 1.1)
method_source (~> 1.0)
racc (1.5.2)
racc (1.6.0)
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.4.1)
rails-html-sanitizer (1.4.2)
loofah (~> 2.3)
rainbow (3.0.0)
rake (13.0.6)
Expand All @@ -155,13 +155,6 @@ GEM
rubocop-ast (1.10.0)
parser (>= 3.0.1.1)
ruby-progressbar (1.11.0)
sprockets (4.0.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.2)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.4.2)
thor (1.1.0)
tzinfo (2.0.4)
Expand All @@ -170,11 +163,12 @@ GEM
websocket-driver (0.7.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
zeitwerk (2.5.0.beta2)
zeitwerk (2.5.1)

PLATFORMS
x86_64-darwin-18
x86_64-darwin-20
x86_64-darwin-21
x86_64-linux

DEPENDENCIES
Expand All @@ -191,4 +185,4 @@ DEPENDENCIES
sqlite3 (~> 1.4)

BUNDLED WITH
2.2.25
2.2.32
2 changes: 1 addition & 1 deletion activerecord-tidb-adapter.gemspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
spec.require_paths = ['lib']

spec.add_dependency 'activerecord', '~> 7.0.0.alpha'
spec.add_dependency 'activerecord', '~> 7.0.0'
spec.add_dependency 'mysql2'

# Uncomment to register a new dependency of your gem
Expand Down

0 comments on commit 7bc2b3d

Please sign in to comment.