From 132ecf255c065eca05fe79152203dfb9b57ff464 Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Sat, 3 Dec 2016 13:51:28 +0100 Subject: [PATCH] Gemfiles for building versions separately dropped (#461) - simpler build by using the ruby version marker in shared gemfile --- .travis.yml | 4 ---- gemfiles/Gemfile.2_1 | 3 --- gemfiles/Gemfile.2_3_1 | 3 --- gemfiles/Gemfile.2_4_0 | 3 --- gemfiles/Gemfile.jruby-9.1 | 3 --- 5 files changed, 16 deletions(-) delete mode 100644 gemfiles/Gemfile.2_1 delete mode 100644 gemfiles/Gemfile.2_3_1 delete mode 100644 gemfiles/Gemfile.2_4_0 delete mode 100644 gemfiles/Gemfile.jruby-9.1 diff --git a/.travis.yml b/.travis.yml index 8af68e8..1638a27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,14 +14,10 @@ matrix: script: gem build github_changelog_generator && bundle install gemfile: spec/install-gem-in-bundler.gemfile - rvm: 2.1 - gemfile: gemfiles/Gemfile.2_1 - rvm: 2.3.3 - gemfile: gemfiles/Gemfile.2_3_1 - rvm: 2.4.0-preview3 - gemfile: gemfiles/Gemfile.2_4_0 - rvm: jruby-9.1.6.0 jdk: oraclejdk8 - gemfile: gemfiles/Gemfile.jruby-9.1 env: - JRUBY_OPTS=--debug diff --git a/gemfiles/Gemfile.2_1 b/gemfiles/Gemfile.2_1 deleted file mode 100644 index 08b4bff..0000000 --- a/gemfiles/Gemfile.2_1 +++ /dev/null @@ -1,3 +0,0 @@ -eval_gemfile File.expand_path('../../Gemfile', __FILE__) -gem 'rack', '~> 1.6' -gem 'activesupport', '~> 4' diff --git a/gemfiles/Gemfile.2_3_1 b/gemfiles/Gemfile.2_3_1 deleted file mode 100644 index 891a19f..0000000 --- a/gemfiles/Gemfile.2_3_1 +++ /dev/null @@ -1,3 +0,0 @@ -eval_gemfile File.expand_path('../../Gemfile', __FILE__) -gem 'rack', '>= 2' -gem 'activesupport', '>= 4' diff --git a/gemfiles/Gemfile.2_4_0 b/gemfiles/Gemfile.2_4_0 deleted file mode 100644 index f48ce89..0000000 --- a/gemfiles/Gemfile.2_4_0 +++ /dev/null @@ -1,3 +0,0 @@ -eval_gemfile File.expand_path('../../Gemfile', __FILE__) -gem 'rack', '>= 2' - diff --git a/gemfiles/Gemfile.jruby-9.1 b/gemfiles/Gemfile.jruby-9.1 deleted file mode 100644 index f48ce89..0000000 --- a/gemfiles/Gemfile.jruby-9.1 +++ /dev/null @@ -1,3 +0,0 @@ -eval_gemfile File.expand_path('../../Gemfile', __FILE__) -gem 'rack', '>= 2' -