Skip to content

Commit 4bca1f9

Browse files
committed
Updates Gemfile so it works on MacOS ARM processors
1 parent 01fea48 commit 4bca1f9

File tree

5 files changed

+101
-158
lines changed

5 files changed

+101
-158
lines changed

.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.0
1+
2.7.8

Gemfile

+11-14
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ruby '2.6.0'
1+
ruby '2.7.8'
22
source 'https://rubygems.org'
33

44
group :development do
@@ -10,16 +10,13 @@ group :development do
1010
end
1111

1212
# Middleman
13-
gem 'middleman', '~>4.2.1'
14-
gem 'middleman-syntax', '~> 3.0.0'
15-
gem 'middleman-autoprefixer', '~> 2.7.0'
16-
gem "middleman-sprockets", "~> 4.1.1"
17-
gem 'middleman4-sprockets3-sassc', '~> 0.0.4'
18-
gem 'nokogiri', '~> 1.6.8'
19-
gem 'pry'
20-
gem 'rake'
21-
gem 'rouge', '~> 2.0.5'
22-
gem 'redcarpet', '~> 3.4.0'
23-
gem "sassc"
24-
gem 'sassc-rails'
25-
gem 'therubyracer'
13+
gem 'middleman', '~> 4.4'
14+
gem 'middleman-syntax', '~> 3.2'
15+
gem 'middleman-autoprefixer', '~> 3.0'
16+
gem 'middleman-sprockets', '~> 4.1'
17+
gem 'rouge', '~> 3.21'
18+
gem 'redcarpet', '~> 3.6.0'
19+
gem 'nokogiri', '~> 1.13.3'
20+
gem 'sass'
21+
gem 'webrick'
22+
gem 'ffi', '~> 1.10'

Gemfile.lock

