diff --git a/Gemfile b/Gemfile index 48640eba..13023d87 100644 --- a/Gemfile +++ b/Gemfile @@ -2,17 +2,23 @@ source "https://rubygems.org" gemspec -gem "rails", "~> 4.2.6" -gem "omniauth" +gem "rails", "~> 5.0.0" +gem "omniauth", "~> 1.3" +gem "oauth2" gem "omniauth-oauth2" gem "rdoc" +gem "activemodel-serializers-xml", github: "rails/activemodel-serializers-xml" + +gem "rails-controller-testing" + +gem "responders", "~> 2.1" + group :test do gem "omniauth-facebook" gem "omniauth-openid" gem "webrat", "0.7.3", require: false gem "mocha", "~> 1.1", require: false - gem 'test_after_commit', require: false end platforms :jruby do @@ -25,6 +31,7 @@ platforms :ruby do gem "sqlite3" end -group :mongoid do - gem "mongoid", "~> 5.0" -end +# TODO: +# group :mongoid do +# gem "mongoid", "~> 4.0.0" +# end diff --git a/Gemfile.lock b/Gemfile.lock index 6eb71c17..1afecdef 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,13 @@ +GIT + remote: git://github.com/rails/activemodel-serializers-xml.git + revision: 570ee7ed33d60e44ca1f3ccbec3d1fbf61d52cbf + specs: + activemodel-serializers-xml (1.0.1) + activemodel (> 5.x) + activerecord (> 5.x) + activesupport (> 5.x) + builder (~> 3.1) + PATH remote: . specs: @@ -11,44 +21,45 @@ PATH GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) + actioncable (5.0.0) + actionpack (= 5.0.0) + nio4r (~> 1.2) + websocket-driver (~> 0.6.1) + actionmailer (5.0.0) + actionpack (= 5.0.0) + actionview (= 5.0.0) + activejob (= 5.0.0) mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.6) - actionview (= 4.2.6) - activesupport (= 4.2.6) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) + actionpack (5.0.0) + actionview (= 5.0.0) + activesupport (= 5.0.0) + rack (~> 2.0) + rack-test (~> 0.6.3) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.6) - activesupport (= 4.2.6) + actionview (5.0.0) + activesupport (= 5.0.0) builder (~> 3.1) erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.6) - activesupport (= 4.2.6) - globalid (>= 0.3.0) - activemodel (4.2.6) - activesupport (= 4.2.6) - builder (~> 3.1) - activerecord (4.2.6) - activemodel (= 4.2.6) - activesupport (= 4.2.6) - arel (~> 6.0) - activesupport (4.2.6) + activejob (5.0.0) + activesupport (= 5.0.0) + globalid (>= 0.3.6) + activemodel (5.0.0) + activesupport (= 5.0.0) + activerecord (5.0.0) + activemodel (= 5.0.0) + activesupport (= 5.0.0) + arel (~> 7.0) + activesupport (5.0.0) + concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - arel (6.0.3) + arel (7.0.0) bcrypt (3.1.11) - bson (4.1.1) builder (3.2.2) concurrent-ruby (1.0.2) erubis (2.7.0) @@ -59,12 +70,13 @@ GEM hashie (3.4.4) i18n (0.7.0) json (1.8.3) - jwt (1.5.1) + jwt (1.5.4) loofah (2.0.3) nokogiri (>= 1.5.9) mail (2.6.4) mime-types (>= 1.16, < 4) metaclass (0.0.4) + method_source (0.8.2) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) @@ -72,22 +84,16 @@ GEM minitest (5.9.0) mocha (1.1.0) metaclass (~> 0.0.1) - mongo (2.2.5) - bson (~> 4.0) - mongoid (5.1.3) - activemodel (~> 4.0) - mongo (~> 2.1) - origin (~> 2.2) - tzinfo (>= 0.3.37) multi_json (1.12.1) multi_xml (0.5.5) multipart-post (2.0.0) + nio4r (1.2.1) nokogiri (1.6.8) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) - oauth2 (1.1.0) + oauth2 (1.2.0) faraday (>= 0.8, < 0.10) - jwt (~> 1.0, < 1.5.2) + jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) @@ -102,37 +108,39 @@ GEM omniauth-openid (1.0.1) omniauth (~> 1.0) rack-openid (~> 1.3.1) - origin (2.2.0) orm_adapter (0.5.0) pkg-config (1.1.7) - rack (1.6.4) + rack (2.0.1) rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.6) - actionmailer (= 4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) - activemodel (= 4.2.6) - activerecord (= 4.2.6) - activesupport (= 4.2.6) + rails (5.0.0) + actioncable (= 5.0.0) + actionmailer (= 5.0.0) + actionpack (= 5.0.0) + actionview (= 5.0.0) + activejob (= 5.0.0) + activemodel (= 5.0.0) + activerecord (= 5.0.0) + activesupport (= 5.0.0) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.6) - sprockets-rails - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) + railties (= 5.0.0) + sprockets-rails (>= 2.0.0) + rails-controller-testing (0.1.1) + actionpack (~> 5.x) + actionview (~> 5.x) + activesupport (~> 5.x) + rails-dom-testing (2.0.1) + activesupport (>= 4.2.0, < 6.0) nokogiri (~> 1.6.0) - rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (4.2.6) - actionpack (= 4.2.6) - activesupport (= 4.2.6) + railties (5.0.0) + actionpack (= 5.0.0) + activesupport (= 5.0.0) + method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (11.2.2) @@ -144,13 +152,11 @@ GEM sprockets (3.6.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.0.4) + sprockets-rails (3.1.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.11) - test_after_commit (1.1.0) - activerecord (>= 3.2) thor (0.19.1) thread_safe (0.3.5) tzinfo (1.2.2) @@ -161,25 +167,30 @@ GEM nokogiri (>= 1.2.0) rack (>= 1.0) rack-test (>= 0.5.3) + websocket-driver (0.6.4) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) PLATFORMS ruby DEPENDENCIES + activemodel-serializers-xml! activerecord-jdbc-adapter activerecord-jdbcsqlite3-adapter devise! jruby-openssl mocha (~> 1.1) - mongoid (~> 5.0) - omniauth + oauth2 + omniauth (~> 1.3) omniauth-facebook omniauth-oauth2 omniauth-openid - rails (~> 4.2.6) + rails (~> 5.0.0) + rails-controller-testing rdoc + responders (~> 2.1) sqlite3 - test_after_commit webrat (= 0.7.3) BUNDLED WITH diff --git a/gemfiles/Gemfile.rails-4.1-stable.lock b/gemfiles/Gemfile.rails-4.1-stable.lock index 4ac364f2..44d3f116 100644 --- a/gemfiles/Gemfile.rails-4.1-stable.lock +++ b/gemfiles/Gemfile.rails-4.1-stable.lock @@ -1,36 +1,12 @@ GIT remote: git://github.com/rails/rails.git - revision: 41b4d81b4fd14cbf43060c223bea0f461256d099 + revision: 9f5cbe613c8a80282970c73b0f00095788d54e34 branch: 4-1-stable specs: actionmailer (4.1.15) actionpack (= 4.1.15) actionview (= 4.1.15) mail (~> 2.5, >= 2.5.4) - rails (4.1.15) - actionmailer (= 4.1.15) - actionpack (= 4.1.15) - actionview (= 4.1.15) - activemodel (= 4.1.15) - activerecord (= 4.1.15) - activesupport (= 4.1.15) - bundler (>= 1.3.0, < 2.0) - railties (= 4.1.15) - sprockets-rails (~> 2.0) - -PATH - remote: .. - specs: - devise (4.1.0) - bcrypt (~> 3.0) - orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.1) - responders - warden (~> 1.2.3) - -GEM - remote: https://rubygems.org/ - specs: actionpack (4.1.15) actionview (= 4.1.15) activesupport (= 4.1.15) @@ -53,6 +29,35 @@ GEM minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) + rails (4.1.15) + actionmailer (= 4.1.15) + actionpack (= 4.1.15) + actionview (= 4.1.15) + activemodel (= 4.1.15) + activerecord (= 4.1.15) + activesupport (= 4.1.15) + bundler (>= 1.3.0, < 2.0) + railties (= 4.1.15) + sprockets-rails (~> 2.0) + railties (4.1.15) + actionpack (= 4.1.15) + activesupport (= 4.1.15) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + +PATH + remote: .. + specs: + devise (4.1.0) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 4.1.0, < 5.1) + responders + warden (~> 1.2.3) + +GEM + remote: https://rubygems.org/ + specs: arel (5.0.1.20140414130214) bcrypt (3.1.11) bson (3.2.6) @@ -65,7 +70,7 @@ GEM hashie (3.4.4) i18n (0.7.0) json (1.8.3) - jwt (1.5.1) + jwt (1.5.4) mail (2.6.4) mime-types (>= 1.16, < 4) metaclass (0.0.4) @@ -91,9 +96,9 @@ GEM nokogiri (1.6.8) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) - oauth2 (1.1.0) + oauth2 (1.2.0) faraday (>= 0.8, < 0.10) - jwt (~> 1.0, < 1.5.2) + jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) @@ -118,11 +123,6 @@ GEM ruby-openid (>= 2.1.8) rack-test (0.6.3) rack (>= 1.0) - railties (4.1.15) - actionpack (= 4.1.15) - activesupport (= 4.1.15) - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) rake (11.2.2) rdoc (4.2.2) json (~> 1.4) diff --git a/gemfiles/Gemfile.rails-4.2-stable.lock b/gemfiles/Gemfile.rails-4.2-stable.lock index 23f8d06c..07faad26 100644 --- a/gemfiles/Gemfile.rails-4.2-stable.lock +++ b/gemfiles/Gemfile.rails-4.2-stable.lock @@ -1,57 +1,57 @@ GIT remote: git://github.com/rails/rails.git - revision: 2c07f591c78a9915557a041f093cf79670423dd8 + revision: 5a85938418285ab81e3db52ea102d19f95ed7a94 branch: 4-2-stable specs: - actionmailer (4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) + actionmailer (4.2.7.rc1) + actionpack (= 4.2.7.rc1) + actionview (= 4.2.7.rc1) + activejob (= 4.2.7.rc1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.6) - actionview (= 4.2.6) - activesupport (= 4.2.6) + actionpack (4.2.7.rc1) + actionview (= 4.2.7.rc1) + activesupport (= 4.2.7.rc1) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.6) - activesupport (= 4.2.6) + actionview (4.2.7.rc1) + activesupport (= 4.2.7.rc1) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.6) - activesupport (= 4.2.6) + activejob (4.2.7.rc1) + activesupport (= 4.2.7.rc1) globalid (>= 0.3.0) - activemodel (4.2.6) - activesupport (= 4.2.6) + activemodel (4.2.7.rc1) + activesupport (= 4.2.7.rc1) builder (~> 3.1) - activerecord (4.2.6) - activemodel (= 4.2.6) - activesupport (= 4.2.6) + activerecord (4.2.7.rc1) + activemodel (= 4.2.7.rc1) + activesupport (= 4.2.7.rc1) arel (~> 6.0) - activesupport (4.2.6) + activesupport (4.2.7.rc1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - rails (4.2.6) - actionmailer (= 4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) - activemodel (= 4.2.6) - activerecord (= 4.2.6) - activesupport (= 4.2.6) + rails (4.2.7.rc1) + actionmailer (= 4.2.7.rc1) + actionpack (= 4.2.7.rc1) + actionview (= 4.2.7.rc1) + activejob (= 4.2.7.rc1) + activemodel (= 4.2.7.rc1) + activerecord (= 4.2.7.rc1) + activesupport (= 4.2.7.rc1) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.6) + railties (= 4.2.7.rc1) sprockets-rails - railties (4.2.6) - actionpack (= 4.2.6) - activesupport (= 4.2.6) + railties (4.2.7.rc1) + actionpack (= 4.2.7.rc1) + activesupport (= 4.2.7.rc1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -82,7 +82,7 @@ GEM hashie (3.4.4) i18n (0.7.0) json (1.8.3) - jwt (1.5.1) + jwt (1.5.4) loofah (2.0.3) nokogiri (>= 1.5.9) mail (2.6.4) @@ -110,9 +110,9 @@ GEM nokogiri (1.6.8) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) - oauth2 (1.1.0) + oauth2 (1.2.0) faraday (>= 0.8, < 0.10) - jwt (~> 1.0, < 1.5.2) + jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) @@ -154,7 +154,7 @@ GEM sprockets (3.6.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.0.4) + sprockets-rails (3.1.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) diff --git a/gemfiles/Gemfile.rails-5.0 b/gemfiles/Gemfile.rails-5.0 deleted file mode 100644 index 09cad40a..00000000 --- a/gemfiles/Gemfile.rails-5.0 +++ /dev/null @@ -1,37 +0,0 @@ -source "https://rubygems.org" - -gemspec path: ".." - -gem "rails", "5.0.0.rc2" -gem "omniauth", "~> 1.3" -gem "oauth2" -gem "omniauth-oauth2" -gem "rdoc" - -gem "activemodel-serializers-xml", github: "rails/activemodel-serializers-xml" - -gem "rails-controller-testing" - -gem "responders", "~> 2.1" - -group :test do - gem "omniauth-facebook" - gem "omniauth-openid" - gem "webrat", "0.7.3", require: false - gem "mocha", "~> 1.1", require: false -end - -platforms :jruby do - gem "activerecord-jdbc-adapter" - gem "activerecord-jdbcsqlite3-adapter" - gem "jruby-openssl" -end - -platforms :ruby do - gem "sqlite3" -end - -# TODO: -# group :mongoid do -# gem "mongoid", "~> 4.0.0" -# end diff --git a/gemfiles/Gemfile.rails-5.0.lock b/gemfiles/Gemfile.rails-5.0.lock deleted file mode 100644 index 23a34681..00000000 --- a/gemfiles/Gemfile.rails-5.0.lock +++ /dev/null @@ -1,201 +0,0 @@ -GIT - remote: git://github.com/rails/activemodel-serializers-xml.git - revision: 570ee7ed33d60e44ca1f3ccbec3d1fbf61d52cbf - specs: - activemodel-serializers-xml (1.0.1) - activemodel (> 5.x) - activerecord (> 5.x) - activesupport (> 5.x) - builder (~> 3.1) - -PATH - remote: .. - specs: - devise (4.1.0) - bcrypt (~> 3.0) - orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.1) - responders - warden (~> 1.2.3) - -GEM - remote: https://rubygems.org/ - specs: - actioncable (5.0.0.rc2) - actionpack (= 5.0.0.rc2) - nio4r (~> 1.2) - websocket-driver (~> 0.6.1) - actionmailer (5.0.0.rc2) - actionpack (= 5.0.0.rc2) - actionview (= 5.0.0.rc2) - activejob (= 5.0.0.rc2) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (5.0.0.rc2) - actionview (= 5.0.0.rc2) - activesupport (= 5.0.0.rc2) - rack (~> 2.x) - rack-test (~> 0.6.3) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.0.rc2) - activesupport (= 5.0.0.rc2) - builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (5.0.0.rc2) - activesupport (= 5.0.0.rc2) - globalid (>= 0.3.6) - activemodel (5.0.0.rc2) - activesupport (= 5.0.0.rc2) - activerecord (5.0.0.rc2) - activemodel (= 5.0.0.rc2) - activesupport (= 5.0.0.rc2) - arel (~> 7.0) - activesupport (5.0.0.rc2) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) - minitest (~> 5.1) - tzinfo (~> 1.1) - arel (7.0.0) - bcrypt (3.1.11) - builder (3.2.2) - concurrent-ruby (1.0.2) - erubis (2.7.0) - faraday (0.9.2) - multipart-post (>= 1.2, < 3) - globalid (0.3.6) - activesupport (>= 4.1.0) - hashie (3.4.4) - i18n (0.7.0) - json (1.8.3) - jwt (1.5.1) - loofah (2.0.3) - nokogiri (>= 1.5.9) - mail (2.6.4) - mime-types (>= 1.16, < 4) - metaclass (0.0.4) - method_source (0.8.2) - mime-types (3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_portile2 (2.1.0) - minitest (5.9.0) - mocha (1.1.0) - metaclass (~> 0.0.1) - multi_json (1.12.1) - multi_xml (0.5.5) - multipart-post (2.0.0) - nio4r (1.2.1) - nokogiri (1.6.8) - mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) - oauth2 (1.1.0) - faraday (>= 0.8, < 0.10) - jwt (~> 1.0, < 1.5.2) - multi_json (~> 1.3) - multi_xml (~> 0.5) - rack (>= 1.2, < 3) - omniauth (1.3.1) - hashie (>= 1.2, < 4) - rack (>= 1.0, < 3) - omniauth-facebook (3.0.0) - omniauth-oauth2 (~> 1.2) - omniauth-oauth2 (1.4.0) - oauth2 (~> 1.0) - omniauth (~> 1.2) - omniauth-openid (1.0.1) - omniauth (~> 1.0) - rack-openid (~> 1.3.1) - orm_adapter (0.5.0) - pkg-config (1.1.7) - rack (2.0.0.rc1) - json - rack-openid (1.3.1) - rack (>= 1.1.0) - ruby-openid (>= 2.1.8) - rack-test (0.6.3) - rack (>= 1.0) - rails (5.0.0.rc2) - actioncable (= 5.0.0.rc2) - actionmailer (= 5.0.0.rc2) - actionpack (= 5.0.0.rc2) - actionview (= 5.0.0.rc2) - activejob (= 5.0.0.rc2) - activemodel (= 5.0.0.rc2) - activerecord (= 5.0.0.rc2) - activesupport (= 5.0.0.rc2) - bundler (>= 1.3.0, < 2.0) - railties (= 5.0.0.rc2) - sprockets-rails (>= 2.0.0) - rails-controller-testing (0.1.1) - actionpack (~> 5.x) - actionview (~> 5.x) - activesupport (~> 5.x) - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) - rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (5.0.0.rc2) - actionpack (= 5.0.0.rc2) - activesupport (= 5.0.0.rc2) - method_source - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rake (11.2.2) - rdoc (4.2.2) - json (~> 1.4) - responders (2.2.0) - railties (>= 4.2.0, < 5.1) - ruby-openid (2.7.0) - sprockets (3.6.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.0.4) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - sqlite3 (1.3.11) - thor (0.19.1) - thread_safe (0.3.5) - tzinfo (1.2.2) - thread_safe (~> 0.1) - warden (1.2.6) - rack (>= 1.0) - webrat (0.7.3) - nokogiri (>= 1.2.0) - rack (>= 1.0) - rack-test (>= 0.5.3) - websocket-driver (0.6.4) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) - -PLATFORMS - ruby - -DEPENDENCIES - activemodel-serializers-xml! - activerecord-jdbc-adapter - activerecord-jdbcsqlite3-adapter - devise! - jruby-openssl - mocha (~> 1.1) - oauth2 - omniauth (~> 1.3) - omniauth-facebook - omniauth-oauth2 - omniauth-openid - rails (= 5.0.0.rc2) - rails-controller-testing - rdoc - responders (~> 2.1) - sqlite3 - webrat (= 0.7.3) - -BUNDLED WITH - 1.12.5