Merge 330c43d into 7ea8b72

.travis.yml

@@ -1,18 +1,18 @@
 language: ruby
 rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.2.10
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
   - ruby-head
-  - jruby-head
 env:
-  - "ACTIVE_RECORD_VERSION=4.2.0"
-  - "ACTIVE_RECORD_VERSION=~5.0.0"
-  - "ACTIVE_RECORD_VERSION=~5.1.0"
+  - "ACTIVE_RECORD_VERSION=4.2"
+  - "ACTIVE_RECORD_VERSION=~5.0"
+  - "ACTIVE_RECORD_VERSION=~5.1"
+  - "ACTIVE_RECORD_VERSION=~5.2"
   - "ACTIVE_RECORD_VERSION=master"
 matrix:
   allow_failures:
     - env: "ACTIVE_RECORD_VERSION=master"
     - rvm: ruby-head
-    - rvm: jruby-head
 sudo: false

Gemfile

@@ -8,7 +8,7 @@ active_record_version = case ENV['ACTIVE_RECORD_VERSION'] || 'default'
 when 'master'
   { git: 'https://github.com/rails/rails.git' }
 when 'default'
-  '~> 5.1'
+  '~> 5.2'
 else
   "~> #{ENV['ACTIVE_RECORD_VERSION']}"
 end
@@ -19,13 +19,9 @@ group :test do
 end
 
 group :development do
-  gem 'activerecord', '>= 4.2.0', '< 5.2'
+  gem 'activerecord', '>= 4.2.0', '< 6.0'
 
   platforms :ruby do
     gem 'sqlite3'
   end
-
-  platforms :jruby do
-    gem "activerecord-jdbcsqlite3-adapter"
-  end
 end

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '2'
 services:
   lib:
-    image: sticksnleaves/ruby-project:2.4
+    image: sticksnleaves/ruby-project:2.5
     command: rspec
     volumes:
       - .:/usr/src/app

lib/soulless/version.rb

@@ -1,3 +1,3 @@
 module Soulless
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

soulless.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'activemodel', '>= 4.2.0', '< 5.2'
+  spec.add_dependency 'activemodel', '>= 4.2.0', '< 6.0'
   spec.add_dependency 'virtus' , '~> 1.0'
 
   spec.add_development_dependency 'bundler', '>= 0'