+88-141
Original file line numberDiff line numberDiff line change
@@ -1,227 +1,174 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionpack (5.0.1)
5-
actionview (= 5.0.1)
6-
activesupport (= 5.0.1)
7-
rack (~> 2.0)
8-
rack-test (~> 0.6.3)
9-
rails-dom-testing (~> 2.0)
10-
rails-html-sanitizer (~> 1.0, >= 1.0.2)
11-
actionview (5.0.1)
12-
activesupport (= 5.0.1)
13-
builder (~> 3.1)
14-
erubis (~> 2.7.0)
15-
rails-dom-testing (~> 2.0)
16-
rails-html-sanitizer (~> 1.0, >= 1.0.2)
17-
activesupport (5.0.1)
4+
activesupport (7.0.8.1)
185
concurrent-ruby (~> 1.0, >= 1.0.2)
19-
i18n (~> 0.7)
20-
minitest (~> 5.1)
21-
tzinfo (~> 1.1)
6+
i18n (>= 1.6, < 2)
7+
minitest (>= 5.1)
8+
tzinfo (~> 2.0)
229
addressable (2.5.0)
2310
public_suffix (~> 2.0, >= 2.0.2)
24-
airbrussh (1.3.0)
11+
airbrussh (1.5.2)
2512
sshkit (>= 1.6.1, != 1.7.0)
26-
autoprefixer-rails (6.6.1)
27-
execjs
13+
autoprefixer-rails (10.4.16.0)
14+
execjs (~> 2)
2815
backports (3.6.8)
29-
bcrypt_pbkdf (1.0.1)
30-
builder (3.2.3)
31-
capistrano (3.8.2)
16+
base64 (0.2.0)
17+
bcrypt_pbkdf (1.1.0)
18+
capistrano (3.18.1)
3219
airbrussh (>= 1.0.0)
3320
i18n
3421
rake (>= 10.0.0)
3522
sshkit (>= 1.9.0)
36-
capistrano-bundler (1.2.0)
23+
capistrano-bundler (2.1.0)
3724
capistrano (~> 3.1)
38-
sshkit (~> 1.2)
39-
capistrano-rbenv (2.1.1)
25+
capistrano-rbenv (2.2.0)
4026
capistrano (~> 3.1)
4127
sshkit (~> 1.3)
42-
coderay (1.1.1)
4328
coffee-script (2.4.1)
4429
coffee-script-source
4530
execjs
4631
coffee-script-source (1.12.2)
47-
compass-import-once (1.0.5)
48-
sass (>= 3.2, < 3.5)
4932
concurrent-ruby (1.0.5)
5033
contracts (0.13.0)
51-
crass (1.0.4)
5234
dotenv (2.2.0)
5335
erubis (2.7.0)
5436
execjs (2.7.0)
5537
fast_blank (1.0.0)
5638
fastimage (2.0.1)
5739
addressable (~> 2)
58-
ffi (1.9.17)
59-
haml (4.0.7)
40+
ffi (1.16.3)
41+
haml (6.3.0)
42+
temple (>= 0.8.2)
43+
thor
6044
tilt
6145
hamster (3.0.0)
6246
concurrent-ruby (~> 1.0)
6347
hashie (3.5.1)
64-
i18n (0.7.0)
65-
kramdown (1.13.2)
66-
libv8 (3.16.14.19)
48+
i18n (1.6.0)
49+
concurrent-ruby (~> 1.0)
50+
kramdown (2.4.0)
51+
rexml
6752
listen (3.0.8)
6853
rb-fsevent (~> 0.9, >= 0.9.4)
6954
rb-inotify (~> 0.9, >= 0.9.7)
70-
loofah (2.2.3)
71-
crass (~> 1.0.2)
72-
nokogiri (>= 1.5.9)
7355
memoist (0.15.0)
74-
method_source (0.8.2)
75-
middleman (4.2.1)
56+
middleman (4.5.1)
7657
coffee-script (~> 2.2)
77-
compass-import-once (= 1.0.5)
7858
haml (>= 4.0.5)
79-
kramdown (~> 1.2)
80-
middleman-cli (= 4.2.1)
81-
middleman-core (= 4.2.1)
82-
sass (>= 3.4.0, < 4.0)
83-
middleman-autoprefixer (2.7.1)
84-
autoprefixer-rails (>= 6.5.2, < 7.0.0)
85-
middleman-core (>= 3.3.3)
86-
middleman-cli (4.2.1)
87-
thor (>= 0.17.0, < 2.0)
88-
middleman-core (4.2.1)
89-
activesupport (>= 4.2, < 5.1)
90-
addressable (~> 2.3)
59+
kramdown (>= 2.3.0)
60+
middleman-cli (= 4.5.1)
61+
middleman-core (= 4.5.1)
62+
middleman-autoprefixer (3.0.0)
63+
autoprefixer-rails (~> 10.0)
64+
middleman-core (>= 4.0.0)
65+
middleman-cli (4.5.1)
66+
thor (>= 0.17.0, < 1.3.0)
67+
middleman-core (4.5.1)
68+
activesupport (>= 6.1, < 7.1)
69+
addressable (~> 2.4)
9170
backports (~> 3.6)
92-
bundler (~> 1.1)
93-
contracts (~> 0.13.0)
71+
bundler (~> 2.0)
72+
contracts (~> 0.13, < 0.17)
9473
dotenv
9574
erubis
9675
execjs (~> 2.0)
9776
fast_blank
9877
fastimage (~> 2.0)
9978
hamster (~> 3.0)
10079
hashie (~> 3.4)
101-
i18n (~> 0.7.0)
102-
listen (~> 3.0.0)
80+
i18n (~> 1.6.0)
81+
listen (~> 3.0)
10382
memoist (~> 0.14)
104-
padrino-helpers (~> 0.13.0)
83+
padrino-helpers (~> 0.15.0)
10584
parallel
10685
rack (>= 1.4.5, < 3)
107-
sass (>= 3.4)
86+
sassc (~> 2.0)
10887
servolux
109-
tilt (~> 2.0)
88+
tilt (~> 2.0.9)
89+
toml
11090
uglifier (~> 3.0)
91+
webrick
11192
middleman-sprockets (4.1.1)
11293
middleman-core (~> 4.0)
11394
sprockets (>= 3.0)
114-
middleman-syntax (3.0.0)
95+
middleman-syntax (3.4.0)
11596
middleman-core (>= 3.2)
116-
rouge (~> 2.0)
117-
middleman4-sprockets3-sassc (0.0.4)
118-
middleman-core (~> 4)
119-
middleman-sprockets (>= 4.0.0, < 5)
120-
sassc (>= 1.7, < 2)
121-
sassc-rails (>= 1.1, < 2)
122-
sprockets (~> 3)
123-
mini_portile2 (2.1.0)
97+
rouge (~> 3.2)
12498
minitest (5.10.1)
125-
net-scp (1.2.1)
126-
net-ssh (>= 2.6.5)
127-
net-ssh (4.1.0)
128-
nokogiri (1.6.8.1)
129-
mini_portile2 (~> 2.1.0)
130-
padrino-helpers (0.13.3.3)
131-
i18n (~> 0.6, >= 0.6.7)
132-
padrino-support (= 0.13.3.3)
99+
mutex_m (0.2.0)
100+
net-scp (4.0.0)
101+
net-ssh (>= 2.6.5, < 8.0.0)
102+
net-sftp (4.0.0)
103+
net-ssh (>= 5.0.0, < 8.0.0)
104+
net-ssh (7.2.3)
105+
nokogiri (1.13.10-arm64-darwin)
106+
racc (~> 1.4)
107+
padrino-helpers (0.15.3)
108+
i18n (>= 0.6.7, < 2)
109+
padrino-support (= 0.15.3)
133110
tilt (>= 1.4.1, < 3)
134-
padrino-support (0.13.3.3)
135-
activesupport (>= 3.1)
111+
padrino-support (0.15.3)
136112
parallel (1.10.0)
137-
pry (0.10.4)
138-
coderay (~> 1.1.0)
139-
method_source (~> 0.8.1)
140-
slop (~> 3.4)
113+
parslet (2.0.0)
141114
public_suffix (2.0.5)
115+
racc (1.7.3)
142116
rack (2.0.3)
143-
rack-test (0.6.3)
144-
rack (>= 1.0)
145-
rails-dom-testing (2.0.3)
146-
activesupport (>= 4.2.0)
147-
nokogiri (>= 1.6)
148-
rails-html-sanitizer (1.0.4)
149-
loofah (~> 2.2, >= 2.2.2)
150-
railties (5.0.1)
151-
actionpack (= 5.0.1)
152-
activesupport (= 5.0.1)
153-
method_source
154-
rake (>= 0.8.7)
155-
thor (>= 0.18.1, < 2.0)
156-
rake (12.0.0)
117+
rake (13.2.1)
157118
rb-fsevent (0.9.8)
158119
rb-inotify (0.9.8)
159120
ffi (>= 0.5.0)
160121
rbnacl (4.0.2)
161122
ffi
162-
redcarpet (3.4.0)
163-
ref (2.0.0)
164-
rouge (2.0.7)
123+
redcarpet (3.6.0)
124+
rexml (3.2.6)
125+
rouge (3.30.0)
165126
sass (3.4.23)
166-
sassc (1.11.4)
167-
bundler
168-
ffi (~> 1.9.6)
169-
sass (>= 3.3.0)
170-
sassc-rails (1.3.0)
171-
railties (>= 4.0.0)
172-
sass
173-
sassc (~> 1.9)
174-
sprockets (> 2.11)
175-
sprockets-rails
176-
tilt
127+
sassc (2.4.0)
128+
ffi (~> 1.9)
177129
servolux (0.12.0)
178-
slop (3.6.0)
179130
sprockets (3.7.2)
180131
concurrent-ruby (~> 1.0)
181132
rack (> 1, < 3)
182-
sprockets-rails (3.2.1)
183-
actionpack (>= 4.0)
184-
activesupport (>= 4.0)
185-
sprockets (>= 3.0.0)
186-
sshkit (1.13.1)
133+
sshkit (1.22.1)
134+
base64
135+
mutex_m
187136
net-scp (>= 1.1.2)
137+
net-sftp (>= 2.1.2)
188138
net-ssh (>= 2.8.0)
189-
therubyracer (0.12.3)
190-
libv8 (~> 3.16.14.15)
191-
ref
192-
thor (0.19.4)
193-
thread_safe (0.3.5)
194-
tilt (2.0.6)
195-
tzinfo (1.2.2)
196-
thread_safe (~> 0.1)
139+
temple (0.10.3)
140+
thor (1.2.2)
141+
tilt (2.0.11)
142+
toml (0.3.0)
143+
parslet (>= 1.8.0, < 3.0.0)
144+
tzinfo (2.0.6)
145+
concurrent-ruby (~> 1.0)
197146
uglifier (3.0.4)
198147
execjs (>= 0.3.0, < 3)
148+
webrick (1.8.1)
199149

