only install trilogy and trilogy adapter if AR is >= 7.0

zmariscal · Feb 4, 2024 · 4fb4c4f · 4fb4c4f
1 parent fabc47f
commit 4fb4c4f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -126,7 +126,7 @@ jobs:
           bundle exec rake test:spatialite
           bundle exec rake test:sqlite3
       - name: Run trilogy tests
-        if: ${{ matrix.env.AR_VERSION >= '6.0' && matrix.ruby != 'jruby' }}
+        if: ${{ matrix.env.AR_VERSION >= '7.0' && matrix.ruby != 'jruby' }}
         run: bundle exec rake test:trilogy
   lint:
     runs-on: ubuntu-latest

diff --git a/Gemfile b/Gemfile
@@ -26,8 +26,8 @@ platforms :ruby do
   gem "sqlite3",                "~> #{sqlite3_version}"
   # seamless_database_pool requires Ruby ~> 2.0
   gem "seamless_database_pool", "~> 1.0.20" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.0.0')
-  gem "trilogy" if version >= 6.0
-  if version >= 6.0 && version <= 7.0
+  gem "trilogy" if version >= 7.0
+  if version <= 7.0
     gem "activerecord-trilogy-adapter"
   end
 end

diff --git a/gemfiles/6.0.gemfile b/gemfiles/6.0.gemfile
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
 gem 'activerecord', '~> 6.0.0'
-gem 'composite_primary_keys'
+gem 'composite_primary_keys', '~> 12.0'
diff --git a/gemfiles/6.1.gemfile b/gemfiles/6.1.gemfile
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
 gem 'activerecord', '~> 6.1.0'
-gem 'composite_primary_keys'
+gem 'composite_primary_keys', '~> 13.0'