Skip to content

Commit dd0c266

Browse files
FlynnD273FlynnD273
committed
Maybe get newer Ruby working??
1 parent 539e12a commit dd0c266

File tree

8 files changed

+210
-99
lines changed

8 files changed

+210
-99
lines changed

‎.env.sample‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ ALGOLIA_API_KEY=
77
ALGOLIA_SEARCH_KEY=
88
ALGOLIA_PREFIX=devsite-dev-
99
GOOGLE_ANALYTICS=
10+
GOOGLE_GOOGLE=
1011
ROLLBAR_CLIENT_TOKEN=
1112
RACK_ENV=development
1213
SKIP_DOCS=false

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
source 'https://rubygems.org'
16-
ruby '2.2.9'
16+
ruby '3.3.7'
1717

1818
gem 'slugize', '>= 0.0.3'
1919
gem 'jekyll', '>= 3.0.3'

‎Gemfile.lock‎

Lines changed: 193 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,109 +1,215 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.3.8)
5-
algoliasearch (1.7.0)
6-
httpclient (~> 2.4)
4+
addressable (2.8.7)
5+
public_suffix (>= 2.0.2, < 7.0)
6+
algoliasearch (1.27.5)
7+
httpclient (~> 2.8, >= 2.8.3)
78
json (>= 1.5.1)
8-
ast (2.2.0)
9-
colorator (0.1)
10-
diff-lcs (1.2.5)
11-
docile (1.1.5)
12-
dotenv (2.1.0)
13-
execjs (2.6.0)
14-
ffi (1.9.10)
15-
git-version-bump (0.15.1)
16-
googlestaticmap (1.2.2)
9+
ast (2.4.2)
10+
base64 (0.2.0)
11+
bigdecimal (3.1.9)
12+
colorator (1.1.0)
13+
concurrent-ruby (1.3.5)
14+
connection_pool (2.5.0)
15+
csv (3.3.2)
16+
diff-lcs (1.6.0)
17+
docile (1.4.1)
18+
dotenv (3.1.7)
19+
em-websocket (0.5.3)
20+
eventmachine (>= 0.12.9)
21+
http_parser.rb (~> 0)
22+
eventmachine (1.2.7)
23+
execjs (2.10.0)
24+
ffi (1.17.1-aarch64-linux-gnu)
25+
ffi (1.17.1-aarch64-linux-musl)
26+
ffi (1.17.1-arm-linux-gnu)
27+
ffi (1.17.1-arm-linux-musl)
28+
ffi (1.17.1-arm64-darwin)
29+
ffi (1.17.1-x86_64-darwin)
30+
ffi (1.17.1-x86_64-linux-gnu)
31+
ffi (1.17.1-x86_64-linux-musl)
32+
forwardable-extended (2.6.0)
33+
google-protobuf (4.29.3)
34+
bigdecimal
35+
rake (>= 13)
36+
google-protobuf (4.29.3-aarch64-linux)
37+
bigdecimal
38+
rake (>= 13)
39+
google-protobuf (4.29.3-arm64-darwin)
40+
bigdecimal
41+
rake (>= 13)
42+
google-protobuf (4.29.3-x86_64-darwin)
43+
bigdecimal
44+
rake (>= 13)
45+
google-protobuf (4.29.3-x86_64-linux)
46+
bigdecimal
47+
rake (>= 13)
48+
googlestaticmap (1.2.6)
1749
htmlentities (4.3.4)
18-
httpclient (2.7.1)
19-
jekyll (3.1.2)
20-
colorator (~> 0.1)
21-
jekyll-sass-converter (~> 1.0)
22-
jekyll-watch (~> 1.1)
23-
kramdown (~> 1.3)
24-
liquid (~> 3.0)
25-
mercenary (~> 0.3.3)
26-
rouge (~> 1.7)
50+
http_parser.rb (0.8.0)
51+
httpclient (2.9.0)
52+
mutex_m
53+
i18n (1.14.7)
54+
concurrent-ruby (~> 1.0)
55+
jekyll (4.4.1)
56+
addressable (~> 2.4)
57+
base64 (~> 0.2)
58+
colorator (~> 1.0)
59+
csv (~> 3.0)
60+
em-websocket (~> 0.5)
61+
i18n (~> 1.0)
62+
jekyll-sass-converter (>= 2.0, < 4.0)
63+
jekyll-watch (~> 2.0)
64+
json (~> 2.6)
65+
kramdown (~> 2.3, >= 2.3.1)
66+
kramdown-parser-gfm (~> 1.0)
67+
liquid (~> 4.0)
68+
mercenary (~> 0.3, >= 0.3.6)
69+
pathutil (~> 0.9)
70+
rouge (>= 3.0, < 5.0)
2771
safe_yaml (~> 1.0)
72+
terminal-table (>= 1.8, < 4.0)
73+
webrick (~> 1.7)
2874
jekyll-paginate (1.1.0)
29-
jekyll-sass-converter (1.4.0)
30-
sass (~> 3.4)
31-
jekyll-watch (1.3.1)
75+
jekyll-sass-converter (3.1.0)
76+
sass-embedded (~> 1.75)
77+
jekyll-watch (2.2.1)
3278
listen (~> 3.0)
33-
json (1.8.3)
34-
kramdown (1.9.0)
35-
liquid (3.0.6)
36-
listen (3.0.6)
37-
rb-fsevent (>= 0.9.3)
38-
rb-inotify (>= 0.9.7)
39-
mercenary (0.3.5)
40-
mini_portile2 (2.0.0)
41-
net-http-persistent (2.9.4)
42-
newrelic_rpm (3.14.2.312)
43-
nokogiri (1.6.7.2)
44-
mini_portile2 (~> 2.0.0.rc2)
45-
parser (2.3.0.2)
46-
ast (~> 2.2)
47-
posix-spawn (0.3.11)
48-
powerpack (0.1.1)
49-
pygments.rb (0.6.3)
50-
posix-spawn (~> 0.3.6)
51-
yajl-ruby (~> 1.2.0)
79+
json (2.10.1)
80+
kramdown (2.5.1)
81+
rexml (>= 3.3.9)
82+
kramdown-parser-gfm (1.1.0)
83+
kramdown (~> 2.0)
84+
language_server-protocol (3.17.0.4)
85+
lint_roller (1.1.0)
86+
liquid (4.0.4)
87+
listen (3.9.0)
88+
rb-fsevent (~> 0.10, >= 0.10.3)
89+
rb-inotify (~> 0.9, >= 0.9.10)
90+
mercenary (0.4.0)
91+
mutex_m (0.3.0)
92+
net-http-persistent (4.0.5)
93+
connection_pool (~> 2.2)
94+
newrelic_rpm (9.17.0)
95+
nokogiri (1.18.3-aarch64-linux-gnu)
96+
racc (~> 1.4)
97+
nokogiri (1.18.3-aarch64-linux-musl)
98+
racc (~> 1.4)
99+
nokogiri (1.18.3-arm-linux-gnu)
100+
racc (~> 1.4)
101+
nokogiri (1.18.3-arm-linux-musl)
102+
racc (~> 1.4)
103+
nokogiri (1.18.3-arm64-darwin)
104+
racc (~> 1.4)
105+
nokogiri (1.18.3-x86_64-darwin)
106+
racc (~> 1.4)
107+
nokogiri (1.18.3-x86_64-linux-gnu)
108+
racc (~> 1.4)
109+
nokogiri (1.18.3-x86_64-linux-musl)
110+
racc (~> 1.4)
111+
parallel (1.26.3)
112+
parser (3.3.7.1)
113+
ast (~> 2.4.1)
114+
racc
115+
pathutil (0.16.2)
116+
forwardable-extended (~> 2.6)
117+
public_suffix (6.0.1)
118+
pygments.rb (3.0.0)
119+
racc (1.8.1)
52120
rack (1.5.5)
53-
rack-contrib (1.4.0)
54-
git-version-bump (~> 0.15)
55-
rack (~> 1.4)
56-
rack-host-redirect (1.2.1)
121+
rack-contrib (2.5.0)
122+
rack (< 4)
123+
rack-host-redirect (1.3.0)
57124
rack
58125
rack-rewrite (1.5.1)
59126
rack-ssl-enforcer (0.2.9)
60-
rack-wwwhisper (1.1.9)
127+
rack-wwwhisper (1.1.16)
61128
addressable (~> 2.0)
62-
net-http-persistent
63-
rack (~> 1.0)
129+
net-http-persistent (< 5.0)
130+
rack (>= 1.0)
64131
rack-xframe-options (0.1.2)
65132
rack (>= 0.9.1)
66-
rainbow (2.1.0)
67-
rb-fsevent (0.9.7)
68-
rb-inotify (0.9.7)
69-
ffi (>= 0.5.0)
70-
redcarpet (3.3.4)
71-
rouge (1.10.1)
72-
rspec (3.4.0)
73-
rspec-core (~> 3.4.0)
74-
rspec-expectations (~> 3.4.0)
75-
rspec-mocks (~> 3.4.0)
76-
rspec-core (3.4.2)
77-
rspec-support (~> 3.4.0)
78-
rspec-expectations (3.4.0)
133+
rainbow (3.1.1)
134+
rake (13.2.1)
135+
rb-fsevent (0.11.2)
136+
rb-inotify (0.11.1)
137+
ffi (~> 1.0)
138+
redcarpet (3.6.1)
139+
regexp_parser (2.10.0)
140+
rexml (3.4.1)
141+
rouge (4.5.1)
142+
rspec (3.13.0)
143+
rspec-core (~> 3.13.0)
144+
rspec-expectations (~> 3.13.0)
145+
rspec-mocks (~> 3.13.0)
146+
rspec-core (3.13.3)
147+
rspec-support (~> 3.13.0)
148+
rspec-expectations (3.13.3)
79149
diff-lcs (>= 1.2.0, < 2.0)
80-
rspec-support (~> 3.4.0)
81-
rspec-mocks (3.4.1)
150+
rspec-support (~> 3.13.0)
151+
rspec-mocks (3.13.2)
82152
diff-lcs (>= 1.2.0, < 2.0)
83-
rspec-support (~> 3.4.0)
84-
rspec-support (3.4.1)
85-
rubocop (0.36.0)
86-
parser (>= 2.3.0.0, < 3.0)
87-
powerpack (~> 0.1)
88-
rainbow (>= 1.99.1, < 3.0)
153+
rspec-support (~> 3.13.0)
154+
rspec-support (3.13.2)
155+
rubocop (1.73.1)
156+
json (~> 2.3)
157+
language_server-protocol (~> 3.17.0.2)
158+
lint_roller (~> 1.1.0)
159+
parallel (~> 1.10)
160+
parser (>= 3.3.0.2)
161+
rainbow (>= 2.2.2, < 4.0)
162+
regexp_parser (>= 2.9.3, < 3.0)
163+
rubocop-ast (>= 1.38.0, < 2.0)
89164
ruby-progressbar (~> 1.7)
90-
ruby-progressbar (1.7.5)
91-
rubyzip (1.1.7)
92-
safe_yaml (1.0.4)
93-
sass (3.4.21)
94-
simplecov (0.11.1)
95-
docile (~> 1.1.0)
96-
json (~> 1.8)
97-
simplecov-html (~> 0.10.0)
98-
simplecov-html (0.10.0)
165+
unicode-display_width (>= 2.4.0, < 4.0)
166+
rubocop-ast (1.38.1)
167+
parser (>= 3.3.1.0)
168+
ruby-progressbar (1.13.0)
169+
rubyzip (2.4.1)
170+
safe_yaml (1.0.5)
171+
sass-embedded (1.85.1-aarch64-linux-gnu)
172+
google-protobuf (~> 4.29)
173+
sass-embedded (1.85.1-aarch64-linux-musl)
174+
google-protobuf (~> 4.29)
175+
sass-embedded (1.85.1-arm-linux-gnueabihf)
176+
google-protobuf (~> 4.29)
177+
sass-embedded (1.85.1-arm-linux-musleabihf)
178+
google-protobuf (~> 4.29)
179+
sass-embedded (1.85.1-arm64-darwin)
180+
google-protobuf (~> 4.29)
181+
sass-embedded (1.85.1-x86_64-darwin)
182+
google-protobuf (~> 4.29)
183+
sass-embedded (1.85.1-x86_64-linux-gnu)
184+
google-protobuf (~> 4.29)
185+
sass-embedded (1.85.1-x86_64-linux-musl)
186+
google-protobuf (~> 4.29)
187+
simplecov (0.22.0)
188+
docile (~> 1.1)
189+
simplecov-html (~> 0.11)
190+
simplecov_json_formatter (~> 0.1)
191+
simplecov-html (0.13.1)
192+
simplecov_json_formatter (0.1.4)
99193
slugize (0.0.3)
100-
uglifier (2.7.2)
101-
execjs (>= 0.3.0)
102-
json (>= 1.8.0)
103-
yajl-ruby (1.2.1)
194+
terminal-table (3.0.2)
195+
unicode-display_width (>= 1.1.1, < 3)
196+
uglifier (4.2.1)
197+
execjs (>= 0.3.0, < 3)
198+
unicode-display_width (2.6.0)
199+
webrick (1.9.1)
104200

