diff --git a/.travis.yml b/.travis.yml index fe90d5e345aeae31f02cac50b7521512b96a0fa2..ae2020d65968686eff890b606bc82d7160a4361b 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 cfe71199fc1c21228d6680387dd76408e7b981a0..993030d1246a54f82e45371411690b89f517d67a 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 cc8f661976774b45e1db51f369588a3c16c08af7..0000000000000000000000000000000000000000 --- 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 9a4fd52d1150570d4b90acb7442168a2487fd717..40c812fe7bd61c1f74873bdb3c6bd828fbf63ebd 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 228c45b3a91739d311c341d0078e14c2beb02894..2e6a21beb68ae5dbe5f7ddcc9d722a84acfcc276 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