From 031795508216a66a3e3c19fdba06bdd215533eb6 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 24 Jun 2017 15:17:18 +0000 Subject: [PATCH] updates --- Gemfile.lock | 469 ++++++++++++++++++++++++++------------------------- 1 file changed, 241 insertions(+), 228 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e366c1da5..e35cb7304 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,21 +1,21 @@ -GIu +GIT remote: git://github.com/activeadmin/activeadmin.git - revision: 1b5c9259c4cfe183039498e0e1eb2c6c146d2273 + revision: 575bc8eeefa9c50a85899058f5d5e42ff461f747 specs: - activeadmin (1.0.0.pre2) - arbre (~> 1.0, >= 1.0.2) + activeadmin (1.0.0) + arbre (>= 1.1.1) bourbon coffee-rails formtastic (~> 3.1) formtastic_i18n - inherited_resources (~> 1.6) + inherited_resources (~> 1.7) jquery-rails jquery-ui-rails - kaminari (~> 0.15) - rails (>= 3.2, < 5.0) + kaminari (>= 0.15, < 2.0) + railties (>= 4.2, < 5.2) ransack (~> 1.3) sass-rails - sprockets (< 4) + sprockets (< 4.1) GIT remote: https://github.com/DuratarskeyK/kiqit.git @@ -46,43 +46,37 @@ GEM activesupport (= 4.2.8) builder (~> 3.1) erubis (~> 2.7.0) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - + rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.3) - - - activejob (4.2.8) activesupport (= 4.2.8) - globalid (>= 0.3.6) + globalid (>= 0.3.0) activemodel (4.2.8) activesupport (= 4.2.8) builder (~> 3.1) activerecord (4.2.8) activemodel (= 4.2.8) activesupport (= 4.2.8) - arel (~> 8.0) + arel (~> 6.0) activesupport (4.2.8) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) - concurrent-ruby (~> 1.0, >= 1.0.2) tzinfo (~> 1.1) addressable (2.5.1) - airbrake (5.3.0) - airbrake-ruby (~> 1.3) - airbrake-ruby (1.3.2) + public_suffix (~> 2.0, >= 2.0.2) + airbrake (6.1.2) + airbrake-ruby (~> 2.2, >= 2.2.5) + airbrake-ruby (2.2.7) angular-i18n (0.1.2) - angular-rails-templates (1.0.0) + angular-rails-templates (1.0.2) railties (>= 4.2, < 6) - sprockets (~> 3.0) + sprockets (>= 3.0, < 5) tilt - arbre (1.0.3) + arbre (1.1.1) activesupport (>= 3.0.0) - arel (6.0.3) - attr_encrypted (3.0.1) + arel (6.0.4) + attr_encrypted (3.0.3) encryptor (~> 3.0.0) bcrypt (3.1.11) better_errors (2.1.1) @@ -91,24 +85,23 @@ GEM rack (>= 0.9.0) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bourbon (4.2.7) + bourbon (4.3.4) sass (~> 3.4) thor (~> 0.19) - builder (3.2.2) + builder (3.2.3) callsite (0.0.11) - chunky_png (1.3.5) - climate_control (0.0.3) - activesupport (>= 3.0) + chunky_png (1.3.8) + climate_control (0.2.0) cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) coderay (1.1.1) - coffee-rails (4.1.1) + coffee-rails (4.2.2) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.1.x) + railties (>= 4.0.0) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.10.0) + coffee-script-source (1.12.2) compass (1.0.3) chunky_png (~> 1.2) compass-core (~> 1.0.2) @@ -129,101 +122,109 @@ GEM connection_pool (2.2.1) crack (0.4.3) safe_yaml (~> 1.0.0) - daemons (1.2.3) - debug_inspector (0.0.2) - devise (4.1.1) + daemons (1.2.4) + debug_inspector (0.0.3) + devise (4.3.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.1) + railties (>= 4.1.0, < 5.2) responders warden (~> 1.2.3) - diff-lcs (1.2.5) - domain_name (0.5.20160310) + diff-lcs (1.3) + domain_name (0.5.20170404) unf (>= 0.0.5, < 1.0.0) encryptor (3.0.0) erubis (2.7.0) - erubi (1.6.0) + et-orbi (1.0.5) + tzinfo eventmachine (1.0.9.1) execjs (2.7.0) - factory_girl (4.7.0) + factory_girl (4.8.0) activesupport (>= 3.0.0) - factory_girl_rails (4.7.0) - factory_girl (~> 4.7.0) + factory_girl_rails (4.8.0) + factory_girl (~> 4.8.0) railties (>= 3.0.0) - faraday (0.9.2) + faraday (0.12.1) multipart-post (>= 1.2, < 3) - faraday-http-cache (1.3.0) + faraday-http-cache (2.0.0) faraday (~> 0.8) - ffi (1.9.10) - formtastic (3.1.4) + ffi (1.9.18) + formtastic (3.1.5) actionpack (>= 3.2.13) formtastic_i18n (0.6.0) - friendly_id (5.1.0) + friendly_id (5.2.1) activerecord (>= 4.0.0) git-version-bump (0.15.1) - gli (2.14.0) - globalid (0.3.6) - activesupport (>= 4.1.0) - haml (4.0.7) + gli (2.16.0) + globalid (0.4.0) + activesupport (>= 4.2.0) + haml (5.0.1) + temple (>= 0.8.0) tilt - haml-rails (0.9.0) + haml-rails (1.0.0) actionpack (>= 4.0.1) activesupport (>= 4.0.1) - haml (>= 4.0.6, < 5.0) + haml (>= 4.0.6, < 6.0) html2haml (>= 1.0.1) railties (>= 4.0.1) - has_scope (0.6.0) - actionpack (>= 3.2, < 5) - activesupport (>= 3.2, < 5) - hashdiff (0.3.0) - hashie (3.4.2) + has_scope (0.7.1) + actionpack (>= 4.1, < 5.2) + activesupport (>= 4.1, < 5.2) + hashdiff (0.3.4) + hashie (3.5.5) hirb (0.7.3) - html2haml (2.0.0) + html2haml (2.2.0) erubis (~> 2.7.0) - haml (~> 4.0.0) - nokogiri (~> 1.6.0) + haml (>= 4.0, < 6) + nokogiri (>= 1.6.0) ruby_parser (~> 3.5) - http-cookie (1.0.2) + http-cookie (1.0.3) domain_name (~> 0.5) - i18n (0.7.0) - inherited_resources (1.6.0) - actionpack (>= 3.2, < 5) - has_scope (~> 0.6.0.rc) - railties (>= 3.2, < 5) + i18n (0.8.4) + inherited_resources (1.7.2) + actionpack (>= 3.2, < 5.2.x) + has_scope (~> 0.6) + railties (>= 3.2, < 5.2.x) responders - its-it (1.2.1) - jbuilder (2.5.0) - activesupport (>= 3.0.0, < 5.1) - multi_json (~> 1.2) - jquery-rails (4.1.1) + its-it (1.3.0) + jbuilder (2.7.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) + jquery-rails (4.3.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (5.0.5) + jquery-ui-rails (6.0.1) railties (>= 3.2.16) - js-routes (1.2.6) + js-routes (1.3.3) railties (>= 3.2) sprockets-rails - json (1.8.5) - jwt (1.5.0) - kaminari (0.17.0) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) + json (2.1.0) + jwt (1.5.6) + kaminari (1.0.1) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.0.1) + kaminari-activerecord (= 1.0.1) + kaminari-core (= 1.0.1) + kaminari-actionview (1.0.1) + actionview + kaminari-core (= 1.0.1) + kaminari-activerecord (1.0.1) + activerecord + kaminari-core (= 1.0.1) + kaminari-core (1.0.1) key_struct (0.4.2) - libv8 (3.16.14.15) - localeapp (1.0.2) + libv8 (3.16.14.19) + localeapp (2.1.1) gli - i18n + i18n (~> 0.4) json - rack rest-client - ya2yaml loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.6.4) + mail (2.6.6) mime-types (>= 1.16, < 4) - mailcatcher (0.6.4) - activesupport (~> 4.0) + mailcatcher (0.6.5) eventmachine (= 1.0.9.1) mail (~> 2.3) rack (~> 1.5) @@ -231,23 +232,24 @@ GEM skinny (~> 0.2.3) sqlite3 (~> 1.3) thin (~> 1.5.0) - meta-tags (2.1.0) - actionpack (>= 3.0.0) - meta_request (0.4.0) + meta-tags (2.4.1) + actionpack (>= 3.2.0, < 5.2) + meta_request (0.4.3) callsite (~> 0.0, >= 0.0.11) - rack-contrib (~> 1.1) - railties (>= 3.0.0, < 5.1.0) - mime-types (2.99.2) - mimemagic (0.3.0) - mini_portile2 (2.0.0) - minitest (5.9.0) - mock_redis (0.16.1) - modware (0.1.2) - its-it + rack-contrib (>= 1.1, < 3) + railties (>= 3.0.0, < 5.2.0) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mimemagic (0.3.2) + mini_portile2 (2.2.0) + minitest (5.10.2) + mock_redis (0.17.3) + modware (0.1.3) key_struct (~> 0.4) msgpack (1.1.0) multi_json (1.12.1) - multi_xml (0.5.5) + multi_xml (0.6.0) multipart-post (2.0.0) nest (1.1.2) redis @@ -256,53 +258,52 @@ GEM ngannotate-rails (1.2.2) execjs rails (>= 3.1) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) - oauth2 (1.0.0) - faraday (>= 0.8, < 0.10) + nokogiri (1.8.0) + mini_portile2 (~> 2.2.0) + oauth2 (1.4.0) + faraday (>= 0.8, < 0.13) jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) - rack (~> 1.2) + rack (>= 1.2, < 3) octokit (4.7.0) - sawyer (>= 0.5.3, ~> 0.8.0) + sawyer (~> 0.8.0, >= 0.5.3) ohm (1.3.2) nest (~> 1.0) redis scrivener (~> 0.0.3) ohm-expire (0.1.3.2) ohm (>= 0.1.5) - omniauth (1.2.2) - hashie (>= 1.2, < 4) - rack (~> 1.0) - omniauth-github (1.1.2) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.1) - omniauth-oauth2 (1.3.0) + omniauth (1.6.1) + hashie (>= 3.4.6, < 3.6.0) + rack (>= 1.6.2, < 3) + omniauth-github (1.3.0) + omniauth (~> 1.5) + omniauth-oauth2 (>= 1.4.0, < 2.0) + omniauth-oauth2 (1.4.0) oauth2 (~> 1.0) omniauth (~> 1.2) orm_adapter (0.5.0) - paperclip (4.3.6) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) + paperclip (5.1.0) + activemodel (>= 4.2.0) + activesupport (>= 4.2.0) cocaine (~> 0.5.5) mime-types - mimemagic (= 0.3.0) - pg (0.18.4) - polyamorous (1.3.0) + mimemagic (~> 0.3.0) + pg (0.21.0) + polyamorous (1.3.1) activerecord (>= 3.0) - posix-spawn (0.3.11) + public_suffix (2.0.5) puma (3.9.1) pundit (1.1.0) activesupport (>= 3.0.0) - pygments.rb (0.6.3) - posix-spawn (~> 0.3.6) - yajl-ruby (~> 1.2.0) - rack (1.6.4) + pygments.rb (1.1.2) + multi_json (>= 1.0.0) + rack (1.6.8) rack-contrib (1.4.0) git-version-bump (~> 0.15) rack (~> 1.4) - rack-mini-profiler (0.10.1) + rack-mini-profiler (0.10.5) rack (>= 1.2.0) rack-protection (1.5.3) rack @@ -326,9 +327,9 @@ GEM rails-assets-notifyjs (0.4.2) rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (2.0.3) + rails-dom-testing (1.0.8) activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) + nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) @@ -345,84 +346,86 @@ GEM activerecord (>= 3.0) activesupport (>= 3.0) i18n - polyamorous (~> 1.2) + polyamorous (~> 1.3) rb-fsevent (0.9.8) rb-inotify (0.9.10) - ffi (< 2, >= 0.5.0) + ffi (>= 0.5.0, < 2) rbtrace (0.4.8) ffi (>= 1.0.6) msgpack (>= 0.4.3) trollop (>= 1.16.2) - redis (3.3.0) - redis-actionpack (4.0.1) - actionpack (~> 4) - redis-rack (~> 1.5.0) - redis-store (~> 1.1.0) - redis-activesupport (4.1.5) - activesupport (>= 3, < 5) - redis-store (~> 1.1.0) - redis-rack (1.5.0) - rack (~> 1.5) - redis-store (~> 1.1.0) - redis-rails (4.0.0) - redis-actionpack (~> 4) - redis-activesupport (~> 4) - redis-store (~> 1.1.0) + redis (3.3.3) + redis-actionpack (5.0.1) + actionpack (>= 4.0, < 6) + redis-rack (>= 1, < 3) + redis-store (>= 1.1.0, < 1.4.0) + redis-activesupport (5.0.2) + activesupport (>= 3, < 6) + redis-store (~> 1.3.0) + redis-rack (2.0.2) + rack (>= 1.5, < 3) + redis-store (>= 1.2, < 1.4) + redis-rails (5.0.2) + redis-actionpack (>= 5.0, < 6) + redis-activesupport (>= 5.0, < 6) + redis-store (>= 1.2, < 2) redis-semaphore (0.3.1) redis - redis-store (1.1.7) + redis-store (1.3.0) redis (>= 2.2) ref (2.0.0) - responders (2.2.0) - railties (>= 4.2.0, < 5.1) - rest-client (1.8.0) + responders (2.4.0) + actionpack (>= 4.2.0, < 5.3) + railties (>= 4.2.0, < 5.3) + rest-client (2.0.2) http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 3.0) - netrc (~> 0.7) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) rr (1.2.0) - rspec-core (3.4.4) - rspec-support (~> 3.4.0) - rspec-expectations (3.4.0) + rspec-core (3.6.0) + rspec-support (~> 3.6.0) + rspec-expectations (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-mocks (3.4.1) + rspec-support (~> 3.6.0) + rspec-mocks (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-rails (3.4.2) - actionpack (>= 3.0, < 4.3) - activesupport (>= 3.0, < 4.3) - railties (>= 3.0, < 4.3) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) - rspec-support (~> 3.4.0) - rspec-support (3.4.1) - ruby-graphviz (1.2.2) + rspec-support (~> 3.6.0) + rspec-rails (3.6.0) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-support (~> 3.6.0) + rspec-support (3.6.0) + ruby-graphviz (1.2.3) ruby-haml-js (0.0.5) execjs sprockets (>= 2.0.0) - ruby_parser (3.8.2) + ruby_parser (3.9.0) sexp_processor (~> 4.1) - rufus-scheduler (3.1.10) + rufus-scheduler (3.4.2) + et-orbi (~> 1.0) russian (0.6.0) i18n (>= 0.5.0) safe_yaml (1.0.4) - sass (3.4.22) - sass-rails (5.0.4) - railties (>= 4.0.0, < 5.0) + sass (3.4.24) + sass-rails (5.0.6) + railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) sawyer (0.8.1) - addressable (< 2.6, >= 2.3.5) - faraday (< 1.0, ~> 0.8) - schema_auto_foreign_keys (0.1.0) + addressable (>= 2.3.5, < 2.6) + faraday (~> 0.8, < 1.0) + schema_auto_foreign_keys (0.1.3) + its-it (~> 1.2) schema_plus_foreign_keys (~> 0.1) schema_plus_indexes (~> 0.2) - schema_monkey (2.1.4) + schema_monkey (2.1.5) activerecord (>= 4.2) - its-it modware (~> 0.1) schema_plus (2.0.1) activerecord (~> 4.2) @@ -438,30 +441,42 @@ GEM schema_plus_pg_indexes (~> 0.1, >= 0.1.3) schema_plus_tables (~> 0.1) schema_plus_views (~> 0.1) - schema_plus_columns (0.1.0) - activerecord (~> 4.2) - schema_plus_indexes (~> 0.1) - schema_plus_core (1.0.0) + schema_plus_columns (0.1.3) + activerecord (>= 4.2, < 5.1) + its-it (~> 1.2) + schema_plus_core + schema_plus_indexes (~> 0.2) + schema_plus_compatibility (0.2.0) + activerecord (>= 4.2, < 5.1) + schema_monkey (~> 2.1) + schema_plus_core (1.0.2) activerecord (~> 4.2) + its-it (~> 1.2) schema_monkey (~> 2.1) schema_plus_db_default (0.1.1) activerecord (~> 4.2) schema_plus_core (~> 1.0) - schema_plus_default_expr (0.1.1) - activerecord (~> 4.2) - schema_plus_core (~> 1.0) - schema_plus_enums (0.1.2) - activerecord (~> 4.2) - schema_plus_core (~> 1.0) - schema_plus_foreign_keys (0.1.4) - activerecord (~> 4.2) - schema_plus_core (~> 1.0) + schema_plus_default_expr (0.1.4) + activerecord (>= 4.2, < 6.0) + its-it (~> 1.2) + schema_plus_core (>= 1.0, < 3.0) + schema_plus_enums (0.1.5) + activerecord (>= 4.2, < 5.1) + its-it (~> 1.2) + schema_plus_core + schema_plus_foreign_keys (0.1.7) + activerecord (>= 4.2, < 5.1) + its-it (~> 1.2) + schema_plus_compatibility (~> 0.2) + schema_plus_core valuable - schema_plus_indexes (0.2.1) - activerecord (~> 4.2) - schema_plus_core (~> 1.0) - schema_plus_pg_indexes (0.1.10) + schema_plus_indexes (0.2.4) + activerecord (>= 4.2, < 5.1) + its-it (~> 1.2) + schema_plus_core + schema_plus_pg_indexes (0.1.12) activerecord (~> 4.2) + its-it (~> 1.2) schema_plus_core (~> 1.0) schema_plus_indexes (~> 0.1, >= 0.1.3) schema_plus_tables (0.1.1) @@ -471,31 +486,31 @@ GEM activerecord (~> 4.2) schema_plus_core (~> 1.0) scrivener (0.0.3) - sexp_processor (4.7.0) - shotgun (0.9.1) + sexp_processor (4.9.0) + shotgun (0.9.2) rack (>= 1.0) shoulda (3.5.0) shoulda-context (~> 1.0, >= 1.0.1) shoulda-matchers (>= 1.4.1, < 3.0) - shoulda-context (1.2.1) + shoulda-context (1.2.2) shoulda-matchers (2.8.0) activesupport (>= 3.0.0) - sidekiq (4.1.2) + sidekiq (5.0.3) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) - redis (~> 3.2, >= 3.2.1) - sidekiq-failures (0.4.5) - sidekiq (>= 2.16.0) - sidekiq-scheduler (2.0.7) - multi_json (~> 1) + rack-protection (>= 1.5.0) + redis (~> 3.3, >= 3.3.3) + sidekiq-failures (1.0.0) + sidekiq (>= 4.0.0) + sidekiq-scheduler (2.1.6) redis (~> 3) - rufus-scheduler (~> 3.1.8) + rufus-scheduler (~> 3.2) sidekiq (>= 3) tilt (>= 1.4.0) simple_form (3.1.0.rc2) actionpack (~> 4.0) activemodel (~> 4.0) - sinatra (1.4.7) + sinatra (1.4.8) rack (~> 1.5) rack-protection (~> 1.4) tilt (>= 1.3, < 3) @@ -503,7 +518,7 @@ GEM eventmachine (~> 1.0.0) thin (>= 1.5, < 1.7) slim (3.0.8) - temple (< 0.9, >= 0.7.6) + temple (>= 0.7.6, < 0.9) tilt (>= 1.3.3, < 2.1) soundmanager-rails (1.0.1) sprockets (3.7.1) @@ -515,50 +530,48 @@ GEM sprockets (>= 3.0.0) sqlite3 (1.3.13) state_machines (0.5.0) - state_machines-activemodel (0.4.0) - activemodel (>= 4.1, < 5.1) - state_machines (>= 0.4.0) - state_machines-activerecord (0.4.0) - activerecord (>= 4.1, < 5.1) - state_machines-activemodel (>= 0.3.0) + state_machines-activemodel (0.5.0) + activemodel (>= 4.1, < 5.2) + state_machines (>= 0.5.0) + state_machines-activerecord (0.5.0) + activerecord (>= 4.1, < 5.2) + state_machines-activemodel (>= 0.5.0) state_machines-graphviz (0.0.2) ruby-graphviz state_machines temple (0.8.0) - test_after_commit (1.0.0) + test_after_commit (1.1.0) activerecord (>= 3.2) - therubyracer (0.12.2) - libv8 (~> 3.16.14.0) + therubyracer (0.12.3) + libv8 (~> 3.16.14.15) ref thin (1.5.1) daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.19.1) - thread_safe (0.3.5) - tilt (2.0.5) + thor (0.19.4) + thread_safe (0.3.6) + tilt (2.0.7) time_diff (0.3.0) activesupport i18n - timecop (0.8.1) + timecop (0.9.0) trollop (2.1.2) - tzinfo (1.2.2) + tzinfo (1.2.3) thread_safe (~> 0.1) - uglifier (3.0.0) + uglifier (3.2.0) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.7.2) + unf_ext (0.0.7.4) valuable (0.9.13) warden (1.2.7) rack (>= 1.0) webmock (3.0.1) - addressable (>= 2.5.1) + addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - will_paginate (3.1.0) - ya2yaml (0.31) - yajl-ruby (1.2.2) + will_paginate (3.1.6) PLATFORMS ruby @@ -638,4 +651,4 @@ DEPENDENCIES will_paginate BUNDLED WITH - 1.13.1 + 1.15.1