Updates Gemfile so it works on MacOS ARM processors

apisync · Apr 22, 2024 · 4bca1f9 · 4bca1f9
1 parent 01fea48
commit 4bca1f9
Show file tree

Hide file tree

Showing 5 changed files with 101 additions and 158 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.6.0
+2.7.8
diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,4 @@
-ruby '2.6.0'
+ruby '2.7.8'
 source 'https://rubygems.org'
 
 group :development do
@@ -10,16 +10,13 @@ group :development do
 end
 
 # Middleman
-gem 'middleman', '~>4.2.1'
-gem 'middleman-syntax', '~> 3.0.0'
-gem 'middleman-autoprefixer', '~> 2.7.0'
-gem "middleman-sprockets", "~> 4.1.1"
-gem 'middleman4-sprockets3-sassc', '~> 0.0.4'
-gem 'nokogiri', '~> 1.6.8'
-gem 'pry'
-gem 'rake'
-gem 'rouge', '~> 2.0.5'
-gem 'redcarpet', '~> 3.4.0'
-gem "sassc"
-gem 'sassc-rails'
-gem 'therubyracer'
+gem 'middleman', '~> 4.4'
+gem 'middleman-syntax', '~> 3.2'
+gem 'middleman-autoprefixer', '~> 3.0'
+gem 'middleman-sprockets', '~> 4.1'
+gem 'rouge', '~> 3.21'
+gem 'redcarpet', '~> 3.6.0'
+gem 'nokogiri', '~> 1.13.3'
+gem 'sass'
+gem 'webrick'
+gem 'ffi', '~> 1.10'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,227 +1,174 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.0.1)
-      actionview (= 5.0.1)
-      activesupport (= 5.0.1)
-      rack (~> 2.0)
-      rack-test (~> 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.1)
-      activesupport (= 5.0.1)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activesupport (5.0.1)
+    activesupport (7.0.8.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
-    airbrussh (1.3.0)
+    airbrussh (1.5.2)
       sshkit (>= 1.6.1, != 1.7.0)
-    autoprefixer-rails (6.6.1)
-      execjs
+    autoprefixer-rails (10.4.16.0)
+      execjs (~> 2)
     backports (3.6.8)
-    bcrypt_pbkdf (1.0.1)
-    builder (3.2.3)
-    capistrano (3.8.2)
+    base64 (0.2.0)
+    bcrypt_pbkdf (1.1.0)
+    capistrano (3.18.1)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
       sshkit (>= 1.9.0)
-    capistrano-bundler (1.2.0)
+    capistrano-bundler (2.1.0)
       capistrano (~> 3.1)
-      sshkit (~> 1.2)
-    capistrano-rbenv (2.1.1)
+    capistrano-rbenv (2.2.0)
       capistrano (~> 3.1)
       sshkit (~> 1.3)
-    coderay (1.1.1)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    compass-import-once (1.0.5)
-      sass (>= 3.2, < 3.5)
     concurrent-ruby (1.0.5)
     contracts (0.13.0)
-    crass (1.0.4)
     dotenv (2.2.0)
     erubis (2.7.0)
     execjs (2.7.0)
     fast_blank (1.0.0)
     fastimage (2.0.1)
       addressable (~> 2)
-    ffi (1.9.17)
-    haml (4.0.7)
+    ffi (1.16.3)
+    haml (6.3.0)
+      temple (>= 0.8.2)
+      thor
       tilt
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
     hashie (3.5.1)
-    i18n (0.7.0)
-    kramdown (1.13.2)
-    libv8 (3.16.14.19)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    kramdown (2.4.0)
+      rexml
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    loofah (2.2.3)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
     memoist (0.15.0)
-    method_source (0.8.2)
-    middleman (4.2.1)
+    middleman (4.5.1)
       coffee-script (~> 2.2)
-      compass-import-once (= 1.0.5)
       haml (>= 4.0.5)
-      kramdown (~> 1.2)
-      middleman-cli (= 4.2.1)
-      middleman-core (= 4.2.1)
-      sass (>= 3.4.0, < 4.0)
-    middleman-autoprefixer (2.7.1)
-      autoprefixer-rails (>= 6.5.2, < 7.0.0)
-      middleman-core (>= 3.3.3)
-    middleman-cli (4.2.1)
-      thor (>= 0.17.0, < 2.0)
-    middleman-core (4.2.1)
-      activesupport (>= 4.2, < 5.1)
-      addressable (~> 2.3)
+      kramdown (>= 2.3.0)
+      middleman-cli (= 4.5.1)
+      middleman-core (= 4.5.1)
+    middleman-autoprefixer (3.0.0)
+      autoprefixer-rails (~> 10.0)
+      middleman-core (>= 4.0.0)
+    middleman-cli (4.5.1)
+      thor (>= 0.17.0, < 1.3.0)
+    middleman-core (4.5.1)
+      activesupport (>= 6.1, < 7.1)
+      addressable (~> 2.4)
       backports (~> 3.6)
-      bundler (~> 1.1)
-      contracts (~> 0.13.0)
+      bundler (~> 2.0)
+      contracts (~> 0.13, < 0.17)
       dotenv
       erubis
       execjs (~> 2.0)
       fast_blank
       fastimage (~> 2.0)
       hamster (~> 3.0)
       hashie (~> 3.4)
-      i18n (~> 0.7.0)
-      listen (~> 3.0.0)
+      i18n (~> 1.6.0)
+      listen (~> 3.0)
       memoist (~> 0.14)
-      padrino-helpers (~> 0.13.0)
+      padrino-helpers (~> 0.15.0)
       parallel
       rack (>= 1.4.5, < 3)
-      sass (>= 3.4)
+      sassc (~> 2.0)
       servolux
-      tilt (~> 2.0)
+      tilt (~> 2.0.9)
+      toml
       uglifier (~> 3.0)
+      webrick
     middleman-sprockets (4.1.1)
       middleman-core (~> 4.0)
       sprockets (>= 3.0)
-    middleman-syntax (3.0.0)
+    middleman-syntax (3.4.0)
       middleman-core (>= 3.2)
-      rouge (~> 2.0)
-    middleman4-sprockets3-sassc (0.0.4)
-      middleman-core (~> 4)
-      middleman-sprockets (>= 4.0.0, < 5)
-      sassc (>= 1.7, < 2)
-      sassc-rails (>= 1.1, < 2)
-      sprockets (~> 3)
-    mini_portile2 (2.1.0)
+      rouge (~> 3.2)
     minitest (5.10.1)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (4.1.0)
-    nokogiri (1.6.8.1)
-      mini_portile2 (~> 2.1.0)
-    padrino-helpers (0.13.3.3)
-      i18n (~> 0.6, >= 0.6.7)
-      padrino-support (= 0.13.3.3)
+    mutex_m (0.2.0)
+    net-scp (4.0.0)
+      net-ssh (>= 2.6.5, < 8.0.0)
+    net-sftp (4.0.0)
+      net-ssh (>= 5.0.0, < 8.0.0)
+    net-ssh (7.2.3)
+    nokogiri (1.13.10-arm64-darwin)
+      racc (~> 1.4)
+    padrino-helpers (0.15.3)
+      i18n (>= 0.6.7, < 2)
+      padrino-support (= 0.15.3)
       tilt (>= 1.4.1, < 3)
-    padrino-support (0.13.3.3)
-      activesupport (>= 3.1)
+    padrino-support (0.15.3)
     parallel (1.10.0)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
+    parslet (2.0.0)
     public_suffix (2.0.5)
+    racc (1.7.3)
     rack (2.0.3)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.0.1)