200150
PLATFORMS
201-
ruby
151+
arm64-darwin-23
202152

203153
DEPENDENCIES
204154
bcrypt_pbkdf
205155
capistrano
206156
capistrano-bundler
207157
capistrano-rbenv
208-
middleman (~> 4.2.1)
209-
middleman-autoprefixer (~> 2.7.0)
210-
middleman-sprockets (~> 4.1.1)
211-
middleman-syntax (~> 3.0.0)
212-
middleman4-sprockets3-sassc (~> 0.0.4)
213-
nokogiri (~> 1.6.8)
214-
pry
215-
rake
158+
ffi (~> 1.10)
159+
middleman (~> 4.4)
160+
middleman-autoprefixer (~> 3.0)
161+
middleman-sprockets (~> 4.1)
162+
middleman-syntax (~> 3.2)
163+
nokogiri (~> 1.13.3)
216164
rbnacl (< 5.0)
217-
redcarpet (~> 3.4.0)
218-
rouge (~> 2.0.5)
219-
sassc
220-
sassc-rails
221-
therubyracer
165+
redcarpet (~> 3.6.0)
166+
rouge (~> 3.21)
167+
sass
168+
webrick
222169

223170
RUBY VERSION
224-
ruby 2.6.0p0
171+
ruby 2.7.8p225
225172

226173
BUNDLED WITH
227-
1.17.2
174+
2.4.22

config.rb

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
end
2727

2828
activate :sprockets
29-
activate :sprockets3_sassc
3029

3130
activate :autoprefixer do |config|
3231
config.browsers = ['last 2 version', 'Firefox ESR']

source/layouts/layout.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ under the License.
3333
<style>
3434
<%= Rouge::Themes::MonokaiSublime.render(:scope => '.highlight') %>
3535
</style>
36-
<link href="stylesheets/screen.css?<%= Time.now.strftime("%Y%m%d%H%M") %>" rel="stylesheet" media="screen">
36+
<link href="stylesheets/screen.css?<%= Time.now.strftime("%Y%m%d%H%M") %>" rel="stylesheet" media="screen, print">
3737
<% # stylesheet_link_tag "screen.css?1", media: :screen %>
3838
<% # stylesheet_link_tag :print, media: :print %>
3939
<% if current_page.data.search %>

0 commit comments

Comments
 (0)