ONYX-14080: Bump to V5.0.0 with Ruby 3

cyberark · Feb 6, 2022 · f1f5961 · f1f5961
2 parents 639f4ac + 587b95e
commit f1f5961
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # unreleased version
 
+# v5.0.0
+
+* Support Ruby 3.
+* Bump `slosilo` to v3.0 with ruby 3.
+* Remove pinned `bundler` version, use default system bundler.
+
 # v4.2.0
 
 * Bump `slosilo` to v2.2 in order to be FIPS compliant

diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 # make sure github uses TLS
 git_source(:github) { |name| "https://github.com/#{name}.git" }
 
-#ruby=ruby-2.3.4
+#ruby=ruby-3.0
 #ruby-gemset=conjur-rack
 
 # Specify your gem's dependencies in conjur-rack.gemspec

diff --git a/conjur-rack.gemspec b/conjur-rack.gemspec
@@ -18,13 +18,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "slosilo", "~> 2.2"
+  spec.add_dependency "slosilo", "~> 3.0"
   spec.add_dependency "conjur-api", "< 6"
   spec.add_dependency "rack", "~> 2"
-
-  spec.add_development_dependency "bundler", "~> 2.2.18"
+
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "activesupport", "< 7"
   spec.add_development_dependency 'ci_reporter_rspec'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rspec-its'

diff --git a/lib/conjur/rack/version.rb b/lib/conjur/rack/version.rb
@@ -1,5 +1,5 @@
 module Conjur
   module Rack
-    VERSION = "4.2.0"
+    VERSION = "5.0.0"
   end
 end
diff --git a/test.sh b/test.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-TEST_IMAGE='ruby:2.5'
+TEST_IMAGE='ruby:3.0'
 
 rm -f Gemfile.lock
 
@@ -9,4 +9,4 @@ docker run --rm \
   -w /usr/src/app \
   -e CONJUR_ENV=ci \
   $TEST_IMAGE \
-  bash -c "gem update --system && gem install bundler:2.2.18 && bundle update && bundle exec rake spec"
+  bash -c "gem update --system && bundle update && bundle exec rake spec"