# HG changeset patch # User nanaya # Date 1502441750 -32400 # Node ID 2d95869aed19964da02d4234ea7af22518945fc9 # Parent 586faf5a98d17d08342dc38d8531ef8650aefb05 Update gems, add java platform diff -r 586faf5a98d1 -r 2d95869aed19 Gemfile.lock --- a/Gemfile.lock Thu Jul 27 00:42:03 2017 +0900 +++ b/Gemfile.lock Fri Aug 11 17:55:50 2017 +0900 @@ -2,45 +2,50 @@ remote: https://rubygems.org/ remote: https://rails-assets.org/ specs: - actioncable (5.1.2) - actionpack (= 5.1.2) + actioncable (5.1.3) + actionpack (= 5.1.3) nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.1.2) - actionpack (= 5.1.2) - actionview (= 5.1.2) - activejob (= 5.1.2) + actionmailer (5.1.3) + actionpack (= 5.1.3) + actionview (= 5.1.3) + activejob (= 5.1.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.2) - actionview (= 5.1.2) - activesupport (= 5.1.2) + actionpack (5.1.3) + actionview (= 5.1.3) + activesupport (= 5.1.3) rack (~> 2.0) rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.2) - activesupport (= 5.1.2) + actionview (5.1.3) + activesupport (= 5.1.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.1.2) - activesupport (= 5.1.2) + activejob (5.1.3) + activesupport (= 5.1.3) globalid (>= 0.3.6) - activemodel (5.1.2) - activesupport (= 5.1.2) - activerecord (5.1.2) - activemodel (= 5.1.2) - activesupport (= 5.1.2) + activemodel (5.1.3) + activesupport (= 5.1.3) + activerecord (5.1.3) + activemodel (= 5.1.3) + activesupport (= 5.1.3) arel (~> 8.0) - activesupport (5.1.2) + activerecord-jdbc-adapter (1.3.22) + activerecord (>= 2.2) + activerecord-jdbcpostgresql-adapter (1.3.22) + activerecord-jdbc-adapter (~> 1.3.22) + jdbc-postgres (>= 9.1) + activesupport (5.1.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) arel (8.0.0) - autoprefixer-rails (7.1.2.3) + autoprefixer-rails (7.1.2.4) execjs bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) @@ -54,16 +59,20 @@ execjs coffee-script-source (1.12.2) concurrent-ruby (1.0.5) + concurrent-ruby (1.0.5-java) erubi (1.6.1) execjs (2.7.0) ffi (1.9.18) + ffi (1.9.18-java) globalid (0.4.0) activesupport (>= 4.2.0) i18n (0.8.6) + jdbc-postgres (9.4.1206) jquery-rails (4.3.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) + jruby-openssl (0.9.21-java) loofah (2.0.3) nokogiri (>= 1.5.9) mail (2.6.6) @@ -76,35 +85,38 @@ minitest (5.10.3) newrelic_rpm (4.3.0.335) nio4r (2.1.0) + nio4r (2.1.0-java) nokogiri (1.8.0) mini_portile2 (~> 2.2.0) + nokogiri (1.8.0-java) pg (0.21.0) puma (3.9.1) + puma (3.9.1-java) rack (2.0.3) rack-test (0.6.3) rack (>= 1.0) - rails (5.1.2) - actioncable (= 5.1.2) - actionmailer (= 5.1.2) - actionpack (= 5.1.2) - actionview (= 5.1.2) - activejob (= 5.1.2) - activemodel (= 5.1.2) - activerecord (= 5.1.2) - activesupport (= 5.1.2) - bundler (>= 1.3.0, < 2.0) - railties (= 5.1.2) + rails (5.1.3) + actioncable (= 5.1.3) + actionmailer (= 5.1.3) + actionpack (= 5.1.3) + actionview (= 5.1.3) + activejob (= 5.1.3) + activemodel (= 5.1.3) + activerecord (= 5.1.3) + activesupport (= 5.1.3) + bundler (>= 1.3.0) + railties (= 5.1.3) sprockets-rails (>= 2.0.0) - rails-assets-commonmark (0.27.0) + rails-assets-commonmark (0.28.1) rails-assets-highlightjs (9.12.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (5.1.2) - actionpack (= 5.1.2) - activesupport (= 5.1.2) + railties (5.1.3) + actionpack (= 5.1.3) + activesupport (= 5.1.3) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -130,8 +142,12 @@ actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) + therubyrhino (2.0.4) + therubyrhino_jar (>= 1.7.3) + therubyrhino_jar (1.7.6) thor (0.19.4) thread_safe (0.3.6) + thread_safe (0.3.6-java) tilt (2.0.8) tzinfo (1.2.3) thread_safe (~> 0.1) @@ -139,9 +155,12 @@ execjs (>= 0.3.0, < 3) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) + websocket-driver (0.6.5-java) + websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) PLATFORMS + java ruby DEPENDENCIES @@ -161,4 +180,4 @@ uglifier (>= 1.3.0) BUNDLED WITH - 1.15.1 + 1.15.3