From 4fb0b09728cc3572a925711ddb7b17cf880380f5 Mon Sep 17 00:00:00 2001 From: Stephen MacVicar Date: Fri, 28 Oct 2022 08:11:07 -0400 Subject: [PATCH] FI-1767: Update core and ruby versions (#18) --- .ruby-version | 2 +- .tool-versions | 2 +- Dockerfile | 2 +- Gemfile.lock | 85 ++++++++++++++++++++++---------------------- ips_test_kit.gemspec | 6 ++-- 5 files changed, 49 insertions(+), 48 deletions(-) diff --git a/.ruby-version b/.ruby-version index e2bdf6e..6ebad14 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.3 \ No newline at end of file +3.1.2 \ No newline at end of file diff --git a/.tool-versions b/.tool-versions index fde9f5b..b8ab7ea 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -ruby 2.7.3 \ No newline at end of file +ruby 3.1.2 \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 9eb5ec7..d32710c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.7.3 +FROM ruby:3.1.2 ENV INSTALL_PATH=/opt/inferno/ ENV APP_ENV=production diff --git a/Gemfile.lock b/Gemfile.lock index f96880c..0222e45 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,8 +1,8 @@ PATH remote: . specs: - ips_test_kit (0.0.3) - inferno_core (> 0.1.3) + ips_test_kit (0.1.0) + inferno_core (>= 0.4.2) GEM remote: https://rubygems.org/ @@ -35,15 +35,14 @@ GEM dotenv (2.8.1) dry-auto_inject (0.9.0) dry-container (>= 0.3.4) - dry-configurable (0.12.0) + dry-configurable (0.13.0) concurrent-ruby (~> 1.0) - dry-core (~> 0.5, >= 0.5.0) - dry-container (0.8.0) + dry-core (~> 0.6) + dry-container (0.9.0) concurrent-ruby (~> 1.0) - dry-configurable (~> 0.1, >= 0.1.3) + dry-configurable (~> 0.13, >= 0.13.0) dry-core (0.8.1) concurrent-ruby (~> 1.0) - dry-equalizer (0.3.0) dry-inflector (0.3.0) dry-logic (1.2.0) concurrent-ruby (~> 1.0) @@ -52,15 +51,15 @@ GEM dry-core (~> 0.5, >= 0.5) dry-types (~> 1.5) ice_nine (~> 0.11) - dry-system (0.18.1) + dry-system (0.20.0) concurrent-ruby (~> 1.0) dry-auto_inject (>= 0.4.0) - dry-configurable (~> 0.11, >= 0.11.1) - dry-container (~> 0.7, >= 0.7.2) - dry-core (~> 0.3, >= 0.3.1) - dry-equalizer (~> 0.2) + dry-configurable (~> 0.13, >= 0.13.0) + dry-container (~> 0.9, >= 0.9.0) + dry-core (~> 0.5, >= 0.5) dry-inflector (~> 0.1, >= 0.1.2) dry-struct (~> 1.0) + dry-transformer (0.1.1) dry-types (1.5.1) concurrent-ruby (~> 1.0) dry-container (~> 0.3) @@ -120,39 +119,39 @@ GEM date_time_precision (>= 0.8) mime-types (>= 3.0) nokogiri (>= 1.11.4) - hanami-controller (1.3.3) - hanami-utils (~> 1.3) + hanami-controller (2.0.0.beta1) + dry-configurable (~> 0.13, >= 0.13.0) + hanami-utils (~> 2.0.beta) rack (~> 2.0) - hanami-router (1.3.2) - hanami-utils (~> 1.3) - http_router (= 0.11.2) + hanami-router (2.0.0.beta2) + mustermann (~> 1.0) + mustermann-contrib (~> 1.0) rack (~> 2.0) - hanami-utils (1.3.8) + hanami-utils (2.0.0.beta1) concurrent-ruby (~> 1.0) - transproc (~> 1.0) + dry-transformer (~> 0.1) + hansi (0.2.1) hashdiff (1.0.1) http-accept (1.7.0) http-cookie (1.0.5) domain_name (~> 0.5) - http_router (0.11.2) - rack (>= 1.0.0) - url_mount (~> 0.2.1) i18n (1.12.0) concurrent-ruby (~> 1.0) ice_nine (0.11.2) - inferno_core (0.3.11) + inferno_core (0.4.2) activesupport (~> 6.1) blueprinter (= 0.25.2) dotenv (~> 2.7) - dry-configurable (= 0.12.0) - dry-container (= 0.8.0) - dry-system (= 0.18.1) + dry-configurable (= 0.13.0) + dry-container (= 0.9.0) + dry-core (= 0.8.1) + dry-system (= 0.20.0) faraday (~> 1.2) faraday_middleware (~> 1.2) fhir_client (>= 5.0.3) fhir_models (>= 4.2.2) - hanami-controller (~> 1.3) - hanami-router (~> 1.3) + hanami-controller (= 2.0.0.beta1) + hanami-router (= 2.0.0.beta2) oj (= 3.11.0) pry pry-byebug @@ -161,7 +160,7 @@ GEM sequel (~> 5.42.0) sidekiq (~> 6.5.6) sqlite3 (~> 1.4) - thor (~> 1.1.0) + thor (~> 1.2.1) jwt (2.5.0) method_source (1.0.0) mime-types (3.4.1) @@ -172,14 +171,19 @@ GEM multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.2.3) + mustermann (1.1.2) + ruby2_keywords (~> 0.0.1) + mustermann-contrib (1.1.2) + hansi (~> 0.2.0) + mustermann (= 1.1.2) netrc (0.11.0) nio4r (2.5.8) - nokogiri (1.13.8) + nokogiri (1.13.9) mini_portile2 (~> 2.8.0) racc (~> 1.4) - nokogiri (1.13.8-x86_64-darwin) + nokogiri (1.13.9-x86_64-darwin) racc (~> 1.4) - nokogiri (1.13.8-x86_64-linux) + nokogiri (1.13.9-x86_64-linux) racc (~> 1.4) oauth2 (1.4.11) faraday (>= 0.17.3, < 3.0) @@ -222,29 +226,26 @@ GEM rspec-support (3.11.1) ruby2_keywords (0.0.5) sequel (5.42.0) - sidekiq (6.5.6) + sidekiq (6.5.7) connection_pool (>= 2.2.5) rack (~> 2.0) redis (>= 4.5.0, < 5) - sqlite3 (1.5.0) + sqlite3 (1.5.3) mini_portile2 (~> 2.8.0) - sqlite3 (1.5.0-x86_64-darwin) - sqlite3 (1.5.0-x86_64-linux) - thor (1.1.0) + sqlite3 (1.5.3-x86_64-darwin) + sqlite3 (1.5.3-x86_64-linux) + thor (1.2.1) tilt (2.0.11) - transproc (1.1.1) tzinfo (2.0.5) concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext unf_ext (0.0.8.2) - url_mount (0.2.1) - rack webmock (3.18.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - zeitwerk (2.6.0) + zeitwerk (2.6.1) PLATFORMS ruby @@ -260,4 +261,4 @@ DEPENDENCIES webmock (~> 3.11) BUNDLED WITH - 2.2.32 + 2.3.23 diff --git a/ips_test_kit.gemspec b/ips_test_kit.gemspec index c253876..8b82a83 100644 --- a/ips_test_kit.gemspec +++ b/ips_test_kit.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |spec| spec.name = 'ips_test_kit' - spec.version = '0.0.3' + spec.version = '0.1.0' spec.authors = ['MITRE'] spec.email = ['inferno@groups.mitre.org'] spec.date = Time.now.utc.strftime('%Y-%m-%d') @@ -8,12 +8,12 @@ Gem::Specification.new do |spec| spec.description = 'IPS Tests' spec.homepage = 'https://github.com/inferno-framework/ips-test-kit' spec.license = 'Apache-2.0' - spec.add_runtime_dependency 'inferno_core', '> 0.1.3' + spec.add_runtime_dependency 'inferno_core', '>= 0.4.2' spec.add_development_dependency 'database_cleaner-sequel', '~> 1.8' spec.add_development_dependency 'factory_bot', '~> 6.1' spec.add_development_dependency 'rspec', '~> 3.10' spec.add_development_dependency 'webmock', '~> 3.11' - spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0') + spec.required_ruby_version = Gem::Requirement.new('>= 3.1.2') spec.metadata['homepage_uri'] = spec.homepage spec.metadata['source_code_uri'] = 'https://github.com/inferno-framework/ips-test-kit' spec.files = [