diff --git a/Gemfile b/Gemfile index f52d456..36bd2d7 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source 'https://rubygems.org' gem 'jquery-rails', '~> 4.5.1' gem 'mustache-js-rails', '~> 0.0.7' -gem 'rails', '~> 7.0' +gem 'rails', '~> 7.0.1' gem 'sprockets-rails' gem 'jruby-jars', '~> 9.4.2' @@ -53,15 +53,13 @@ if defined?(JRUBY_VERSION) gem 'therubyrhino' - gem 'nio4r', '2.5.2', platforms: :jruby + gem 'nio4r', '2.7.0', platforms: :jruby - git 'https://github.com/jruby/activerecord-jdbc-adapter', branch: 'master' do - gem 'activerecord-jdbc-adapter' - # Add the drivers - gem 'jdbc-mariadb' - gem 'jdbc-postgres' - gem 'jdbc-sqlite3' - end + gem 'activerecord-jdbc-adapter', '~> 70.0', platforms: :jruby + # Add the drivers + gem 'jdbc-mariadb' + gem 'jdbc-postgres' + gem 'jdbc-sqlite3' else gem 'mysql2' gem 'pg' diff --git a/config/initializers/encryption.rb b/config/initializers/encryption.rb index 458373f..7dc76e9 100644 --- a/config/initializers/encryption.rb +++ b/config/initializers/encryption.rb @@ -4,6 +4,6 @@ config_file = nil config_file = java.lang.System.getProperty('kaui.encryption.filename') if defined?(JRUBY_VERSION) -config_file ||= (ENV['KAUI_ENCRYPTION_FILENAME'] || 'config/symmetric-encryption.yml') +config_file ||= ENV['KAUI_ENCRYPTION_FILENAME'] || 'config/symmetric-encryption.yml' SymmetricEncryption.load!(config_file) diff --git a/config/initializers/kaui.rb b/config/initializers/kaui.rb index 04f1ba5..955206c 100644 --- a/config/initializers/kaui.rb +++ b/config/initializers/kaui.rb @@ -42,7 +42,7 @@ module Kaui Kaui.demo_mode ||= (ENV['KAUI_DEMO_MODE'] || 'false') == 'true' Kaui.plugins_whitelist ||= ENV.fetch('KAUI_PLUGINS_WHITELIST', nil) -Kaui.root_username ||= (ENV['KAUI_ROOT_USERNAME'] || 'admin') +Kaui.root_username ||= ENV['KAUI_ROOT_USERNAME'] || 'admin' Kaui.disable_sign_up_link ||= (ENV['KAUI_DISABLE_SIGN_UP_LINK'] || 'true') == 'true' Kaui.additional_headers_partial = 'layouts/additional_header'