Merge branch 'release/8.0.0'

* release/8.0.0:
  Update version and changelog
  Update License
  Add deprecation notice
  Exclude gemspec from RuboCop block length linter
  Use sassc >= 2.1.0.pre3
  Test against Rails 6
  Drop Ruby 2.2 and 2.3 compatibility

.rubocop.yml

@@ -1,10 +1,11 @@
 require:
   - rubocop-performance
+  - rubocop-rails
 
 AllCops:
   DisplayCopNames: true
   TargetRailsVersion: 5.0
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.4
   Exclude:
     - 'src/**/*'
     - 'test/dummy/bin/*'
@@ -21,11 +22,7 @@ Metrics/BlockLength:
   Exclude:
     - Rakefile
     - 'test/**/*'
+    - twbs_sass_rails.gemspec
 
 Style/Documentation:
   Enabled: false
-
-# TODO: Remove when targeting Ruby 2.3 because it is already enabled.
-Style/FrozenStringLiteralComment:
-  Enabled: true
-  EnforcedStyle: always

.travis.yml

@@ -1,8 +1,6 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.2.10
-  - 2.3.8
   - 2.4.6
   - 2.5.5
   - 2.6.3
@@ -13,10 +11,6 @@ gemfile:
   - gemfiles/rails_6.0.gemfile
 matrix:
   exclude:
-    - rvm: 2.2.10
-      gemfile: gemfiles/rails_6.0.gemfile
-    - rvm: 2.3.8
-      gemfile: gemfiles/rails_6.0.gemfile
     - rvm: 2.4.6
       gemfile: gemfiles/rails_6.0.gemfile
   fast_finish: true

Appraisals

@@ -13,5 +13,5 @@ appraise 'rails-5.2' do
 end
 
 appraise 'rails-6.0' do
-  gem 'rails', '~> 6.0.0.rc1'
+  gem 'rails', '~> 6.0.0'
 end

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 8.0.0
+
+* Drop Ruby 2.2 and 2.3 compatibility
+* Add deprecation notice in the readme
+* Use sass-rails 6.0 and sassc 2.1.0.pre3
+* Test against Rails 6
+* Update dependencies
+
 ## 7.2.0
 
 * Add Rails 6.0 compatibility

LICENSE

@@ -1,17 +1,17 @@
 BSD 2-Clause License
 
-Copyright (c) 2018, diowa
+Copyright (c) 2019, diowa
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
 
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

README.md

@@ -1,18 +1,23 @@
 # Twbs Sass Rails
