Merge pull request #59 from gingermusketeer/chore/add-support-for-rai…

…ls-6 Add support for rails 6
senny · Jun 9, 2020 · e29b6e3 · e29b6e3
2 parents 195807b + 5dcc27a
commit e29b6e3
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 35 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,19 +4,10 @@ cache: bundler
 before_script: bundle install --jobs=3 --retry=3
 
 rvm:
-  - 2.2
-  - 2.3
-  - 2.4
   - 2.5
   - 2.6
+  - 2.7
 
 gemfile:
-  - gemfiles/Gemfile.rails-4-2-stable
-  - gemfiles/Gemfile.rails-5-0-stable
-  - gemfiles/Gemfile.rails-5-1-stable
   - gemfiles/Gemfile.rails-5-2-stable
-
-matrix:
-  exclude:
-    - rvm: 2.3
-      gemfile: gemfiles/Gemfile.rails-4-2-stable
+  - gemfiles/Gemfile.rails-6-0-stable
diff --git a/gemfiles/Gemfile.rails-5-0-stable b/gemfiles/Gemfile.rails-5-0-stable
diff --git a/gemfiles/Gemfile.rails-5-1-stable b/gemfiles/Gemfile.rails-5-1-stable
diff --git a/gemfiles/Gemfile.rails-4-2-stable → gemfiles/Gemfile.rails-6-0-stable b/gemfiles/Gemfile.rails-4-2-stable → gemfiles/Gemfile.rails-6-0-stable
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec path: ".."
 
-gem "rails", git: "https://github.com/rails/rails.git", branch: "4-2-stable"
+gem "rails", git: "https://github.com/rails/rails.git", branch: "6-0-stable"
 
 group :test do
   gem 'capybara', '>= 2.1'

diff --git a/pdfjs_viewer-rails.gemspec b/pdfjs_viewer-rails.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.test_files = Dir["test/**/*"]
 
   s.add_dependency "rails", "> 4.2.0"
-  s.add_dependency "sass-rails", "~> 5.0"
+  s.add_dependency "sass-rails", "> 5.0"
   s.add_dependency "json", "> 1.8.4"
 
   s.add_development_dependency "sqlite3"

diff --git a/test/dummy/app/assets/config/manifest.js b/test/dummy/app/assets/config/manifest.js
@@ -0,0 +1,5 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css
+//= link pdfjs_viewer/application.css
+//= link pdfjs_viewer/application.js