Merge pull request #25 from JesseEmond/unversion-gemfile

coderhs · coderhs · commit 1a85f8cd50ba · 2015-09-02T13:22:53.000+05:30
Unversion Gemfile.lock
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,5 @@
 *#
 *.DS_Store
 log/*
-tmp/*
+tmp/*
+Gemfile.lock
diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,4 @@
 source 'http://rubygems.org'
 
-gem 'rspec'
-gem 'vcr'
-gem 'webmock'
+# gem's dependencies should be in open_weather.gemspec
+gemspec
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/open_weather.gemspec b/open_weather.gemspec
@@ -17,5 +17,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec', '~> 2.13', '>= 2.13.0'
   gem.add_development_dependency 'vcr', '~> 2.9', '>= 2.9.2'
   gem.add_development_dependency 'webmock', '~> 1.18', '>= 1.18.0'
-  gem.add_runtime_dependency 'json', '~> 0'
+  gem.add_runtime_dependency 'json', '~> 1'
 end
