From a43ddeeae7969f0d7914b44d247b6d858603a55b Mon Sep 17 00:00:00 2001
From: Stefan Appelhoff <stefan.appelhoff@mailbox.org>
Date: Mon, 9 Aug 2021 17:04:55 +0200
Subject: [PATCH] Remove faulty/unneeded .gemspec file, bump CI packages (#196)

* try remove gemspec

* edit Gemfile, update CI containers

* bump npm requirements

* add gh pages gem

* exclude [vendor]

* exclude vendor, no []
---
 .circleci/config.yml        | 16 +++++++++++-----
 Gemfile                     |  6 ++----
 _config.yml                 |  4 +---
 jekyll-theme-cayman.gemspec | 22 ----------------------
 npm-requirements.txt        |  4 ++--
 5 files changed, 16 insertions(+), 36 deletions(-)
 delete mode 100644 jekyll-theme-cayman.gemspec

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5439bb61..e653f3d3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ jobs:
 
     lint:
         docker:
-            - image: circleci/node:stretch
+            - image: cimg/node:lts
         steps:
             - checkout
             - run:
@@ -20,7 +20,7 @@ jobs:
 
     build:
         docker:
-            - image: circleci/ruby:stretch
+            - image: cimg/ruby:3.0
         steps:
             - checkout
 
@@ -29,16 +29,22 @@ jobs:
                 keys:
                   - gem-cache-0-{{ checksum "./Gemfile" }}
 
+            - run:
+                name: check versions
+                command: |
+                    gem --version
+                    bundle --version
+
             - run:
                 name: install
                 command: |
-                    gem install jekyll bundler
-                    bundle install --path vendor/bundle
+                    bundle config set --local path 'vendor/bundle'
+                    bundle install
 
             - run:
                 name: build
                 command: |
-                    bundle exec jekyll build --baseurl /0/_site
+                    bundle exec jekyll build --baseurl /0/_site --verbose
 
             - store_artifacts:
                 path: _site
diff --git a/Gemfile b/Gemfile
index 08acbad3..f7fe80f5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,4 @@
-# frozen_string_literal: true
-
 source 'https://rubygems.org'
 
-gemspec
-gem 'jekyll-redirect-from'
\ No newline at end of file
+gem 'jekyll-redirect-from'
+gem 'github-pages', group: :jekyll_plugins
diff --git a/_config.yml b/_config.yml
index cc132fdf..332f18b7 100644
--- a/_config.yml
+++ b/_config.yml
@@ -46,8 +46,6 @@ include:
   - _posts
 
 exclude:
-  - script
-  - docs
   - README.md
   - Gemfile*
-  - jekyll-theme-cayman.gemspec
+  - vendor
diff --git a/jekyll-theme-cayman.gemspec b/jekyll-theme-cayman.gemspec
deleted file mode 100644
index 4a1c2d28..00000000
--- a/jekyll-theme-cayman.gemspec
+++ /dev/null
@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-Gem::Specification.new do |s|
-  s.name          = 'jekyll-theme-cayman'
-  s.version       = '0.1.1'
-  s.license       = 'CC0-1.0'
-  s.authors       = ['Jason Long', 'GitHub, Inc.']
-  s.email         = ['opensource+jekyll-theme-cayman@github.com']
-  s.homepage      = 'https://github.com/pages-themes/cayman'
-  s.summary       = 'Cayman is a Jekyll theme for GitHub Pages'
-
-  s.files         = `git ls-files -z`.split("\x0").select do |f|
-    f.match(%r{^((_includes|_layouts|_sass|assets)/|(LICENSE|README)((\.(txt|md|markdown)|$)))}i)
-  end
-
-  s.platform = Gem::Platform::RUBY
-  s.add_runtime_dependency 'jekyll', '> 3.5', '< 5.0'
-  s.add_runtime_dependency 'jekyll-seo-tag', '~> 2.0'
-  s.add_development_dependency 'html-proofer', '~> 3.0'
-  s.add_development_dependency 'rubocop', '~> 0.50'
-  s.add_development_dependency 'w3c_validators', '~> 1.3'
-end
diff --git a/npm-requirements.txt b/npm-requirements.txt
index 44921e36..03d501f4 100644
--- a/npm-requirements.txt
+++ b/npm-requirements.txt
@@ -1,2 +1,2 @@
-remark-cli@8.0.0
-remark-preset-lint-recommended@4.0.0
+remark-cli@^10.0.0
+remark-preset-lint-recommended@^4.0.0