Merge branch 'e2ee-2629-ruby-3.4' into 'master'

feat(ruby): add ruby 3.4.1, drop 3.1, bump other versions

See merge request TankerHQ/sdk-ruby!180

.gitlab-ci.yml

@@ -5,13 +5,14 @@ include:
 
 variables:
   SDK_NATIVE_CONAN_REFERENCE: tanker/latest-stable@
-  RUBY_3_3: 3.3.0
-  RUBY_3_2: 3.2.2
-  RUBY_3_1: 3.1.4
+  RUBY_3_4: 3.4.1
+  RUBY_3_3: 3.3.6
+  RUBY_3_2: 3.2.6
+  RUBY_3_2_LEGACY: 3.2.2
   PROFILE_LINUX: --profile linux-x86_64 shared no-http-backend
   PROFILE_MAC_X86: --profile macos-x86_64 shared no-http-backend
   PROFILE_MAC_ARM: --profile macos-armv8 shared no-http-backend
-  RBENV_VERSION: $RUBY_3_2
+  RBENV_VERSION: $RUBY_3_4
 
 
 ############
@@ -133,7 +134,6 @@ prepare/linux:
   extends:
     - .prepare
   variables:
-    RBENV_VERSION: $RUBY_3_2
     TANKER_PROFILES: $PROFILE_LINUX
   tags: !reference [.tags/linux, tags]
 
@@ -149,6 +149,7 @@ prepare/macos/arm:
     - .tags/macos/arm
     - .prepare
   variables:
+    RBENV_VERSION: $RUBY_3_2_LEGACY
     TANKER_PROFILES: $PROFILE_MAC_ARM
 
 ###############
@@ -165,27 +166,27 @@ prepare/macos/arm:
     - poetry run python run-ci.py --isolate-conan-user-home --remote $CONAN_REMOTE prepare --use-tanker=same-as-branch $TANKER_PROFILES
     - poetry run python run-ci.py --isolate-conan-user-home --remote $CONAN_REMOTE build --test
 
-check/native-from-sources/linux/3.1:
+check/native-from-sources/linux/3.2:
   extends:
     - .check/native-from-sources
   variables:
-    RBENV_VERSION: $RUBY_3_1
+    RBENV_VERSION: $RUBY_3_2
     TANKER_PROFILES: $PROFILE_LINUX
   tags: !reference [.tags/compilation-linux, tags]
 
-check/native-from-sources/linux/3.2:
+check/native-from-sources/linux/3.3:
   extends:
     - .check/native-from-sources
   variables:
-    RBENV_VERSION: $RUBY_3_2
+    RBENV_VERSION: $RUBY_3_3
     TANKER_PROFILES: $PROFILE_LINUX
   tags: !reference [.tags/compilation-linux, tags]
 
-check/native-from-sources/linux/3.3:
+check/native-from-sources/linux/3.4:
   extends:
     - .check/native-from-sources
   variables:
-    RBENV_VERSION: $RUBY_3_3
+    RBENV_VERSION: $RUBY_3_4
     TANKER_PROFILES: $PROFILE_LINUX
   tags: !reference [.tags/compilation-linux, tags]
 
@@ -201,6 +202,7 @@ check/native-from-sources/macos/arm:
     - .tags/macos/arm
     - .check/native-from-sources
   variables:
+    RBENV_VERSION: $RUBY_3_2_LEGACY
     TANKER_PROFILES: $PROFILE_MAC_ARM
 
 .rules/check/deployed-native:
@@ -216,31 +218,31 @@ check/native-from-sources/macos/arm:
   script:
     - poetry run python run-ci.py --isolate-conan-user-home --remote $CONAN_REMOTE build --test
 
-check/deployed-native/linux/3.1:
+check/deployed-native/linux/3.2:
   extends:
     - .check/deployed-native
   variables:
-    RBENV_VERSION: $RUBY_3_1
+    RBENV_VERSION: $RUBY_3_2
     TANKER_PROFILES: $PROFILE_LINUX
   needs:
     - prepare/linux
   tags: !reference [.tags/linux, tags]
 
-check/deployed-native/linux/3.2:
+check/deployed-native/linux/3.3:
   extends:
     - .check/deployed-native
   variables:
