Skip to content

Commit

Permalink
Merge pull request #105 from qpowell/update-httparty
Browse files Browse the repository at this point in the history
v1.0.0
  • Loading branch information
edwinwills authored Oct 17, 2017
2 parents f5709ae + 6690d05 commit cb33d8b
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 19 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
language: ruby
rvm:
- 1.9.3
- 2.1.3
- 2.2.5
- 2.3.1
script: bundle exec rspec
before_script: cp spec/api_key.travis.rb spec/api_key.rb
after_script: rm spec/api_key.rb
before_install:
- gem install bundler -v 1.14.4
- gem install bundler -v 1.14.6
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 1.0.0

- Upgraded httparty 0.14.0 -> 0.15.6
- Dropped support for Ruby 1.9.x (required for the httparty upgrade)
- Upgraded RSpec 3.5.0 -> 3.6.0

## 0.34.2

- Add the `matched_substrings` attribute to the Prediction results (for autocomplete results)
Expand Down
30 changes: 15 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
PATH
remote: .
specs:
google_places (0.34.2)
httparty (>= 0.13.1, < 0.14.1)
google_places (1.0.0)
httparty (>= 0.13.1)

GEM
remote: http://rubygems.org/
Expand All @@ -11,23 +11,23 @@ GEM
crack (0.4.3)
safe_yaml (~> 1.0.0)
diff-lcs (1.3)
hashdiff (0.3.2)
httparty (0.14.0)
hashdiff (0.3.7)
httparty (0.15.6)
multi_xml (>= 0.5.2)
multi_xml (0.6.0)
rspec (3.5.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.5.0)
rspec-core (3.5.4)
rspec-support (~> 3.5.0)
rspec-expectations (3.5.0)
rspec (3.6.0)
rspec-core (~> 3.6.0)
rspec-expectations (~> 3.6.0)
rspec-mocks (~> 3.6.0)
rspec-core (3.6.0)
rspec-support (~> 3.6.0)
rspec-expectations (3.6.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
rspec-mocks (3.5.0)
rspec-support (~> 3.6.0)
rspec-mocks (3.6.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
rspec-support (~> 3.6.0)
rspec-support (3.6.0)
safe_yaml (1.0.4)
vcr (2.9.3)
webmock (1.24.6)
Expand Down
4 changes: 2 additions & 2 deletions google_places.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)

Gem::Specification.new do |s|
s.name = 'google_places'
s.version = '0.34.2'
s.version = '1.0.0'
s.platform = Gem::Platform::RUBY
s.authors = ['Marcel de Graaf']
s.email = ['[email protected]']
Expand All @@ -17,7 +17,7 @@ Gem::Specification.new do |s|
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
s.require_paths = ['lib']

s.add_dependency 'httparty', ['>= 0.13.1', '< 0.14.1']
s.add_dependency 'httparty', '>= 0.13.1'
s.add_development_dependency 'rspec', '~> 3.0'
s.add_development_dependency 'addressable', '~> 2.4.0'
s.add_development_dependency 'webmock', '~> 1.18'
Expand Down

0 comments on commit cb33d8b

Please sign in to comment.