105201
PLATFORMS
106-
ruby
202+
aarch64-linux
203+
aarch64-linux-gnu
204+
aarch64-linux-musl
205+
arm-linux-gnu
206+
arm-linux-gnueabihf
207+
arm-linux-musl
208+
arm-linux-musleabihf
209+
arm64-darwin
210+
x86_64-darwin
211+
x86_64-linux-gnu
212+
x86_64-linux-musl
107213

108214
DEPENDENCIES
109215
algoliasearch (>= 1.6.1)
@@ -132,7 +238,7 @@ DEPENDENCIES
132238
uglifier (>= 2.7.0)
133239

134240
RUBY VERSION
135-
ruby 2.2.9p480
241+
ruby 3.3.7p123
136242

137243
BUNDLED WITH
138-
1.14.6
244+
2.6.0

‎_config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ plugins_dir: plugins/
2727

2828
debug: true
2929

30-
gems: [jekyll-paginate]
30+
plugins: [jekyll-paginate]
3131

3232
# Blog Options
3333
permalink: none

‎plugins/generator_meetups.rb‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ def initialize(config)
2121

2222
def generate(site)
2323
@site = site
24-
map = GoogleStaticMap.new(:width => 700, :height => 500)
24+
print("HIIIIIIIIIIIIIIIIII\n")
25+
map = GoogleStaticMap.new(:api_key => site.config['google_maps'], :width => 700, :height => 500)
2526
site.data['meetups'].each do |meetup|
2627
map.markers << MapMarker.new(:color => "0x9D49D5FF",
2728
:location => MapLocation.new(:latitude => meetup['pin']['latitude'],

‎plugins/jekyll_document.rb‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@ class Document
2323
alias_method :parent_to_liquid, :to_liquid
2424

2525
def to_liquid
26-
Utils.deep_merge_hashes parent_to_liquid, {
27-
'toc' => toc,
28-
'related_docs' => related_docs
29-
}
26+
parent_to_liquid
27+
# Utils.deep_merge_hashes parent_to_liquid, {
28+
# 'toc' => toc,
29+
# 'related_docs' => related_docs
30+
# }
3031
end
3132

3233
private

‎source/_data/docs.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
c: PebbleSDK-4.3_docs.zip
15+
c: /PebbleSDK-4.3_docs.zip
1616
# c_preview: PebbleSDK-4.2-beta4_docs.zip
17-
pebblekit_ios: pebblekit_ios_4.0.0.zip
18-
pebblekit_android: pebblekit_android_4.0.1.zip
19-
pebblekit_js: jsdocs-pkjs
20-
rocky_js: jsdocs-rocky
17+
pebblekit_ios: /pebblekit_ios_4.0.0.zip
18+
pebblekit_android: /pebblekit_android_4.0.1.zip
19+
pebblekit_js: /jsdocs-pkjs
20+
rocky_js: /jsdocs-rocky

‎source/_data/env.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
env: DOCS_URL
3535
- config: google_analytics
3636
env: GOOGLE_ANALYTICS
37+
- config: google_maps
38+
env: GOOGLE_MAPS
3739
- config: debug
3840
env: DEBUG
3941
- config: sdk_bucket

0 commit comments

Comments
 (0)