Merge pull request #1505 from bf4/simplecov_fix

Update SimpleCov; remove compatibility patch

Author: bf4

.simplecov

@@ -19,7 +19,6 @@ ENV['FULL_BUILD'] ||= ENV['CI']
 # rubocop:enable Style/DoubleNegation
 
 ## CONFIGURE SIMPLECOV
-SimpleCov.pid = $$ # In case there's any forking
 
 SimpleCov.profiles.define 'app' do
   coverage_dir 'coverage'

Gemfile

@@ -41,7 +41,6 @@ group :test do
   gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
 
   gem 'codeclimate-test-reporter', require: false
-  gem 'simplecov', '~> 0.10', require: false, group: :development
 end
 
 group :development, :test do

active_model_serializers.gemspec

@@ -51,6 +51,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'will_paginate', '~> 3.0', '>= 3.0.7'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'simplecov', '~> 0.11'
   spec.add_development_dependency 'timecop', '~> 0.7'
   spec.add_development_dependency 'minitest-reporters'
   spec.add_development_dependency 'grape', ['>= 0.13', '< 1.0']