From 9585037c09722acbb2905bb4d27aaf2c375326f1 Mon Sep 17 00:00:00 2001
From: Adam Niedzielski <adamsunday@gmail.com>
Date: Fri, 14 Jun 2024 09:31:12 +0200
Subject: [PATCH] Fix CI (#94)

* Fix Docker setup for Apple M2

* Drop support for Rails 5.2 and 6.0

* Drop support for Ruby 2.7

* Lock sqlite3 version
---
 .github/workflows/ruby.yml | 9 ---------
 docker-compose.yml         | 1 +
 gemfiles/rails5.2.gemfile  | 7 -------
 gemfiles/rails6.0.gemfile  | 7 -------
 gemfiles/rails6.1.gemfile  | 2 +-
 gemfiles/rails7.0.gemfile  | 2 +-
 tiddle.gemspec             | 4 ++--
 7 files changed, 5 insertions(+), 27 deletions(-)
 delete mode 100644 gemfiles/rails5.2.gemfile
 delete mode 100644 gemfiles/rails6.0.gemfile

diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index a9259d1..702f1c1 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -12,24 +12,15 @@ jobs:
       fail-fast: false
       matrix:
         gemfile:
-          - rails5.2
-          - rails6.0
           - rails6.1
           - rails7.0
         ruby:
-          - "2.7"
           - "3.0"
           - "3.1"
         backend:
           - active_record
           - mongoid
         exclude:
-          - gemfile: rails5.2
-            ruby: "3.0"
-          - gemfile: rails5.2
-            ruby: "3.1"
-          - gemfile: rails6.0
-            ruby: "3.1"
           - gemfile: rails6.1
             ruby: "3.1"
     name: ${{ matrix.gemfile }}, ruby ${{ matrix.ruby }}, ${{ matrix.backend }}
diff --git a/docker-compose.yml b/docker-compose.yml
index 5618dad..9d1e78e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,7 @@
 version: "3.9"
 services:
   library:
+    platform: linux/x86_64
     build:
       context: .
     stdin_open: true
diff --git a/gemfiles/rails5.2.gemfile b/gemfiles/rails5.2.gemfile
deleted file mode 100644
index afc9897..0000000
--- a/gemfiles/rails5.2.gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-source "https://rubygems.org"
-
-gem "rails", "~> 5.2.1"
-gem "mongoid", "~> 6"
-gem "sqlite3", "~> 1.3.13"
-
-gemspec path: "../"
diff --git a/gemfiles/rails6.0.gemfile b/gemfiles/rails6.0.gemfile
deleted file mode 100644
index 3953917..0000000
--- a/gemfiles/rails6.0.gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-source "https://rubygems.org"
-
-gem "rails", "~> 6.0.0"
-gem "mongoid", "~> 7"
-gem "sqlite3"
-
-gemspec path: "../"
diff --git a/gemfiles/rails6.1.gemfile b/gemfiles/rails6.1.gemfile
index f295b95..d3848ef 100644
--- a/gemfiles/rails6.1.gemfile
+++ b/gemfiles/rails6.1.gemfile
@@ -2,6 +2,6 @@ source "https://rubygems.org"
 
 gem "rails", "~> 6.1.0"
 gem "mongoid"
-gem "sqlite3"
+gem "sqlite3", "~> 1.4"
 
 gemspec path: "../"
diff --git a/gemfiles/rails7.0.gemfile b/gemfiles/rails7.0.gemfile
index 5c669aa..dfaf754 100644
--- a/gemfiles/rails7.0.gemfile
+++ b/gemfiles/rails7.0.gemfile
@@ -2,6 +2,6 @@ source "https://rubygems.org"
 
 gem "rails", "~> 7.0.2"
 gem "mongoid"
-gem "sqlite3"
+gem "sqlite3", "~> 1.4"
 
 gemspec path: "../"
diff --git a/tiddle.gemspec b/tiddle.gemspec
index c94f1a0..cc8c5a1 100644
--- a/tiddle.gemspec
+++ b/tiddle.gemspec
@@ -16,10 +16,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.7.0'
+  spec.required_ruby_version = '>= 3.0.0'
 
   spec.add_dependency "devise", ">= 4.0.0.rc1", "< 5"
-  spec.add_dependency "activerecord", ">= 5.2.0"
+  spec.add_dependency "activerecord", ">= 6.1.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec-rails"
   spec.add_development_dependency "simplecov"