gem 'pg' for ruby patforms

2 files changed, 40 insertions, 2 deletions

diff --git a/Gemfile b/Gemfile
index 5a1a5faf9..433d1bd20 100644
--- a/Gemfile
+++ b/Gemfile
@@ -56,11 +56,10 @@ end
 
 platforms :ruby do
   gem 'therubyracer', '~> 0.10.2'
+  gem 'pg'
   gem 'sqlite3'
 end
 
-gem 'pg'
-
 # I18n
 gem 'rails-i18n', '~> 4.0.0'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index d7789ee83..79cfa1784 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -18,6 +18,7 @@ GEM
   remote: https://rails-assets.org/
   specs:
     RedCloth (4.2.9)
+    RedCloth (4.2.9-java)
     SyslogLogger (2.0)
     actionmailer (4.1.9)
       actionpack (= 4.1.9)
@@ -39,6 +40,11 @@ GEM
       activemodel (= 4.1.9)
       activesupport (= 4.1.9)
       arel (~> 5.0.0)
+    activerecord-jdbc-adapter (1.3.15)
+      activerecord (>= 2.2)
+    activerecord-jdbcpostgresql-adapter (1.3.15)
+      activerecord-jdbc-adapter (~> 1.3.15)
+      jdbc-postgres (>= 9.1)
     activesupport (4.1.9)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
@@ -60,6 +66,7 @@ GEM
     astrolabe (1.3.0)
       parser (>= 2.2.0.pre.3, < 3.0)
     bcrypt (3.1.10)
+    bcrypt (3.1.10-java)
     breadcrumbs_on_rails (2.3.0)
     builder (3.2.2)
     calendar_helper (0.2.5)
@@ -133,6 +140,7 @@ GEM
       faraday (>= 0.7.4, < 0.10)
     fastercsv (1.5.5)
     ffi (1.9.6)
+    ffi (1.9.6-java)
     ffi-geos (1.0.0)
       ffi (>= 1.0.0)
     font-awesome-sass (4.2.2)
@@ -177,6 +185,7 @@ GEM
       hashie (>= 3.0)
     hike (1.2.3)
     hitimes (1.2.2)
+    hitimes (1.2.2-java)
     i18n (0.7.0)
     inherited_resources (1.6.0)
       actionpack (>= 3.2, < 5)
@@ -186,6 +195,7 @@ GEM
     jbuilder (2.2.11)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
+    jdbc-postgres (9.4.1200)
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
@@ -196,12 +206,21 @@ GEM
       jquery-rails
       jquery-ui-rails (= 4.0.3)
       railties (>= 3.1.0)
+    jruby-jars (1.7.19)
+    jruby-openssl (0.9.6-java)
+    jruby-rack (1.1.18)
+    jruby-rack-worker (0.10.0)
+      jruby-rack (>= 1.1.10)
     json (1.8.2)
+    json (1.8.2-java)
     kleisli (0.2.6)
     language_engine (0.0.6)
       rails (~> 4.1.1)
     launchy (2.4.3)
       addressable (~> 2.3)
+    launchy (2.4.3-java)
+      addressable (~> 2.3)
+      spoon (~> 0.0.1)
     libv8 (3.3.10.4)
     listen (2.8.6)
       celluloid (>= 0.15.2)
@@ -228,6 +247,7 @@ GEM
     net-ssh (2.9.2)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
+    nokogiri (1.6.6.2-java)
     notiffany (0.0.6)
       nenv (~> 0.1)
       shellany (~> 0.0)
@@ -247,6 +267,11 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
+    pry (0.10.1-java)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+      spoon (~> 0.0)
     rabl (0.11.6)
       activesupport (>= 2.3.14)
     rack (1.5.2)
@@ -362,6 +387,8 @@ GEM
     sitemap_generator (5.0.5)
       builder
     slop (3.6.0)
+    spoon (0.0.4)
+      ffi
     spreadsheet (1.0.2)
       ruby-ole (>= 1.0)
     spring (1.3.3)
@@ -385,8 +412,12 @@ GEM
       net-ssh (>= 2.8.0)
     therubyracer (0.10.2)
       libv8 (~> 3.3.10)
+    therubyrhino (2.0.4)
+      therubyrhino_jar (>= 1.7.3)
+    therubyrhino_jar (1.7.4)
     thor (0.19.1)
     thread_safe (0.3.4)
+    thread_safe (0.3.4-java)
     tilt (1.4.1)
     timers (4.0.1)
       hitimes
@@ -404,10 +435,17 @@ GEM
     uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
+    warbler (1.4.5)
+      jruby-jars (>= 1.5.6, < 2.0)
+      jruby-rack (>= 1.1.1, < 1.3)
+      rake (>= 0.9.6)
+      rubyzip (>= 0.9, < 1.2)
     warden (1.2.3)
       rack (>= 1.0)
     websocket-driver (0.5.3)
       websocket-extensions (>= 0.1.0)
+    websocket-driver (0.5.3-java)
+      websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     will_paginate (3.0.7)
     will_paginate-bootstrap (1.0.1)
@@ -416,6 +454,7 @@ GEM
       nokogiri (~> 1.3)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES