Merge branch 'gem-updates' into dev

.ruby-version

@@ -1 +1 @@
-ruby-3.0.6
+ruby-3.2.2

Dockerfile

@@ -1,4 +1,4 @@
-ARG RUBY_VERSION=3.0.6
+ARG RUBY_VERSION=3.2.2
 
 #use ruby base image
 FROM ruby:$RUBY_VERSION-slim AS base

Gemfile

@@ -1,168 +1,70 @@
 # frozen_string_literal: true
 source 'https://rubygems.org'
 
-# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 6.0'
-
-gem 'bootsnap', '>= 1.4.4', require: false
-
-# Use postgresql as the database for Active Record
-gem 'pg'
-
-# For installing PG on macs:
-gem 'lunchy'
-
-# Use SCSS for stylesheets
-gem 'sass-rails', '~> 5.0'
-gem 'sassc-rails', '~> 2.1.2'
-
-# Use Terser as compressor for JavaScript assets
-gem 'terser'
-
-# See https://github.com/rails/execjs#readme for more supported runtimes
-# gem 'therubyracer'#, platforms: :ruby
-
-# CRUD of resources via a UI
-gem 'rails_admin', '~> 2.2.1'
-gem 'haml'
-
-# Authentication
-gem 'devise'
-gem 'omniauth_openid_connect'
-gem "omniauth-rails_csrf_protection"
-gem 'devise_invitable', '~> 2.0.5'
-
-# Activity logging
-gem 'public_activity', '~> 2.0.2'
-
-gem 'simple_token_authentication', '~> 1.0'
-
-gem 'bootstrap-sass', '>= 3.4.1'
-
-gem 'font-awesome-sass', '~> 4.7.0'
-
-gem 'friendly_id', '~> 5.2.4'
-
-# gem 'sunspot_rails', '~> 2.5.0'
-gem 'sunspot_rails', github: 'sunspot/sunspot', branch: 'master'
-
-gem 'progress_bar', '~> 1.1.0'
+gem 'rails', '7.0.7.2'
 
+gem 'active_model_serializers'
 gem 'activerecord-session_store'
-
-gem 'gravtastic', '~> 3.2.6'
-
+gem 'ahoy_matey'
+gem 'auto_strip_attributes'
+gem 'bootsnap', require: false
+gem 'bootstrap-datepicker-rails'
+gem 'bootstrap-sass'
+gem 'bootstrap-tab-history-rails'
+gem 'country_select'
+gem 'devise'
+gem 'devise_invitable'
 gem 'sitemap_generator'
-
-gem 'whenever', '~> 1.0.0'
-
-# These are required for Sidekiq, to look up scientific topics
+gem 'eventbrite_sdk'
+gem 'font-awesome-sass', '~> 4.7.0' # Prefer V4 icon styles
+gem 'friendly_id'
+gem 'geocoder'
+gem 'gravtastic'
+gem 'handlebars_assets'
 gem 'httparty'
-gem 'sidekiq', '< 8'
-gem 'sidekiq-status', '~> 3.0.2'
-gem 'slim'
-
-# Use jquery as the JavaScript library
-gem 'jquery-rails'
-gem 'jquery-qtip2-wrapper-rails'
-
-# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
-gem 'turbolinks'
-gem 'jquery-turbolinks'
-
-# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+gem 'i18n_data'
+gem 'icalendar'
+gem 'iso_country_codes'
 gem 'jbuilder'
-# bundle exec rake doc:rails generates the API under doc/api.
-
-group :doc do
-  gem 'sdoc', '>= 1.1.0'
-  gem 'json', '>= 2.3.0'
-  gem 'rdoc', '>= 6.3.1'
-end
-
-# Gem for creating before_validation callbacks for stripping whitespace
-gem 'auto_strip_attributes', '~> 2.0'
-
-# Gem for validating URLs
-gem 'validate_url', '~> 1.0.2'
-
-# Gem for simple form: https://github.com/heartcombo/simple_form
-gem 'simple_form'
-gem 'country_select', '<= 4.0.0'
-
-# Gem for rendering Markdown
-gem 'redcarpet', '~> 3.5.1'
-
-# Gem for paginating search results
-gem 'will_paginate'
-# gem 'will_paginate-bootstrap', '~> 1.0.1'
-
-# Gem for authorisation
-gem 'pundit', '~> 1.1.0'
-
-# Simple colour picker from a predefined list
+gem 'jquery-qtip2-wrapper-rails'
+gem 'jquery-rails'
 gem 'jquery-simplecolorpicker-rails'
