Refs #1289: update gemfile, removing jruby

2 files changed, 11 insertions, 33 deletions

diff --git a/Gemfile b/Gemfile
index b63343c5e..a0a01de34 100644
--- a/Gemfile
+++ b/Gemfile
@@ -38,14 +38,6 @@ gem 'spring', group: :development
 gem 'sawyer', '~> 0.6.0'
 gem 'faraday_middleware', '~> 0.9.1'
 
-platforms :jruby do
-  gem 'activerecord-jdbcpostgresql-adapter', '~> 1.3.3'
-  gem 'jruby-openssl'
-  gem 'jruby-rack-worker'
-  gem 'warbler'
-  gem 'therubyrhino'
-end
-
 platforms :ruby do
   gem 'therubyracer', '~> 0.12'
   gem 'pg'
@@ -76,6 +68,7 @@ gem 'mimemagic'
 gem 'language_engine', '0.0.6'
 gem 'calendar_helper', '0.2.5'
 gem 'cocoon'
+gem 'slim-rails', '~> 3.1'
 gem 'formtastic', '2.3.1'
 gem 'RedCloth'
 gem 'simple_form', '~> 3.1.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3d6c507c1..0f46cfc2e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -32,11 +32,6 @@ GEM
       activemodel (= 4.1.10)
       activesupport (= 4.1.10)
       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)
     activerecord-postgis-adapter (2.2.2)
       activerecord (>= 4.0.0, < 4.2.0)
       rgeo-activerecord (~> 1.2)
@@ -200,15 +195,9 @@ GEM
     jbuilder (2.2.11)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
-    jdbc-postgres (9.4.1200)
     jquery-rails (3.1.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jruby-jars (1.7.19)
-    jruby-openssl (0.9.7-java)
-    jruby-rack (1.1.18)
-    jruby-rack-worker (0.10.0)
-      jruby-rack (>= 1.1.10)
     json (1.8.3)
     json (1.8.3-java)
     language_engine (0.0.6)
@@ -408,6 +397,13 @@ GEM
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
+    slim (3.0.7)
+      temple (~> 0.7.6)
+      tilt (>= 1.3.3, < 2.1)
+    slim-rails (3.1.0)
+      actionpack (>= 3.1)
+      railties (>= 3.1)
+      slim (~> 3.0)
     slop (3.6.0)
     spoon (0.0.4)
       ffi
@@ -428,12 +424,10 @@ GEM
       activerecord (>= 3.0)
       activesupport (>= 3.0)
       polyamorous (~> 1.1.0)
+    temple (0.7.7)
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
-    therubyrhino (2.0.4)
-      therubyrhino_jar (>= 1.7.3)
-    therubyrhino_jar (1.7.4)
     thor (0.19.1)
     thread_safe (0.3.5)
     thread_safe (0.3.5-java)
@@ -454,11 +448,6 @@ GEM
     uglifier (2.7.2)
       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)
@@ -479,7 +468,6 @@ PLATFORMS
 DEPENDENCIES
   RedCloth
   SyslogLogger
-  activerecord-jdbcpostgresql-adapter (~> 1.3.3)
   activerecord-postgis-adapter
   acts-as-taggable-on (>= 3)
   acts_as_list (~> 0.6.0)
@@ -521,8 +509,6 @@ DEPENDENCIES
   inherited_resources
   jbuilder (~> 2.0)
   jquery-rails (~> 3.1.4)
-  jruby-openssl
-  jruby-rack-worker
   json
   language_engine (= 0.0.6)
   launchy
@@ -564,17 +550,16 @@ DEPENDENCIES
   shoulda-matchers
   simple_form (~> 3.1.0)
   simplecov (~> 0.10.0)
+  slim-rails (~> 3.1)
   spring
   sqlite3
   squeel
   therubyracer (~> 0.12)
-  therubyrhino
   transpec
   turbolinks
   uglifier (~> 2.7.2)
-  warbler
   will_paginate (~> 3.0.7)
   will_paginate-bootstrap (~> 1.0.1)
 
 BUNDLED WITH
-   1.12.3
+   1.12.5