Skip to content

Commit eda7ef4

Browse files
author
box-sdk-build
committed
Merge remote-tracking branch 'origin/combined-sdk' into codegen-2950-501f777-e7ce024
2 parents 0e23f20 + e48713d commit eda7ef4

File tree

2 files changed

+51
-49
lines changed

2 files changed

+51
-49
lines changed

Gemfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
source 'https://rubygems.org'
22

33
gem 'cocoapods'
4-
gem 'jazzy'
5-
gem 'slather'
4+
gem 'slather'

Gemfile.lock

Lines changed: 50 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,28 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.7)
5-
base64
6-
nkf
7-
rexml
8-
activesupport (7.1.5.1)
4+
CFPropertyList (3.0.8)
5+
activesupport (7.2.3)
96
base64
107
benchmark (>= 0.3)
118
bigdecimal
12-
concurrent-ruby (~> 1.0, >= 1.0.2)
9+
concurrent-ruby (~> 1.0, >= 1.3.1)
1310
connection_pool (>= 2.2.5)
1411
drb
1512
i18n (>= 1.6, < 2)
1613
logger (>= 1.4.2)
1714
minitest (>= 5.1)
18-
mutex_m
1915
securerandom (>= 0.3)
20-
tzinfo (~> 2.0)
16+
tzinfo (~> 2.0, >= 2.0.5)
2117
addressable (2.8.7)
2218
public_suffix (>= 2.0.2, < 7.0)
2319
algoliasearch (1.27.5)
2420
httpclient (~> 2.8, >= 2.8.3)
2521
json (>= 1.5.1)
2622
atomos (0.1.3)
2723
base64 (0.3.0)
28-
benchmark (0.4.1)
29-
bigdecimal (3.2.2)
24+
benchmark (0.5.0)
25+
bigdecimal (3.3.1)
3026
claide (1.1.0)
3127
clamp (1.3.3)
3228
cocoapods (1.16.2)
@@ -68,69 +64,72 @@ GEM
6864
cocoapods-try (1.2.0)
6965
colored2 (3.1.2)
7066
concurrent-ruby (1.3.5)
71-
connection_pool (2.5.3)
67+
connection_pool (2.5.5)
7268
drb (2.2.3)
7369
escape (0.0.4)
74-
ethon (0.16.0)
70+
ethon (0.15.0)
7571
ffi (>= 1.15.0)
72+
ffi (1.17.2)
73+
ffi (1.17.2-aarch64-linux-gnu)
74+
ffi (1.17.2-aarch64-linux-musl)
75+
ffi (1.17.2-arm-linux-gnu)
76+
ffi (1.17.2-arm-linux-musl)
7677
ffi (1.17.2-arm64-darwin)
78+
ffi (1.17.2-x86-linux-gnu)
79+
ffi (1.17.2-x86-linux-musl)
7780
ffi (1.17.2-x86_64-darwin)
81+
ffi (1.17.2-x86_64-linux-gnu)
82+
ffi (1.17.2-x86_64-linux-musl)
7883
fourflusher (2.3.1)
7984
fuzzy_match (2.0.4)
8085
gh_inspector (1.1.3)
8186
httpclient (2.9.0)
8287
mutex_m
8388
i18n (1.14.7)
8489
concurrent-ruby (~> 1.0)
85-
jazzy (0.15.3)
86-
cocoapods (~> 1.5)
87-
mustache (~> 1.1)
88-
open4 (~> 1.3)
89-
redcarpet (~> 3.4)
90-
rexml (>= 3.2.7, < 4.0)
91-
rouge (>= 2.0.6, < 5.0)
92-
sassc (~> 2.1)
93-
sqlite3 (~> 1.3)
94-
xcinvoke (~> 0.3.0)
95-
json (2.12.2)
96-
liferaft (0.0.6)
90+
json (2.16.0)
9791
logger (1.7.0)
98-
minitest (5.25.5)
92+
mini_portile2 (2.8.9)
93+
minitest (5.26.2)
9994
molinillo (0.8.0)
100-
mustache (1.1.1)
10195
mutex_m (0.3.0)
10296
nanaimo (0.4.0)
10397
nap (1.1.0)
10498
netrc (0.11.0)
105-
nkf (0.2.0)
99+
nokogiri (1.18.10)
100+
mini_portile2 (~> 2.8.2)
101+
racc (~> 1.4)
102+
nokogiri (1.18.10-aarch64-linux-gnu)
103+
racc (~> 1.4)
104+
nokogiri (1.18.10-aarch64-linux-musl)
105+
racc (~> 1.4)
106+
nokogiri (1.18.10-arm-linux-gnu)
107+
racc (~> 1.4)
108+
nokogiri (1.18.10-arm-linux-musl)
109+
racc (~> 1.4)
106110
nokogiri (1.18.10-arm64-darwin)
107111
racc (~> 1.4)
108112
nokogiri (1.18.10-x86_64-darwin)
109113
racc (~> 1.4)
110-
open4 (1.3.4)
114+
nokogiri (1.18.10-x86_64-linux-gnu)
115+
racc (~> 1.4)
116+
nokogiri (1.18.10-x86_64-linux-musl)
117+
racc (~> 1.4)
111118
public_suffix (4.0.7)
112119
racc (1.8.1)
113-
redcarpet (3.6.1)
114-
rexml (3.4.1)
115-
rouge (3.28.0)
120+
rexml (3.4.4)
116121
ruby-macho (2.5.1)
117-
sassc (2.4.0)
118-
ffi (~> 1.9)
119-
securerandom (0.3.2)
122+
securerandom (0.4.1)
120123
slather (2.8.5)
121124
CFPropertyList (>= 2.2, < 4)
122125
activesupport
123126
clamp (~> 1.3)
124127
nokogiri (>= 1.14.3)
125128
xcodeproj (~> 1.27)
126-
sqlite3 (1.7.3-arm64-darwin)
127-
sqlite3 (1.7.3-x86_64-darwin)
128-
typhoeus (1.4.1)
129-
ethon (>= 0.9.0)
129+
typhoeus (1.5.0)
130+
ethon (>= 0.9.0, < 0.16.0)
130131
tzinfo (2.0.6)
131132
concurrent-ruby (~> 1.0)
132-
xcinvoke (0.3.0)
133-
liferaft (~> 0.0.6)
134133
xcodeproj (1.27.0)
135134
CFPropertyList (>= 2.3.3, < 4.0)
136135
atomos (~> 0.1.3)
@@ -140,16 +139,20 @@ GEM
140139
rexml (>= 3.3.6, < 4.0)
141140

142141
PLATFORMS
143-
arm64-darwin-23
144-
arm64-darwin-24
145-
x86_64-darwin-19
146-
x86_64-darwin-20
147-
x86_64-darwin-21
148-
x86_64-darwin-22
142+
aarch64-linux-gnu
143+
aarch64-linux-musl
144+
arm-linux-gnu
145+
arm-linux-musl
146+
arm64-darwin
147+
ruby
148+
x86-linux-gnu
149+
x86-linux-musl
150+
x86_64-darwin
151+
x86_64-linux-gnu
152+
x86_64-linux-musl
149153

150154
DEPENDENCIES
151155
cocoapods
152-
jazzy
153156
slather
154157

155158
BUNDLED WITH

0 commit comments

Comments
 (0)