-
-# For getting date of materials for the home page
-gem 'by_star', git: 'https://github.com/radar/by_star'
-
-gem 'handlebars_assets'
-
-gem 'kt-paperclip', '~> 7.0.0'
-
-gem 'icalendar', '~> 2.4.1'
-
-gem 'rss'
-
-gem 'bootstrap-datepicker-rails', '~> 1.6.4.1'
-gem 'bootstrap-tab-history-rails'
-
-gem 'rack-cors', require: 'rack/cors'
-
-gem 'recaptcha', require: 'recaptcha/rails'
-
+gem 'jquery-turbolinks'
+gem 'kt-paperclip'
 gem 'linkeddata'
-
-gem 'tess_rdf_extractors', git: 'https://github.com/ElixirTeSS/TeSS_RDF_Extractors'
-gem 'sitemap-parser', '~> 0.5.6'
-
-# Used for lat/lon rake task
-gem 'geocoder'
-gem 'redis', '< 5.0.0'
-
-# set serializers version
-gem 'active_model_serializers', '~> 0.10.13'
-
+gem 'money-rails'
+gem 'omniauth-rails_csrf_protection'
+gem 'omniauth_openid_connect'
+gem 'pg'
 gem 'private_address_check'
-
-# For the link monitor rake taks
-gem 'time_diff'
-
-# For internationalisation (i18n)
+gem 'public_activity'
+gem 'pundit'
+gem 'rack-cors', require: 'rack/cors'
 gem 'rails-i18n'
-gem 'i18n_data'
-
-# for timezone information
-gem 'tzinfo'
-gem 'tzinfo-data'
-
-# for currency information
-gem 'money-rails'
-
-# for iso country codes
-gem 'iso_country_codes'
-
-# for rest client
+gem 'rails_admin'
+gem 'recaptcha', require: 'recaptcha/rails'
+gem 'redcarpet'
+gem 'redis'
 gem 'rest-client'
-
-# for converting html to markdown
 gem 'reverse_markdown'
-
-# eventbrite api
-gem 'eventbrite_sdk'
-
-gem 'ahoy_matey'
-
+gem 'rss'
+gem 'sass-rails'
+gem 'sassc-rails'
+gem 'sidekiq'
+gem 'sidekiq-status'
+gem 'simple_form'
+gem 'simple_token_authentication'
+gem 'sitemap-parser'
+gem 'slim'
+gem 'sunspot_rails', github: 'sunspot/sunspot', branch: 'master' # Contains Ruby 3 fixes that are not released
+gem 'terser'
+gem 'tess_rdf_extractors', git: 'https://github.com/ElixirTeSS/TeSS_RDF_Extractors'
+gem 'turbolinks'
+gem 'tzinfo'
+gem 'tzinfo-data'
+gem 'validate_url'
+gem 'whenever'
+gem 'will_paginate'
 
 source 'https://rails-assets.org' do
   gem 'rails-assets-clipboard', '~> 1.5.12'
@@ -174,7 +76,6 @@ source 'https://rails-assets.org' do
 end
 
 group :development, :test do
-  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug'
   gem 'pry-byebug'
   gem 'rubocop'
@@ -183,22 +84,18 @@ group :development, :test do
 end
 
 group :development do
-  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
-  # gem 'spring'
-  gem 'listen'
-  # Access an IRB console on exception pages or by using <%= console %> in views
-  gem 'web-console'
-  gem 'puma'
   gem 'better_errors'
   gem 'binding_of_caller'
+  gem 'listen'
+  gem 'puma'
+  gem 'web-console'
 end
 
 group :test do
-  gem 'minitest', '5.14.4'
+  gem 'committee'
+  gem 'minitest'
   gem 'minitest-reporters'
   gem 'rails-controller-testing'
-  gem 'vcr', '~> 6.1.0'
-  gem 'webmock', '~> 3.18.1'
-  gem 'committee', '~> 4.4'
+  gem 'vcr'
+  gem 'webmock'
 end
-