-    RBENV_VERSION: $RUBY_3_2
+    RBENV_VERSION: $RUBY_3_3
     TANKER_PROFILES: $PROFILE_LINUX
   needs:
     - prepare/linux
   tags: !reference [.tags/linux, tags]
 
-check/deployed-native/linux/3.3:
+check/deployed-native/linux/3.4:
   extends:
     - .check/deployed-native
   variables:
-    RBENV_VERSION: $RUBY_3_3
+    RBENV_VERSION: $RUBY_3_4
     TANKER_PROFILES: $PROFILE_LINUX
   needs:
     - prepare/linux
@@ -260,6 +262,7 @@ check/deployed-native/macos/arm:
     - .tags/macos/arm
     - .check/deployed-native
   variables:
+    RBENV_VERSION: $RUBY_3_2_LEGACY
     TANKER_PROFILES: $PROFILE_MAC_ARM
   needs:
     - prepare/macos/arm
@@ -273,30 +276,30 @@ check/deployed-native/macos/arm:
     - poetry run python run-ci.py --isolate-conan-user-home --remote $CONAN_REMOTE prepare --use-tanker=upstream $TANKER_PROFILES
     - poetry run python run-ci.py --isolate-conan-user-home --remote $CONAN_REMOTE build --test
 
-check/downstream/linux/3.1:
+check/downstream/linux/3.2:
   extends:
     - .check/downstream
     - .rules/check/downstream/linux
   variables:
-    RBENV_VERSION: $RUBY_3_1
+    RBENV_VERSION: $RUBY_3_2
     TANKER_PROFILES: $PROFILE_LINUX
   tags: !reference [.tags/linux, tags]
 
-check/downstream/linux/3.2:
+check/downstream/linux/3.3:
   extends:
     - .check/downstream
     - .rules/check/downstream/linux
   variables:
-    RBENV_VERSION: $RUBY_3_2
+    RBENV_VERSION: $RUBY_3_3
     TANKER_PROFILES: $PROFILE_LINUX
   tags: !reference [.tags/linux, tags]
 
-check/downstream/linux/3.3:
+check/downstream/linux/3.4:
   extends:
     - .check/downstream
     - .rules/check/downstream/linux
   variables:
-    RBENV_VERSION: $RUBY_3_3
+    RBENV_VERSION: $RUBY_3_4
     TANKER_PROFILES: $PROFILE_LINUX
   tags: !reference [.tags/linux, tags]
 
@@ -314,7 +317,7 @@ check/downstream/macos/arm:
     - .check/downstream
     - .rules/check/downstream/macos/arm
   variables:
-    RBENV_VERSION: $RUBY_3_2
+    RBENV_VERSION: $RUBY_3_2_LEGACY
     TANKER_PROFILES: $PROFILE_MAC_ARM
 
 ################

.rubocop.yml

@@ -9,7 +9,7 @@ AllCops:
     - 'vendor/**/*'
     - 'build/**/*'
     - 'lib/tanker-core.rb'
-  TargetRubyVersion: 3.1
+  TargetRubyVersion: 3.2
 
 Layout/LineLength:
   Max: 120

Gemfile

@@ -8,11 +8,12 @@ gemspec
 
 # Add development, test, and ci dependencies below, they won't be declared, or
 # loaded when the gem is published:
+gem 'base64', '~> 0.2'
 gem 'bundler', '~> 2.0'
 gem 'bundler-audit', '~> 0.7'
-gem 'faraday-net_http_persistent', '~> 2.1'
+gem 'faraday-net_http_persistent', '~> 2.3'
 gem 'rake', '~> 13.0'
 gem 'rspec', '~> 3.0'
 gem 'rubocop', '~> 1.13'
-gem 'rubygems-tasks', '~> 0.2.5'
+gem 'rubygems-tasks', '~> 0.2.6'
 gem 'tanker-identity', '~> 3.3.0'

Gemfile.lock

@@ -9,99 +9,104 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    bundler-audit (0.9.1)
+    base64 (0.2.0)
+    bundler-audit (0.9.2)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
     connection_pool (2.4.1)
+    date (3.4.1)
     diff-lcs (1.5.1)
-    faraday (2.9.0)
-      faraday-net_http (>= 2.0, < 3.2)
-    faraday-net_http (3.1.0)
-      net-http
-    faraday-net_http_persistent (2.1.0)
+    faraday (2.12.2)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
+    faraday-net_http (3.4.0)
+      net-http (>= 0.5.0)
+    faraday-net_http_persistent (2.3.0)
       faraday (~> 2.5)
