Merge branch 'master' into biodivportal

Gemfile

@@ -2,18 +2,16 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'ffi'
-gem 'activesupport', '~> 3.2'
 
 # This is needed temporarily to pull the Google Universal Analytics (UA)
 # data and store it in a file. See (bin/import_google_ua_analytics_data)
 # The ability to pull this data from Google will cease on July 1, 2024
 gem "google-apis-analytics_v3"
-
-gem 'google-analytics-data'
+gem 'google-analytics-data', '0.6.0'
+gem 'google-protobuf', '3.25.3'
 gem 'mail', '2.6.6'
 gem 'multi_json'
-gem 'oj', '~> 3.0'
+gem 'oj'
 gem 'parseconfig'
 gem 'pony'
 gem 'pry'
@@ -24,6 +22,7 @@ gem 'sys-proctable'
 gem 'request_store'
 gem 'parallel'
 gem 'json-ld'
+gem 'ffi', '~> 1.16.3'
 
 # Monitoring
 gem 'cube-ruby', require: 'cube'

Gemfile.lock

@@ -84,6 +84,8 @@ GEM
     base64 (0.2.0)
     bcrypt (3.1.20)
     bcrypt_pbkdf (1.1.1)
+    bcrypt_pbkdf (1.1.1-arm64-darwin)
+    bcrypt_pbkdf (1.1.1-x86_64-darwin)
     bigdecimal (3.1.8)
     binding_of_caller (1.0.1)
       debug_inspector (>= 1.2.0)
@@ -121,7 +123,7 @@ GEM
     faraday-net_http (3.0.2)
     faraday-retry (2.2.1)
       faraday (~> 2.0)
-    ffi (1.17.0)
+    ffi (1.16.3)
     gapic-common (0.21.1)
       faraday (>= 1.9, < 3.a)
       faraday-retry (>= 1.0, < 3.a)
@@ -130,10 +132,10 @@ GEM
       googleapis-common-protos-types (>= 1.11.0, < 2.a)
       googleauth (~> 1.9)
       grpc (~> 1.59)
-    google-analytics-data (0.6.1)
+    google-analytics-data (0.6.0)
       google-analytics-data-v1beta (>= 0.11, < 2.a)
       google-cloud-core (~> 1.6)
-    google-analytics-data-v1beta (0.13.0)
+    google-analytics-data-v1beta (0.13.1)
       gapic-common (>= 0.21.1, < 2.a)
       google-cloud-errors (~> 1.0)
     google-apis-analytics_v3 (0.16.0)
@@ -152,7 +154,12 @@ GEM
     google-cloud-env (2.1.1)
       faraday (>= 1.0, < 3.a)
     google-cloud-errors (1.4.0)
-    google-protobuf (3.25.4)
+    google-protobuf (3.25.3)
+    google-protobuf (3.25.3-aarch64-linux)
+    google-protobuf (3.25.3-arm64-darwin)
+    google-protobuf (3.25.3-x86-linux)
+    google-protobuf (3.25.3-x86_64-darwin)
+    google-protobuf (3.25.3-x86_64-linux)
     googleapis-common-protos (1.6.0)
       google-protobuf (>= 3.18, < 5.a)
       googleapis-common-protos-types (~> 1.7)
@@ -166,6 +173,21 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
+    grpc (1.65.2)
+      google-protobuf (>= 3.25, < 5.0)
+      googleapis-common-protos-types (~> 1.0)
+    grpc (1.65.2-aarch64-linux)
+      google-protobuf (>= 3.25, < 5.0)
+      googleapis-common-protos-types (~> 1.0)
+    grpc (1.65.2-arm64-darwin)
+      google-protobuf (>= 3.25, < 5.0)
+      googleapis-common-protos-types (~> 1.0)
+    grpc (1.65.2-x86-linux)
+      google-protobuf (>= 3.25, < 5.0)
+      googleapis-common-protos-types (~> 1.0)
+    grpc (1.65.2-x86_64-darwin)
+      google-protobuf (>= 3.25, < 5.0)
+      googleapis-common-protos-types (~> 1.0)
     grpc (1.65.2-x86_64-linux)
       google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
@@ -307,10 +329,14 @@ GEM
       macaddr (~> 1.0)
 
 PLATFORMS
+  aarch64-linux
+  arm64-darwin
+  ruby
+  x86-linux
+  x86_64-darwin
   x86_64-linux
 
 DEPENDENCIES
-  activesupport (~> 3.2)
   bcrypt_pbkdf (>= 1.0, < 2.0)
   binding_of_caller (~> 1.0)
   capistrano (~> 3)
@@ -320,17 +346,18 @@ DEPENDENCIES
   cube-ruby
   ed25519 (>= 1.2, < 2.0)
   email_spec
-  ffi
+  ffi (~> 1.16.3)
   goo!
-  google-analytics-data
+  google-analytics-data (= 0.6.0)
   google-apis-analytics_v3
+  google-protobuf (= 3.25.3)
   json-ld
   mail (= 2.6.6)
   minitest (< 5.0)
   multi_json
   ncbo_annotator!
   ncbo_cron!
-  oj (~> 3.0)
+  oj
   ontologies_linked_data!
   parallel
   parseconfig