From fcb7babb2639c4a02fe38ac2b8c5494a204bc6e6 Mon Sep 17 00:00:00 2001 From: "M.Shibuya" Date: Sat, 10 Feb 2018 15:13:56 +0900 Subject: [PATCH] Do not install pg for JRuby --- Gemfile | 1 + gemfiles/rails-4-0.gemfile | 2 +- gemfiles/rails-4-1.gemfile | 2 +- gemfiles/rails-4-2.gemfile | 2 +- gemfiles/rails-5-0.gemfile | 2 +- gemfiles/rails-5-1.gemfile | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 452c9bae2..73c5dc15b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,6 @@ source "https://rubygems.org" gem "activemodel-serializers-xml" +gem 'pg', '~> 0.21.0', platforms: :ruby gemspec diff --git a/gemfiles/rails-4-0.gemfile b/gemfiles/rails-4-0.gemfile index 56881504e..fec1290e2 100644 --- a/gemfiles/rails-4-0.gemfile +++ b/gemfiles/rails-4-0.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" gem "rails", "~> 4.0.0" gem "railties", "~> 4.0.0" -gem 'pg', '~> 0.21.0' +gem 'pg', '~> 0.21.0', platforms: :ruby gem "activerecord-jdbcpostgresql-adapter", "~> 1.3", platforms: :jruby gemspec :path => "../" diff --git a/gemfiles/rails-4-1.gemfile b/gemfiles/rails-4-1.gemfile index 57b7064f3..2bec01cea 100644 --- a/gemfiles/rails-4-1.gemfile +++ b/gemfiles/rails-4-1.gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" gem "rails", "~> 4.1.0" -gem 'pg', '~> 0.21.0' +gem 'pg', '~> 0.21.0', platforms: :ruby gem "activerecord-jdbcpostgresql-adapter", "~> 1.3", platforms: :jruby gemspec :path => "../" diff --git a/gemfiles/rails-4-2.gemfile b/gemfiles/rails-4-2.gemfile index c2a43c442..476335f54 100644 --- a/gemfiles/rails-4-2.gemfile +++ b/gemfiles/rails-4-2.gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" gem "rails", "~> 4.2.0" -gem 'pg', '~> 0.21.0' +gem 'pg', '~> 0.21.0', platforms: :ruby gem "activerecord-jdbcpostgresql-adapter", "~> 1.3", platforms: :jruby gemspec :path => "../" diff --git a/gemfiles/rails-5-0.gemfile b/gemfiles/rails-5-0.gemfile index c6971e226..c8763593a 100644 --- a/gemfiles/rails-5-0.gemfile +++ b/gemfiles/rails-5-0.gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" gem "rails", "~> 5.0.0" -gem 'pg', '~> 0.21.0' +gem 'pg', '~> 0.21.0', platforms: :ruby gem "activemodel-serializers-xml" gem "activerecord-jdbcpostgresql-adapter", "~> 50.0", platforms: :jruby diff --git a/gemfiles/rails-5-1.gemfile b/gemfiles/rails-5-1.gemfile index a0f2d43e2..3886c7b12 100644 --- a/gemfiles/rails-5-1.gemfile +++ b/gemfiles/rails-5-1.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" gem "rails", "~> 5.1.0" gem "activemodel-serializers-xml" -gem 'pg', '~> 0.21.0' +gem 'pg', '~> 0.21.0', platforms: :ruby gem "activerecord-jdbcpostgresql-adapter", "~> 51.0", platforms: :jruby gemspec :path => "../"