-      net-http-persistent (~> 4.0)
-    ffi (1.16.3)
-    io-console (0.7.2)
-    irb (1.12.0)
-      rdoc
+      net-http-persistent (>= 4.0.4, < 5)
+    ffi (1.17.0)
+    io-console (0.8.0)
+    irb (1.14.3)
+      rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.7.1)
+    json (2.9.1)
     language_server-protocol (3.17.0.3)
-    net-http (0.4.1)
+    logger (1.6.4)
+    net-http (0.6.0)
       uri
-    net-http-persistent (4.0.2)
+    net-http-persistent (4.0.5)
       connection_pool (~> 2.2)
-    parallel (1.24.0)
-    parser (3.3.0.5)
+    parallel (1.26.3)
+    parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
-    psych (5.1.2)
+    psych (5.2.2)
+      date
       stringio
-    racc (1.7.3)
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.1.0)
-    rbnacl (7.1.1)
-      ffi
-    rdoc (6.6.3.1)
+    rake (13.2.1)
+    rbnacl (7.1.2)
+      ffi (~> 1)
+    rdoc (6.10.0)
       psych (>= 4.0.0)
-    regexp_parser (2.9.0)
-    reline (0.5.0)
+    regexp_parser (2.10.0)
+    reline (0.6.0)
       io-console (~> 0.5)
-    rexml (3.2.6)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
-    rubocop (1.62.1)
+    rspec-support (3.13.2)
+    rubocop (1.69.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.36.2, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.2)
-      parser (>= 3.3.0.4)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.37.0)
+      parser (>= 3.3.1.0)
     ruby-progressbar (1.13.0)
     rubygems-tasks (0.2.6)
       irb (~> 1.0)
       rake (>= 10.0.0)
-    stringio (3.1.0)
+    stringio (3.1.2)
     tanker-identity (3.3.0)
       rbnacl (~> 7.0)
-    thor (1.3.1)
-    unicode-display_width (2.5.0)
-    uri (0.13.0)
+    thor (1.3.2)
+    unicode-display_width (3.1.3)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uri (1.0.2)
 
 PLATFORMS
-  arm64-darwin-22
-  x86_64-darwin-21
-  x86_64-darwin-22
-  x86_64-linux
+  arm64-darwin-24
+  ruby
 
 DEPENDENCIES
+  base64 (~> 0.2)
   bundler (~> 2.0)
   bundler-audit (~> 0.7)
-  faraday-net_http_persistent (~> 2.1)
+  faraday-net_http_persistent (~> 2.3)
   rake (~> 13.0)
   rspec (~> 3.0)
   rubocop (~> 1.13)
-  rubygems-tasks (~> 0.2.5)
+  rubygems-tasks (~> 0.2.6)
   tanker-core!
   tanker-identity (~> 3.3.0)
 
 BUNDLED WITH
-   2.5.4
+   2.6.2

lib/tanker/core.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'set'
 # always keep this file first, it defines the module and the class
 require_relative 'core/version'
 require_relative 'c_tanker'

spec/admin_helper.rb

@@ -136,7 +136,7 @@ class COIDCAuthorizationCodeVerificationResponse < FFI::Struct
              :state, :string
 
       def initialize(cverification)
-        super(cverification)
+        super
 
         @cverification = cverification
         cverification_addr = @cverification.address

tanker-core.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
     Tanker is a platform as a service that allows you to easily protect your users' data with end-to-end encryption through a SDK
   DESCRIPTION
   spec.license = 'Apache-2.0'
-  spec.required_ruby_version = Gem::Requirement.new('>= 3.1.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 3.2.0')
 
   spec.metadata['rubygems_mfa_required'] = 'true'
   spec.metadata['source_code_uri'] = '/~https://github.com/TankerHQ/sdk-ruby'
@@ -32,6 +32,6 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'faraday', '>= 0.17.5', '< 3.0.0'
-  spec.add_runtime_dependency 'ffi', '~> 1.13'
+  spec.add_dependency 'faraday', '>= 0.17.5', '< 3.0.0'
+  spec.add_dependency 'ffi', '~> 1.13'
 end