-      actionpack (= 5.0.1)
-      activesupport (= 5.0.1)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
+    rake (13.2.1)
     rb-fsevent (0.9.8)
     rb-inotify (0.9.8)
       ffi (>= 0.5.0)
     rbnacl (4.0.2)
       ffi
-    redcarpet (3.4.0)
-    ref (2.0.0)
-    rouge (2.0.7)
+    redcarpet (3.6.0)
+    rexml (3.2.6)
+    rouge (3.30.0)
     sass (3.4.23)
-    sassc (1.11.4)
-      bundler
-      ffi (~> 1.9.6)
-      sass (>= 3.3.0)
-    sassc-rails (1.3.0)
-      railties (>= 4.0.0)
-      sass
-      sassc (~> 1.9)
-      sprockets (> 2.11)
-      sprockets-rails
-      tilt
+    sassc (2.4.0)
+      ffi (~> 1.9)
     servolux (0.12.0)
-    slop (3.6.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sshkit (1.13.1)
+    sshkit (1.22.1)
+      base64
+      mutex_m
       net-scp (>= 1.1.2)
+      net-sftp (>= 2.1.2)
       net-ssh (>= 2.8.0)
-    therubyracer (0.12.3)
-      libv8 (~> 3.16.14.15)
-      ref
-    thor (0.19.4)
-    thread_safe (0.3.5)
-    tilt (2.0.6)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
+    temple (0.10.3)
+    thor (1.2.2)
+    tilt (2.0.11)
+    toml (0.3.0)
+      parslet (>= 1.8.0, < 3.0.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     uglifier (3.0.4)
       execjs (>= 0.3.0, < 3)
+    webrick (1.8.1)
 
 PLATFORMS
-  ruby
+  arm64-darwin-23
 
 DEPENDENCIES
   bcrypt_pbkdf
   capistrano
   capistrano-bundler
   capistrano-rbenv
-  middleman (~> 4.2.1)
-  middleman-autoprefixer (~> 2.7.0)
-  middleman-sprockets (~> 4.1.1)
-  middleman-syntax (~> 3.0.0)
-  middleman4-sprockets3-sassc (~> 0.0.4)
-  nokogiri (~> 1.6.8)
-  pry
-  rake
+  ffi (~> 1.10)
+  middleman (~> 4.4)
+  middleman-autoprefixer (~> 3.0)
+  middleman-sprockets (~> 4.1)
+  middleman-syntax (~> 3.2)
+  nokogiri (~> 1.13.3)
   rbnacl (< 5.0)
-  redcarpet (~> 3.4.0)
-  rouge (~> 2.0.5)
-  sassc
-  sassc-rails
-  therubyracer
+  redcarpet (~> 3.6.0)
+  rouge (~> 3.21)
+  sass
+  webrick
 
 RUBY VERSION
-   ruby 2.6.0p0
+   ruby 2.7.8p225
 
 BUNDLED WITH
-   1.17.2
+   2.4.22
diff --git a/config.rb b/config.rb
@@ -26,7 +26,6 @@
 end
 
 activate :sprockets
-activate :sprockets3_sassc
 
 activate :autoprefixer do |config|
   config.browsers = ['last 2 version', 'Firefox ESR']

diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb
@@ -33,7 +33,7 @@ under the License.
     <style>
       <%= Rouge::Themes::MonokaiSublime.render(:scope => '.highlight') %>
     </style>
-    <link href="stylesheets/screen.css?<%= Time.now.strftime("%Y%m%d%H%M") %>" rel="stylesheet" media="screen">
+    <link href="stylesheets/screen.css?<%= Time.now.strftime("%Y%m%d%H%M") %>" rel="stylesheet" media="screen, print">
     <% # stylesheet_link_tag "screen.css?1", media: :screen %>
     <% # stylesheet_link_tag :print, media: :print %>
     <% if current_page.data.search %>