-[![Gem Version](https://badge.fury.io/rb/twbs_sass_rails.svg)](http://badge.fury.io/rb/twbs_sass_rails)
+[![Gem Version](https://badge.fury.io/rb/twbs_sass_rails.svg)](https://badge.fury.io/rb/twbs_sass_rails)
 [![Build Status](https://secure.travis-ci.org/diowa/twbs_sass_rails.svg?branch=master)](https://travis-ci.org/diowa/twbs_sass_rails)
 [![Code Climate](https://codeclimate.com/github/diowa/twbs_sass_rails/badges/gpa.svg)](https://codeclimate.com/github/diowa/twbs_sass_rails)
 [![Coverage Status](https://coveralls.io/repos/github/diowa/twbs_sass_rails/badge.svg?branch=master)](https://coveralls.io/github/diowa/twbs_sass_rails?branch=master)
 
-An opinionated gem which brings [Bootstrap for Sass 3.4.0](https://getbootstrap.com/docs/3.4/), [Font Awesome 4.7.0](https://fontawesome.com/v4.7.0/) and [Respond.js](https://github.com/scottjehl/Respond) assets into your Rails application.
+An opinionated gem which brings [Bootstrap for Sass 3.4.1](https://getbootstrap.com/docs/3.4/), [Font Awesome 4.7.0](https://fontawesome.com/v4.7.0/) and [Respond.js](https://github.com/scottjehl/Respond) assets into your Rails application.
 
 
+## Deprecated
+
+We need this gem for some old projects that require Bootstrap 3.
+
+In our new development stack, we are loading Bootstrap and Font Awesome via yarn.
 
 ## Quick start
 
 Add the gem to your Gemfile
 ```rb
-gem 'twbs_sass_rails'
+gem 'twbs_sass_rails', '~> 7.2'
 ```
 
 Run the generator
@@ -23,7 +28,7 @@ $ rails g twbs_sass_rails:install
 
 #### Rails 5.1.x
 
-Rails 5.1 [drops jQuery as a default dependency](http://weblog.rubyonrails.org/2017/2/23/Rails-5-1-beta1/).
+Rails 5.1 [drops jQuery as a default dependency](https://weblog.rubyonrails.org/2017/2/23/Rails-5-1-beta1/).
 
 If you need the JavaScript part of Bootstrap, add to your Gemfile
 
@@ -131,7 +136,7 @@ Please read through our [contributing guidelines](CONTRIBUTING.md). Included are
 
 More over, if your pull request contains patches or features, you must include relevant unit tests.
 
-Editor preferences are available in the [editor config](.editorconfig) for easy use in common text editors. Read more and download plugins at <http://editorconfig.org>.
+Editor preferences are available in the [editor config](.editorconfig) for easy use in common text editors. Read more and download plugins at <https://editorconfig.org/>.
 
 
 
@@ -149,7 +154,7 @@ And constructed with the following guidelines:
 * New additions without breaking backward compatibility bumps the minor (and resets the patch)
 * Bug fixes and misc changes bumps the patch
 
-For more information on SemVer, please visit [http://semver.org/](http://semver.org/).
+For more information on SemVer, please visit [https://semver.org/](https://semver.org/).
 
 
 
@@ -169,7 +174,7 @@ For more information on SemVer, please visit [http://semver.org/](http://semver.
 
 ## Copyright and license
 
-Copyright 2018 diowa under [the BSD 2-Clause license](LICENSE).
+Copyright 2019 diowa under [the BSD 2-Clause license](LICENSE).
 
 bootstrap-sass is licensed under the MIT License
 

gemfiles/rails_6.0.gemfile

@@ -4,6 +4,6 @@
 
 source 'https://rubygems.org'
 
-gem 'rails', '~> 6.0.0.rc1'
+gem 'rails', '~> 6.0.0'
 
 gemspec path: '../'

lib/twbs_sass_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TwbsSassRails
-  VERSION = '7.2.0'.freeze
+  VERSION = '8.0.0'
 end

twbs_sass_rails.gemspec

@@ -15,21 +15,25 @@ Gem::Specification.new do |spec|
   spec.homepage    = 'https://github.com/diowa/twbs_sass_rails'
   spec.license     = 'BSD-2-Clause'
 
+  spec.required_ruby_version = '~> 2.4'
+
   spec.files         = `git ls-files -z -- {CHANGELOG.md,LICENSE,README.md,app,lib,vendor}`.split("\x0")
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'autoprefixer-rails', '~> 9.0'
   spec.add_runtime_dependency 'rails', '>= 5.0', '< 6.1'
-  spec.add_runtime_dependency 'sass-rails', '~> 5.0'
+  spec.add_runtime_dependency 'sass-rails', '~> 6.0'
+  spec.add_runtime_dependency 'sassc', '~> 2.1.0.pre3'
 
   spec.add_development_dependency 'appraisal', '~> 2.2'
   spec.add_development_dependency 'capybara', '>= 2.18', '< 4'
-  spec.add_development_dependency 'coveralls_reborn', '~> 0.12.0'
+  spec.add_development_dependency 'coveralls_reborn', '~> 0.13.2'
   spec.add_development_dependency 'minitest', '~> 5.11'
   spec.add_development_dependency 'rake', '~> 12.3'
-  spec.add_development_dependency 'rubocop', '~> 0.68.1'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.1'
-  spec.add_development_dependency 'scss_lint', '~> 0.57.1'
-  spec.add_development_dependency 'simplecov', '~> 0.16.1'
+  spec.add_development_dependency 'rubocop', '~> 0.74.0'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.4'
+  spec.add_development_dependency 'rubocop-rails', '~> 2.3'
+  spec.add_development_dependency 'scss_lint', '~> 0.58.0'
+  spec.add_development_dependency 'simplecov', '~> 0.17.0'
   spec.add_development_dependency 'uglifier', '~> 4.1'
 end