gemfiles/sinatra_14.gemfile in kaminari-sinatra-1.0.0 vs gemfiles/sinatra_14.gemfile in kaminari-sinatra-1.0.1
- old
+ new
@@ -2,13 +2,13 @@
git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
"https://github.com/#{repo_name}.git"
end
-#FIXME bundle GH master for now
-gem 'kaminari-core', github: 'amatsuda/kaminari'
-gem 'kaminari-activerecord', github: 'amatsuda/kaminari'
+# bundle GH master to load kaminari-core/test directory which is not included in the packaged gems
+gem 'kaminari-core', github: 'kaminari/kaminari'
+gem 'kaminari-activerecord', github: 'kaminari/kaminari'
gem 'activerecord', '>= 4.2.0', :require => 'active_record'
#FIXME need to bundle AV for now, because the helper still depends on ActionView
gem 'actionview', '>= 4.2.0', :require => 'action_view'
#FIXME need to bundle AC for now, because ActionView still depends on ActionController
@@ -18,14 +18,10 @@
gem 'rack-test', '>= 0'
gem 'sinatra-contrib', '~> 1.4.0'
gem 'mime-types', '2.99' if RUBY_VERSION < '2.0.0'
platforms :ruby do
- if RUBY_VERSION > "2.1.0"
- gem 'sqlite3'
- else
- gem 'sqlite3', '1.3.8'
- end
+ gem 'sqlite3', RUBY_VERSION > '2.1.0' ? '> 0' : '1.3.8'
end
platforms :jruby do
gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
end