remove ruby 2.1

next-l · Oct 7, 2017 · 42156ed · 42156ed
1 parent 42cab38
commit 42156ed
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,10 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.1.9
   - 2.2.5
   - 2.3.1
 before_script:
-  - mysql -e 'create database enju_test'
+  - mysql -e 'create database enju_test DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;'
   - psql -c 'create database enju_test;' -U postgres
   - bundle exec rake db:migrate
 services:
@@ -17,10 +16,6 @@ env:
   - DB=sqlite
   - DB=mysql
   - DB=postgresql
-matrix:
-  exclude:
-    - rvm: 2.1.9
-      gemfile: gemfiles/rails_5.0.gemfile
 notifications:
   slack:
     secure: aVw4odRuPfoUjOXbmYfwhYrUuG0BPxmPDmpz6RmUoUKUtUDPWeCw60Xxv+AvGxNuc2usZ32eHW/tKXsQukx5SADVYkSgiAquo4/PErxAdt+P+ilEUT0fzJr8N11mtY0SEOK1iXVp5ucjswsjUYPyQwcddL/hBU2tcSU73yrLv2E=

diff --git a/Appraisals b/Appraisals
@@ -5,9 +5,7 @@ end
 
 appraise "rails-5.0" do
   gem "rails", "~> 5.0.2"
-  gem 'globalize', '~> 5.1.0.beta1'
   gem 'statesman', '~> 2.0'
   gem 'activemodel-serializers-xml'
   gem 'rails-controller-testing'
-  gem 'sinatra', '~> 2.0.0.rc2'
 end
diff --git a/enju_news.gemspec b/enju_news.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency "enju_library", "~> 0.2.2"
 
   s.add_development_dependency "enju_leaf", "~> 1.2.1"
-  s.add_development_dependency "globalize", "~> 5.0.1"
+  s.add_development_dependency "globalize", "~> 5.1.0.beta2"
   s.add_development_dependency "globalize-accessors"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "mysql2"

diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile
@@ -3,10 +3,8 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 5.0.2"
-gem "globalize", "~> 5.1.0.beta1"
 gem "statesman", "~> 2.0"
 gem "activemodel-serializers-xml"
 gem "rails-controller-testing"
-gem "sinatra", "~> 2.0.0.rc2"
 
 gemspec path: "../"