Merge pull request #61 from ioki-mobility/rails-7-compat

Rails 7 compatibility

.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+Gemfile.lock
 
 # rspec failure tracking
 .rspec_status

.ruby-version

@@ -1 +1 @@
-2.7.6
+3.2.2

Gemfile

@@ -4,13 +4,11 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'activesupport'
-gem 'faraday', '~> 2.7'
-gem 'webmock'
-gem 'rake', '~> 13.0'
-gem 'rspec', '~> 3.0'
-gem 'rubocop', '~> 1.35'
-gem 'rubocop-rspec'
-
-gem 'guard', '~> 2.18'
-gem 'guard-rspec', require: false
+group 'development' do
+  gem 'guard', '~> 2.18'
+  gem 'guard-rspec', require: false
+  gem 'rspec', '~> 3.0'
+  gem 'rubocop', '~> 1.35'
+  gem 'rubocop-rspec'
+  gem 'webmock'
+end

airship-ruby.gemspec

@@ -39,11 +39,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activesupport', '~> 6.1'
+  spec.add_dependency 'activesupport', '>= 6.1', '< 8.0'
   spec.add_dependency 'faraday', '~> 2.7'
+  spec.add_dependency 'rake', '~> 13.0'
 
-  spec.add_development_dependency 'bundler', '~> 2.3'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
   spec.metadata['rubygems_mfa_required'] = 'true'
 end

spec/spec_helper.rb

@@ -7,6 +7,9 @@
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/securerandom'
 require 'active_support/core_ext/time/zones'
+require 'active_support/version'
+require 'active_support/deprecation' if ActiveSupport::VERSION::MAJOR > 6
+require 'active_support/isolated_execution_state' if ActiveSupport::VERSION::MAJOR > 6
 require 'webmock/rspec'
 
 Dir['./spec/support/**/*.rb'].sort.each { |f| require f }