From c1784cee26629bdd012d2b10b207a45f655e214d Mon Sep 17 00:00:00 2001
From: Alex Reisner <alex@alexreisner.com>
Date: Fri, 15 Jun 2018 17:10:06 -0600
Subject: [PATCH] Drop Ruby 1.9.3 support.
---
.travis.yml | 22 ----------------------
README.md | 2 +-
gemfiles/Gemfile.ruby1.9.3 | 35 -----------------------------------
geocoder.gemspec | 2 +-
lib/geocoder/exceptions.rb | 2 +-
5 files changed, 3 insertions(+), 60 deletions(-)
delete mode 100644 gemfiles/Gemfile.ruby1.9.3
diff --git a/.travis.yml b/.travis.yml
index fe90d5e3..ae2020d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,6 @@ env:
- DB=postgres
- DB=mysql
rvm:
- - 1.9.3
- 2.0.0
- 2.1.10
- 2.2.10
@@ -20,7 +19,6 @@ rvm:
- jruby-19mode
gemfile:
- Gemfile
- - gemfiles/Gemfile.ruby1.9.3
- gemfiles/Gemfile.rails3.2
- gemfiles/Gemfile.rails4.1
- gemfiles/Gemfile.rails5.0
@@ -29,14 +27,6 @@ before_install:
- gem update --system
matrix:
exclude:
- - rvm: 1.9.3
- gemfile: Gemfile
- - rvm: 1.9.3
- gemfile: gemfiles/Gemfile.rails3.2
- - rvm: 1.9.3
- gemfile: gemfiles/Gemfile.rails4.1
- - rvm: 1.9.3
- gemfile: gemfiles/Gemfile.rails5.0
- env: DB=
gemfile: gemfiles/Gemfile.rails3.2
- env: DB=
@@ -45,8 +35,6 @@ matrix:
gemfile: gemfiles/Gemfile.rails5.0
- rvm: 2.0.0
gemfile: Gemfile
- - rvm: 2.0.0
- gemfile: gemfiles/Gemfile.ruby1.9.3
- rvm: 2.0.0
gemfile: gemfiles/Gemfile.rails5.0
- rvm: 2.1.10
@@ -55,20 +43,10 @@ matrix:
gemfile: gemfiles/Gemfile.ruby1.9.3
- rvm: 2.1.10
gemfile: gemfiles/Gemfile.rails5.0
- - rvm: 2.2.10
- gemfile: gemfiles/Gemfile.ruby1.9.3
- - rvm: jruby-19mode
- gemfile: gemfiles/Gemfile.ruby1.9.3
- - rvm: 2.3.7
- gemfile: gemfiles/Gemfile.ruby1.9.3
- rvm: 2.4.4
gemfile: gemfiles/Gemfile.rails4.1
- rvm: 2.5.1
gemfile: gemfiles/Gemfile.rails4.1
- - rvm: 2.4.4
- gemfile: gemfiles/Gemfile.ruby1.9.3
- - rvm: 2.5.1
- gemfile: gemfiles/Gemfile.ruby1.9.3
- rvm: 2.4.4
gemfile: gemfiles/Gemfile.rails3.2
- rvm: 2.5.1
diff --git a/README.md b/README.md
index cfe71199..993030d1 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Key features:
Compatibility:
-* Supports multiple Ruby versions: Ruby 1.9.3, 2.x, and JRuby.
+* Supports multiple Ruby versions: Ruby 2.x, and JRuby.
* Supports multiple databases: MySQL, PostgreSQL, SQLite, and MongoDB (1.7.0 and higher).
* Supports Rails 3, 4, and 5. If you need to use it with Rails 2 please see the `rails2` branch (no longer maintained, limited feature set).
* Works very well outside of Rails, you just need to install either the `json` (for MRI) or `json_pure` (for JRuby) gem.
diff --git a/gemfiles/Gemfile.ruby1.9.3 b/gemfiles/Gemfile.ruby1.9.3
deleted file mode 100644
index cc8f6619..00000000
--- a/gemfiles/Gemfile.ruby1.9.3
+++ /dev/null
@@ -1,35 +0,0 @@
-source "https://rubygems.org"
-
-group :development, :test do
- gem 'rake', '12.2.1'
- gem 'mongoid', '2.6.0'
- gem 'bson_ext', :platforms => :ruby
- gem 'geoip'
- gem 'rubyzip'
- gem 'rack-cache', '1.7.1'
- gem 'rails'
- gem 'sqlite3'
- gem 'sqlite_ext', '~> 1.5.0'
- gem 'pg', '0.18.4'
- gem 'mysql2', '~> 0.3.11'
- gem 'public_suffix', '1.4.6'
-
- # i18n gem >=0.7.0 does not work with Ruby 1.9.2
- gem 'i18n', '0.6.1'
- gem 'test-unit' # install newer version with omit() method
-
- gem 'debugger'
- gem 'webmock', '2.3.2'
-
- platforms :jruby do
- gem 'jruby-openssl'
- gem 'jgeoip'
- end
-
- platforms :rbx do
- gem 'rubysl', '~> 2.0'
- gem 'rubysl-test-unit'
- end
-end
-
-gemspec :path => '../'
diff --git a/geocoder.gemspec b/geocoder.gemspec
index 9a4fd52d..40c812fe 100644
--- a/geocoder.gemspec
+++ b/geocoder.gemspec
@@ -5,7 +5,7 @@ require "geocoder/version"
Gem::Specification.new do |s|
s.name = "geocoder"
- s.required_ruby_version = '>= 1.9.3'
+ s.required_ruby_version = '>= 2.0.0'
s.version = Geocoder::VERSION
s.platform = Gem::Platform::RUBY
s.authors = ["Alex Reisner"]
diff --git a/lib/geocoder/exceptions.rb b/lib/geocoder/exceptions.rb
index 228c45b3..2e6a21be 100644
--- a/lib/geocoder/exceptions.rb
+++ b/lib/geocoder/exceptions.rb
@@ -1,4 +1,4 @@
-require 'timeout' # required for Ruby 1.9.3
+require 'timeout'
module Geocoder
--
GitLab