Avoid conflict between gems "listen" and "puma-dev"

puma/puma-dev#56
ledermann · May 8, 2017 · 951d957 · 951d957
1 parent 4a574c2
commit 951d957
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/Gemfile b/Gemfile
@@ -57,7 +57,7 @@ end
 group :development do
   # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
   gem 'web-console'
-  gem 'listen', '>= 3.0.5', '< 3.2'
+  # gem 'listen', '>= 3.0.5', '< 3.2'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
 end

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -117,10 +117,6 @@ GEM
       thor (>= 0.14, < 2.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.5)
@@ -168,9 +164,6 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (12.0.0)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.8)
-      ffi (>= 0.5.0)
     redis (3.3.3)
     rspec-core (3.6.0)
       rspec-support (~> 3.6.0)
@@ -189,7 +182,6 @@ GEM
       rspec-mocks (~> 3.6.0)
       rspec-support (~> 3.6.0)
     rspec-support (3.6.0)
-    ruby_dep (1.5.0)
     rubyzip (1.2.1)
     sass (3.4.23)
     sass-rails (5.0.6)
@@ -265,7 +257,6 @@ DEPENDENCIES
   initjs!
   jbuilder (~> 2.5)
   launchy
-  listen (>= 3.0.5, < 3.2)
   mysql2 (>= 0.3.18, < 0.5)
   pdfkit
   puma (~> 3.7)

diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -50,5 +50,6 @@
 
   # Use an evented file watcher to asynchronously detect changes in source code,
   # routes, locales, etc. This feature depends on the listen gem.
-  config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+  # config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+  config.file_watcher = ActiveSupport::FileUpdateChecker
 end