From 44309dc13816320cdd06f7064e440f58fd5dbae5 Mon Sep 17 00:00:00 2001 From: Chantele Parker Date: Thu, 19 Dec 2019 13:16:06 -0600 Subject: [PATCH 1/8] update to sassc-rails Keep getting the sass eol error when running bundle install. The sass gem reached end of life March 26, 2019. This change is switching to use sassc-rails, which uses the new C implementation of Sass as requested in issue #278. I also added rails 6.0 to the appraisal test. --- .travis.yml | 2 + Appraisals | 4 + Gemfile | 2 +- Gemfile.lock | 13 +- foundation-rails.gemspec | 2 +- gemfiles/rails_4.1.gemfile | 2 +- gemfiles/rails_4.1.gemfile.lock | 17 ++- gemfiles/rails_4.2.gemfile | 2 +- gemfiles/rails_4.2.gemfile.lock | 17 ++- gemfiles/rails_5.0.gemfile | 2 +- gemfiles/rails_5.0.gemfile.lock | 17 ++- gemfiles/rails_5.1.gemfile | 2 +- gemfiles/rails_5.1.gemfile.lock | 17 ++- gemfiles/rails_5.2.gemfile | 2 +- gemfiles/rails_5.2.gemfile.lock | 17 ++- gemfiles/rails_6.0.gemfile | 10 ++ gemfiles/rails_6.0.gemfile.lock | 219 ++++++++++++++++++++++++++++++++ 17 files changed, 318 insertions(+), 29 deletions(-) create mode 100644 gemfiles/rails_6.0.gemfile create mode 100644 gemfiles/rails_6.0.gemfile.lock diff --git a/.travis.yml b/.travis.yml index 6d1e3e73..a9ccd50e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ rvm: - 2.3.8 - 2.4.5 - 2.5.3 + - 2.6.4 gemfile: - gemfiles/rails_4.1.gemfile @@ -13,6 +14,7 @@ gemfile: - gemfiles/rails_5.0.gemfile - gemfiles/rails_5.1.gemfile - gemfiles/rails_5.2.gemfile + - gemfiles/rails_6.0.gemfile before_install: - gem update --system --no-doc diff --git a/Appraisals b/Appraisals index 3ebc726e..1b497b37 100644 --- a/Appraisals +++ b/Appraisals @@ -17,3 +17,7 @@ end appraise 'rails_5.2' do gem 'rails', '~> 5.2' end + +appraise 'rails_6.0' do + gem 'rails', '~> 6.0' +end diff --git a/Gemfile b/Gemfile index e26c9fb1..3a5abb56 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,6 @@ source 'https://rubygems.org' gemspec gem 'rails' -gem 'sass' +gem 'sassc-rails' gem 'railties' gem 'sprockets-es6' diff --git a/Gemfile.lock b/Gemfile.lock index f7dcdc9f..09db4cb1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -167,6 +167,14 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) + sassc (2.2.1) + ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt sprockets (4.0.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -180,6 +188,7 @@ GEM sprockets (>= 3.0.0) thor (1.0.0) thread_safe (0.3.6) + tilt (2.0.10) tzinfo (1.2.5) thread_safe (~> 0.1) websocket-driver (0.7.1) @@ -203,8 +212,8 @@ DEPENDENCIES railties rake rspec (~> 3.2) - sass + sassc-rails sprockets-es6 BUNDLED WITH - 1.17.1 + 1.17.3 diff --git a/foundation-rails.gemspec b/foundation-rails.gemspec index f0e777ae..b427675a 100644 --- a/foundation-rails.gemspec +++ b/foundation-rails.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - spec.add_dependency "sass", [">= 3.3.0"] + spec.add_dependency "sassc-rails", [">= 2.2.1"] spec.add_dependency "railties", [">= 3.1.0"] spec.add_dependency "sprockets-es6", [">= 0.9.0"] diff --git a/gemfiles/rails_4.1.gemfile b/gemfiles/rails_4.1.gemfile index 2b4fb0e5..18ce51ab 100644 --- a/gemfiles/rails_4.1.gemfile +++ b/gemfiles/rails_4.1.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "rails", "~> 4.1" -gem "sass" +gem "sassc-rails" gem "railties" gem "sprockets-es6" diff --git a/gemfiles/rails_4.1.gemfile.lock b/gemfiles/rails_4.1.gemfile.lock index e5604b21..ea11a99e 100644 --- a/gemfiles/rails_4.1.gemfile.lock +++ b/gemfiles/rails_4.1.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - foundation-rails (6.5.3.0) + foundation-rails (6.6.1.0) railties (>= 3.1.0) sass (>= 3.3.0) sprockets-es6 (>= 0.9.0) @@ -137,11 +137,19 @@ GEM rspec-support (~> 3.8.0) rspec-support (3.8.0) ruby_dep (1.5.0) - sass (3.7.3) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) + sassc (2.2.1) + ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -155,6 +163,7 @@ GEM sprockets (>= 3.0.0) thor (0.20.3) thread_safe (0.3.6) + tilt (2.0.10) tzinfo (1.2.5) thread_safe (~> 0.1) xpath (3.2.0) @@ -174,8 +183,8 @@ DEPENDENCIES railties rake rspec (~> 3.2) - sass + sassc-rails sprockets-es6 BUNDLED WITH - 1.17.1 + 1.17.3 diff --git a/gemfiles/rails_4.2.gemfile b/gemfiles/rails_4.2.gemfile index f40e933d..35a3c23d 100644 --- a/gemfiles/rails_4.2.gemfile +++ b/gemfiles/rails_4.2.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "rails", "~> 4.2" -gem "sass" +gem "sassc-rails" gem "railties" gem "sprockets-es6" diff --git a/gemfiles/rails_4.2.gemfile.lock b/gemfiles/rails_4.2.gemfile.lock index 224c4ec8..ac4b131b 100644 --- a/gemfiles/rails_4.2.gemfile.lock +++ b/gemfiles/rails_4.2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - foundation-rails (6.5.3.0) + foundation-rails (6.6.1.0) railties (>= 3.1.0) sass (>= 3.3.0) sprockets-es6 (>= 0.9.0) @@ -137,11 +137,19 @@ GEM rspec-support (~> 3.8.0) rspec-support (3.8.0) ruby_dep (1.5.0) - sass (3.7.3) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) + sassc (2.2.1) + ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -155,6 +163,7 @@ GEM sprockets (>= 3.0.0) thor (0.20.3) thread_safe (0.3.6) + tilt (2.0.10) tzinfo (1.2.5) thread_safe (~> 0.1) xpath (3.2.0) @@ -174,8 +183,8 @@ DEPENDENCIES railties rake rspec (~> 3.2) - sass + sassc-rails sprockets-es6 BUNDLED WITH - 1.17.1 + 1.17.3 diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile index 782a731a..030b2ad9 100644 --- a/gemfiles/rails_5.0.gemfile +++ b/gemfiles/rails_5.0.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "rails", "~> 5.0" -gem "sass" +gem "sassc-rails" gem "railties" gem "sprockets-es6" diff --git a/gemfiles/rails_5.0.gemfile.lock b/gemfiles/rails_5.0.gemfile.lock index 2b7d24d2..9f0ed4dc 100644 --- a/gemfiles/rails_5.0.gemfile.lock +++ b/gemfiles/rails_5.0.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - foundation-rails (6.5.3.0) + foundation-rails (6.6.1.0) railties (>= 3.1.0) sass (>= 3.3.0) sprockets-es6 (>= 0.9.0) @@ -149,11 +149,19 @@ GEM rspec-support (~> 3.8.0) rspec-support (3.8.0) ruby_dep (1.5.0) - sass (3.7.3) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) + sassc (2.2.1) + ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -167,6 +175,7 @@ GEM sprockets (>= 3.0.0) thor (0.20.3) thread_safe (0.3.6) + tilt (2.0.10) tzinfo (1.2.5) thread_safe (~> 0.1) websocket-driver (0.7.0) @@ -189,8 +198,8 @@ DEPENDENCIES railties rake rspec (~> 3.2) - sass + sassc-rails sprockets-es6 BUNDLED WITH - 1.17.1 + 1.17.3 diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile index da4ce41e..a2bd1840 100644 --- a/gemfiles/rails_5.1.gemfile +++ b/gemfiles/rails_5.1.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "rails", "~> 5.1" -gem "sass" +gem "sassc-rails" gem "railties" gem "sprockets-es6" diff --git a/gemfiles/rails_5.1.gemfile.lock b/gemfiles/rails_5.1.gemfile.lock index b136e72b..84bda782 100644 --- a/gemfiles/rails_5.1.gemfile.lock +++ b/gemfiles/rails_5.1.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - foundation-rails (6.5.3.0) + foundation-rails (6.6.1.0) railties (>= 3.1.0) sass (>= 3.3.0) sprockets-es6 (>= 0.9.0) @@ -149,11 +149,19 @@ GEM rspec-support (~> 3.8.0) rspec-support (3.8.0) ruby_dep (1.5.0) - sass (3.7.3) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) + sassc (2.2.1) + ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -167,6 +175,7 @@ GEM sprockets (>= 3.0.0) thor (0.20.3) thread_safe (0.3.6) + tilt (2.0.10) tzinfo (1.2.5) thread_safe (~> 0.1) websocket-driver (0.7.0) @@ -189,8 +198,8 @@ DEPENDENCIES railties rake rspec (~> 3.2) - sass + sassc-rails sprockets-es6 BUNDLED WITH - 1.17.1 + 1.17.3 diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile index db172757..ef581f83 100644 --- a/gemfiles/rails_5.2.gemfile +++ b/gemfiles/rails_5.2.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "rails", "~> 5.2" -gem "sass" +gem "sassc-rails" gem "railties" gem "sprockets-es6" diff --git a/gemfiles/rails_5.2.gemfile.lock b/gemfiles/rails_5.2.gemfile.lock index d792b397..99f6e947 100644 --- a/gemfiles/rails_5.2.gemfile.lock +++ b/gemfiles/rails_5.2.gemfile.lock @@ -1,7 +1,7 @@ PATH remote: .. specs: - foundation-rails (6.5.3.0) + foundation-rails (6.6.1.0) railties (>= 3.1.0) sass (>= 3.3.0) sprockets-es6 (>= 0.9.0) @@ -149,11 +149,19 @@ GEM rspec-support (~> 3.8.0) rspec-support (3.8.0) ruby_dep (1.5.0) - sass (3.7.3) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) + sassc (2.2.1) + ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -167,6 +175,7 @@ GEM sprockets (>= 3.0.0) thor (0.20.3) thread_safe (0.3.6) + tilt (2.0.10) tzinfo (1.2.5) thread_safe (~> 0.1) websocket-driver (0.7.0) @@ -189,8 +198,8 @@ DEPENDENCIES railties rake rspec (~> 3.2) - sass + sassc-rails sprockets-es6 BUNDLED WITH - 1.17.1 + 1.17.3 diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile new file mode 100644 index 00000000..a57f7356 --- /dev/null +++ b/gemfiles/rails_6.0.gemfile @@ -0,0 +1,10 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "~> 6.0" +gem "sassc-rails" +gem "railties" +gem "sprockets-es6" + +gemspec path: "../" diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock new file mode 100644 index 00000000..35fc869b --- /dev/null +++ b/gemfiles/rails_6.0.gemfile.lock @@ -0,0 +1,219 @@ +PATH + remote: .. + specs: + foundation-rails (6.6.1.0) + railties (>= 3.1.0) + sass (>= 3.3.0) + sprockets-es6 (>= 0.9.0) + +GEM + remote: https://rubygems.org/ + specs: + actioncable (6.0.2.1) + actionpack (= 6.0.2.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.0.2.1) + actionpack (= 6.0.2.1) + activejob (= 6.0.2.1) + activerecord (= 6.0.2.1) + activestorage (= 6.0.2.1) + activesupport (= 6.0.2.1) + mail (>= 2.7.1) + actionmailer (6.0.2.1) + actionpack (= 6.0.2.1) + actionview (= 6.0.2.1) + activejob (= 6.0.2.1) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.0.2.1) + actionview (= 6.0.2.1) + activesupport (= 6.0.2.1) + rack (~> 2.0, >= 2.0.8) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.0.2.1) + actionpack (= 6.0.2.1) + activerecord (= 6.0.2.1) + activestorage (= 6.0.2.1) + activesupport (= 6.0.2.1) + nokogiri (>= 1.8.5) + actionview (6.0.2.1) + activesupport (= 6.0.2.1) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.0.2.1) + activesupport (= 6.0.2.1) + globalid (>= 0.3.6) + activemodel (6.0.2.1) + activesupport (= 6.0.2.1) + activerecord (6.0.2.1) + activemodel (= 6.0.2.1) + activesupport (= 6.0.2.1) + activestorage (6.0.2.1) + actionpack (= 6.0.2.1) + activejob (= 6.0.2.1) + activerecord (= 6.0.2.1) + marcel (~> 0.3.1) + activesupport (6.0.2.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + appraisal (2.2.0) + bundler + rake + thor (>= 0.14.0) + babel-source (5.8.35) + babel-transpiler (0.7.0) + babel-source (>= 4.0, < 6) + execjs (~> 2.0) + bootsnap (1.4.5) + msgpack (~> 1.0) + builder (3.2.4) + capybara (3.29.0) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.5) + xpath (~> 3.2) + concurrent-ruby (1.1.5) + crass (1.0.5) + diff-lcs (1.3) + erubi (1.9.0) + execjs (2.7.0) + ffi (1.11.3) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.7.0) + concurrent-ruby (~> 1.0) + listen (3.2.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + loofah (2.4.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.13.0) + msgpack (1.3.1) + nio4r (2.5.2) + nokogiri (1.10.7) + mini_portile2 (~> 2.4.0) + public_suffix (4.0.1) + rack (2.0.8) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (6.0.2.1) + actioncable (= 6.0.2.1) + actionmailbox (= 6.0.2.1) + actionmailer (= 6.0.2.1) + actionpack (= 6.0.2.1) + actiontext (= 6.0.2.1) + actionview (= 6.0.2.1) + activejob (= 6.0.2.1) + activemodel (= 6.0.2.1) + activerecord (= 6.0.2.1) + activestorage (= 6.0.2.1) + activesupport (= 6.0.2.1) + bundler (>= 1.3.0) + railties (= 6.0.2.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (6.0.2.1) + actionpack (= 6.0.2.1) + activesupport (= 6.0.2.1) + method_source + rake (>= 0.8.7) + thor (>= 0.20.3, < 2.0) + rake (13.0.1) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + regexp_parser (1.6.0) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.0) + rspec-support (~> 3.9.0) + rspec-expectations (3.9.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-support (3.9.0) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sassc (2.2.1) + ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt + sprockets (4.0.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-es6 (0.9.2) + babel-source (>= 5.8.11) + babel-transpiler + sprockets (>= 3.0.0) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (1.0.1) + thread_safe (0.3.6) + tilt (2.0.10) + tzinfo (1.2.5) + thread_safe (~> 0.1) + websocket-driver (0.7.1) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.4) + xpath (3.2.0) + nokogiri (~> 1.8) + zeitwerk (2.2.2) + +PLATFORMS + ruby + +DEPENDENCIES + appraisal + bootsnap + bundler (~> 1.3) + capybara + foundation-rails! + listen + rails (~> 6.0) + railties + rake + rspec (~> 3.2) + sassc-rails + sprockets-es6 + +BUNDLED WITH + 1.17.3 From 8ec57e96bfc43d8033f29fe2cb2686aabf67c688 Mon Sep 17 00:00:00 2001 From: Chantele Parker Date: Thu, 19 Dec 2019 17:11:43 -0600 Subject: [PATCH 2/8] specify bundler version Getting this error in Travis CI: Name: bundler Version: 2.1.0 File: bundler-2.1.0.gem bundler's executable "bundle" conflicts with /home/travis/.rvm/rubies/ruby-2.3.8/bin/bundle Overwrite the executable? [yN] specify the bundler version in travis.yml so it matches what's in the Gemfile.lock. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a9ccd50e..a2f1c5f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,8 @@ gemfile: before_install: - gem update --system --no-doc -- gem install bundler +- gem install -v 1.17.3 bundler --no-rdoc --no-ri +- bundle _1.17.3_ install notifications: email: false From cc99ad0ca228d6f1f393d9cc4b63f1cc57d214e4 Mon Sep 17 00:00:00 2001 From: Chantele Parker Date: Fri, 3 Jan 2020 15:09:27 -0600 Subject: [PATCH 3/8] fix failing build try to fix failing build as suggested by @javierjulio --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a2f1c5f1..83cc7c21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,9 +17,8 @@ gemfile: - gemfiles/rails_6.0.gemfile before_install: -- gem update --system --no-doc -- gem install -v 1.17.3 bundler --no-rdoc --no-ri -- bundle _1.17.3_ install + - gem update --system + - gem install bundler: 1.17.3 notifications: email: false From 5036ff93895d884de166f36ae8e9b7855399300f Mon Sep 17 00:00:00 2001 From: Chantele Parker Date: Fri, 3 Jan 2020 15:22:48 -0600 Subject: [PATCH 4/8] fix extra space remove extra space --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 83cc7c21..02d57c28 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ gemfile: before_install: - gem update --system - - gem install bundler: 1.17.3 + - gem install bundler:1.17.3 notifications: email: false From 21536d7ae673c0e901144db9c256e72f6860b44b Mon Sep 17 00:00:00 2001 From: Chantele Parker Date: Fri, 3 Jan 2020 15:36:32 -0600 Subject: [PATCH 5/8] fix to bundler version fix to bundler version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 02d57c28..04cfdcdf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ gemfile: before_install: - gem update --system - - gem install bundler:1.17.3 + - gem install bundler -v "1.17.3" notifications: email: false From 7f92315c0e5792a7205778cc35cf17160fed2ce4 Mon Sep 17 00:00:00 2001 From: Petrik Date: Thu, 13 Feb 2020 21:07:48 +0100 Subject: [PATCH 6/8] Replace sass with sassc in gemspec --- .travis.yml | 2 +- Gemfile | 2 +- Gemfile.lock | 34 +++++++++++---------------------- foundation-rails.gemspec | 2 +- gemfiles/rails_4.1.gemfile | 2 +- gemfiles/rails_4.1.gemfile.lock | 16 ++-------------- gemfiles/rails_4.2.gemfile | 2 +- gemfiles/rails_4.2.gemfile.lock | 16 ++-------------- gemfiles/rails_5.0.gemfile | 2 +- gemfiles/rails_5.0.gemfile.lock | 16 ++-------------- gemfiles/rails_5.1.gemfile | 2 +- gemfiles/rails_5.1.gemfile.lock | 16 ++-------------- gemfiles/rails_5.2.gemfile | 2 +- gemfiles/rails_5.2.gemfile.lock | 16 ++-------------- gemfiles/rails_6.0.gemfile | 2 +- gemfiles/rails_6.0.gemfile.lock | 16 ++-------------- 16 files changed, 32 insertions(+), 116 deletions(-) diff --git a/.travis.yml b/.travis.yml index 04cfdcdf..2f3a9e63 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ gemfile: - gemfiles/rails_6.0.gemfile before_install: - - gem update --system + - gem update --system --no-doc - gem install bundler -v "1.17.3" notifications: diff --git a/Gemfile b/Gemfile index 3a5abb56..602aeb35 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,6 @@ source 'https://rubygems.org' gemspec gem 'rails' -gem 'sassc-rails' +gem 'sassc' gem 'railties' gem 'sprockets-es6' diff --git a/Gemfile.lock b/Gemfile.lock index 09db4cb1..b9bac97f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,7 +3,7 @@ PATH specs: foundation-rails (6.6.1.0) railties (>= 3.1.0) - sass (>= 3.3.0) + sassc (>= 2.2.1) sprockets-es6 (>= 0.9.0) GEM @@ -85,15 +85,15 @@ GEM rack-test (>= 0.6.3) regexp_parser (~> 1.5) xpath (~> 3.2) - concurrent-ruby (1.1.5) - crass (1.0.5) + concurrent-ruby (1.1.6) + crass (1.0.6) diff-lcs (1.3) erubi (1.9.0) execjs (2.7.0) - ffi (1.11.3) + ffi (1.12.2) globalid (0.4.2) activesupport (>= 4.2.0) - i18n (1.7.0) + i18n (1.8.2) concurrent-ruby (~> 1.0) listen (3.2.1) rb-fsevent (~> 0.10, >= 0.10.3) @@ -109,13 +109,13 @@ GEM mimemagic (0.3.3) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.13.0) + minitest (5.14.0) msgpack (1.3.1) nio4r (2.5.2) - nokogiri (1.10.7) + nokogiri (1.10.8) mini_portile2 (~> 2.4.0) public_suffix (4.0.1) - rack (2.0.7) + rack (2.2.2) rack-test (1.1.0) rack (>= 1.0, < 3) rails (6.0.2) @@ -162,19 +162,8 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-support (3.9.0) - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) sassc (2.2.1) ffi (~> 1.9) - sassc-rails (2.1.2) - railties (>= 4.0.0) - sassc (>= 2.0) - sprockets (> 3.0) - sprockets-rails - tilt sprockets (4.0.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -186,10 +175,9 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - thor (1.0.0) + thor (1.0.1) thread_safe (0.3.6) - tilt (2.0.10) - tzinfo (1.2.5) + tzinfo (1.2.6) thread_safe (~> 0.1) websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) @@ -212,7 +200,7 @@ DEPENDENCIES railties rake rspec (~> 3.2) - sassc-rails + sassc sprockets-es6 BUNDLED WITH diff --git a/foundation-rails.gemspec b/foundation-rails.gemspec index b427675a..ae967760 100644 --- a/foundation-rails.gemspec +++ b/foundation-rails.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - spec.add_dependency "sassc-rails", [">= 2.2.1"] + spec.add_dependency "sassc", [">= 2.2.1"] spec.add_dependency "railties", [">= 3.1.0"] spec.add_dependency "sprockets-es6", [">= 0.9.0"] diff --git a/gemfiles/rails_4.1.gemfile b/gemfiles/rails_4.1.gemfile index 18ce51ab..ae04bbbe 100644 --- a/gemfiles/rails_4.1.gemfile +++ b/gemfiles/rails_4.1.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "rails", "~> 4.1" -gem "sassc-rails" +gem "sassc" gem "railties" gem "sprockets-es6" diff --git a/gemfiles/rails_4.1.gemfile.lock b/gemfiles/rails_4.1.gemfile.lock index ea11a99e..4191137a 100644 --- a/gemfiles/rails_4.1.gemfile.lock +++ b/gemfiles/rails_4.1.gemfile.lock @@ -3,7 +3,7 @@ PATH specs: foundation-rails (6.6.1.0) railties (>= 3.1.0) - sass (>= 3.3.0) + sassc (>= 2.2.1) sprockets-es6 (>= 0.9.0) GEM @@ -137,19 +137,8 @@ GEM rspec-support (~> 3.8.0) rspec-support (3.8.0) ruby_dep (1.5.0) - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) sassc (2.2.1) ffi (~> 1.9) - sassc-rails (2.1.2) - railties (>= 4.0.0) - sassc (>= 2.0) - sprockets (> 3.0) - sprockets-rails - tilt sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -163,7 +152,6 @@ GEM sprockets (>= 3.0.0) thor (0.20.3) thread_safe (0.3.6) - tilt (2.0.10) tzinfo (1.2.5) thread_safe (~> 0.1) xpath (3.2.0) @@ -183,7 +171,7 @@ DEPENDENCIES railties rake rspec (~> 3.2) - sassc-rails + sassc sprockets-es6 BUNDLED WITH diff --git a/gemfiles/rails_4.2.gemfile b/gemfiles/rails_4.2.gemfile index 35a3c23d..e618b911 100644 --- a/gemfiles/rails_4.2.gemfile +++ b/gemfiles/rails_4.2.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "rails", "~> 4.2" -gem "sassc-rails" +gem "sassc" gem "railties" gem "sprockets-es6" diff --git a/gemfiles/rails_4.2.gemfile.lock b/gemfiles/rails_4.2.gemfile.lock index ac4b131b..c2ca7ead 100644 --- a/gemfiles/rails_4.2.gemfile.lock +++ b/gemfiles/rails_4.2.gemfile.lock @@ -3,7 +3,7 @@ PATH specs: foundation-rails (6.6.1.0) railties (>= 3.1.0) - sass (>= 3.3.0) + sassc (>= 2.2.1) sprockets-es6 (>= 0.9.0) GEM @@ -137,19 +137,8 @@ GEM rspec-support (~> 3.8.0) rspec-support (3.8.0) ruby_dep (1.5.0) - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) sassc (2.2.1) ffi (~> 1.9) - sassc-rails (2.1.2) - railties (>= 4.0.0) - sassc (>= 2.0) - sprockets (> 3.0) - sprockets-rails - tilt sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -163,7 +152,6 @@ GEM sprockets (>= 3.0.0) thor (0.20.3) thread_safe (0.3.6) - tilt (2.0.10) tzinfo (1.2.5) thread_safe (~> 0.1) xpath (3.2.0) @@ -183,7 +171,7 @@ DEPENDENCIES railties rake rspec (~> 3.2) - sassc-rails + sassc sprockets-es6 BUNDLED WITH diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile index 030b2ad9..04608630 100644 --- a/gemfiles/rails_5.0.gemfile +++ b/gemfiles/rails_5.0.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "rails", "~> 5.0" -gem "sassc-rails" +gem "sassc" gem "railties" gem "sprockets-es6" diff --git a/gemfiles/rails_5.0.gemfile.lock b/gemfiles/rails_5.0.gemfile.lock index 9f0ed4dc..5cdf696d 100644 --- a/gemfiles/rails_5.0.gemfile.lock +++ b/gemfiles/rails_5.0.gemfile.lock @@ -3,7 +3,7 @@ PATH specs: foundation-rails (6.6.1.0) railties (>= 3.1.0) - sass (>= 3.3.0) + sassc (>= 2.2.1) sprockets-es6 (>= 0.9.0) GEM @@ -149,19 +149,8 @@ GEM rspec-support (~> 3.8.0) rspec-support (3.8.0) ruby_dep (1.5.0) - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) sassc (2.2.1) ffi (~> 1.9) - sassc-rails (2.1.2) - railties (>= 4.0.0) - sassc (>= 2.0) - sprockets (> 3.0) - sprockets-rails - tilt sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -175,7 +164,6 @@ GEM sprockets (>= 3.0.0) thor (0.20.3) thread_safe (0.3.6) - tilt (2.0.10) tzinfo (1.2.5) thread_safe (~> 0.1) websocket-driver (0.7.0) @@ -198,7 +186,7 @@ DEPENDENCIES railties rake rspec (~> 3.2) - sassc-rails + sassc sprockets-es6 BUNDLED WITH diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile index a2bd1840..65d9d9b9 100644 --- a/gemfiles/rails_5.1.gemfile +++ b/gemfiles/rails_5.1.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "rails", "~> 5.1" -gem "sassc-rails" +gem "sassc" gem "railties" gem "sprockets-es6" diff --git a/gemfiles/rails_5.1.gemfile.lock b/gemfiles/rails_5.1.gemfile.lock index 84bda782..51351f5e 100644 --- a/gemfiles/rails_5.1.gemfile.lock +++ b/gemfiles/rails_5.1.gemfile.lock @@ -3,7 +3,7 @@ PATH specs: foundation-rails (6.6.1.0) railties (>= 3.1.0) - sass (>= 3.3.0) + sassc (>= 2.2.1) sprockets-es6 (>= 0.9.0) GEM @@ -149,19 +149,8 @@ GEM rspec-support (~> 3.8.0) rspec-support (3.8.0) ruby_dep (1.5.0) - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) sassc (2.2.1) ffi (~> 1.9) - sassc-rails (2.1.2) - railties (>= 4.0.0) - sassc (>= 2.0) - sprockets (> 3.0) - sprockets-rails - tilt sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -175,7 +164,6 @@ GEM sprockets (>= 3.0.0) thor (0.20.3) thread_safe (0.3.6) - tilt (2.0.10) tzinfo (1.2.5) thread_safe (~> 0.1) websocket-driver (0.7.0) @@ -198,7 +186,7 @@ DEPENDENCIES railties rake rspec (~> 3.2) - sassc-rails + sassc sprockets-es6 BUNDLED WITH diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile index ef581f83..b2c91f5a 100644 --- a/gemfiles/rails_5.2.gemfile +++ b/gemfiles/rails_5.2.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "rails", "~> 5.2" -gem "sassc-rails" +gem "sassc" gem "railties" gem "sprockets-es6" diff --git a/gemfiles/rails_5.2.gemfile.lock b/gemfiles/rails_5.2.gemfile.lock index 99f6e947..bbe9a33e 100644 --- a/gemfiles/rails_5.2.gemfile.lock +++ b/gemfiles/rails_5.2.gemfile.lock @@ -3,7 +3,7 @@ PATH specs: foundation-rails (6.6.1.0) railties (>= 3.1.0) - sass (>= 3.3.0) + sassc (>= 2.2.1) sprockets-es6 (>= 0.9.0) GEM @@ -149,19 +149,8 @@ GEM rspec-support (~> 3.8.0) rspec-support (3.8.0) ruby_dep (1.5.0) - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) sassc (2.2.1) ffi (~> 1.9) - sassc-rails (2.1.2) - railties (>= 4.0.0) - sassc (>= 2.0) - sprockets (> 3.0) - sprockets-rails - tilt sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -175,7 +164,6 @@ GEM sprockets (>= 3.0.0) thor (0.20.3) thread_safe (0.3.6) - tilt (2.0.10) tzinfo (1.2.5) thread_safe (~> 0.1) websocket-driver (0.7.0) @@ -198,7 +186,7 @@ DEPENDENCIES railties rake rspec (~> 3.2) - sassc-rails + sassc sprockets-es6 BUNDLED WITH diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile index a57f7356..71bf78b7 100644 --- a/gemfiles/rails_6.0.gemfile +++ b/gemfiles/rails_6.0.gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gem "rails", "~> 6.0" -gem "sassc-rails" +gem "sassc" gem "railties" gem "sprockets-es6" diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index 35fc869b..957dcf46 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -3,7 +3,7 @@ PATH specs: foundation-rails (6.6.1.0) railties (>= 3.1.0) - sass (>= 3.3.0) + sassc (>= 2.2.1) sprockets-es6 (>= 0.9.0) GEM @@ -162,19 +162,8 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-support (3.9.0) - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) sassc (2.2.1) ffi (~> 1.9) - sassc-rails (2.1.2) - railties (>= 4.0.0) - sassc (>= 2.0) - sprockets (> 3.0) - sprockets-rails - tilt sprockets (4.0.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -188,7 +177,6 @@ GEM sprockets (>= 3.0.0) thor (1.0.1) thread_safe (0.3.6) - tilt (2.0.10) tzinfo (1.2.5) thread_safe (~> 0.1) websocket-driver (0.7.1) @@ -212,7 +200,7 @@ DEPENDENCIES railties rake rspec (~> 3.2) - sassc-rails + sassc sprockets-es6 BUNDLED WITH From be6eac3b9f675f51c10cc0b50016d3bf11cbd9db Mon Sep 17 00:00:00 2001 From: Petrik Date: Thu, 13 Feb 2020 21:30:04 +0100 Subject: [PATCH 7/8] Remove EOL ruby 2.3 from build matrix Also update other rubies to latest patch version --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2f3a9e63..a25ded9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,9 @@ sudo: false cache: bundler rvm: - - 2.3.8 - - 2.4.5 - - 2.5.3 - - 2.6.4 + - 2.4.9 + - 2.5.7 + - 2.6.5 gemfile: - gemfiles/rails_4.1.gemfile From cbc36526cfb09c78ab0e562adec7c8310ccaabe7 Mon Sep 17 00:00:00 2001 From: Petrik Date: Thu, 13 Feb 2020 21:45:04 +0100 Subject: [PATCH 8/8] Remove rails 6 from build matrix --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a25ded9d..54fc152a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,6 @@ gemfile: - gemfiles/rails_5.0.gemfile - gemfiles/rails_5.1.gemfile - gemfiles/rails_5.2.gemfile - - gemfiles/rails_6.0.gemfile before_install: - gem update --system --no-doc