Merge pull request #379 from rom-rb/depend-on-rom

Rely on rom from master for now

Author: solnic

.github/workflows/custom/ci.yml

@@ -31,11 +31,9 @@ jobs:
           - ruby: "2.7.0"
             fail_on_warnings: "true"
             dry_types_from_master: "true"
-            rom_core_from_master: "true"
             sequel_from_master: "true"
     env:
       APT_DEPS: "libpq-dev libmysqlclient-dev libsqlite3-dev"
       FAIL_ON_WARNINGS: ${{matrix.fail_on_warnings}}
       DRY_TYPES_FROM_MASTER: ${{matrix.dry_types_from_master}}
-      ROM_CORE_FROM_MASTER: ${{matrix.rom_core_from_master}}
       SEQUEL_FROM_MASTER: ${{matrix.sequel_from_master}}

Gemfile

@@ -4,16 +4,16 @@ gemspec
 
 eval_gemfile 'Gemfile.devtools'
 
-if ENV['ROM_CORE_FROM_MASTER'].eql?('true')
-  gem 'rom-core', git: 'https://github.com/rom-rb/rom.git', branch: 'master'
-end
+gem 'rom', git: 'https://github.com/rom-rb/rom.git', branch: 'master'
 
 if ENV['DRY_TYPES_FROM_MASTER'].eql?('true')
   gem 'dry-types', git: 'https://github.com/dry-rb/dry-types.git', branch: 'master'
 end
 
 if ENV['SEQUEL_FROM_MASTER'].eql?('true')
   gem 'sequel', git: 'https://github.com/jeremyevans/sequel.git', branch: 'master'
+else
+  gem 'sequel', '5.31.0'
 end
 
 group :test do

rom-sql.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'dry-equalizer', '~> 0.2'
   spec.add_runtime_dependency 'dry-types', '~> 1.0'
   spec.add_runtime_dependency 'dry-core', '~> 0.4'
-  spec.add_runtime_dependency 'rom-core', '~> 5.2', '>= 5.2.1'
+  spec.add_runtime_dependency 'rom', '~> 5.2', '>= 5.2.1'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '~> 13.0'