Skip to content

Commit 6d71b02

Browse files
authored
Merge pull request #73 from opendocument-app/development
v1.25
2 parents ade1672 + 078c206 commit 6d71b02

13 files changed

Lines changed: 393 additions & 619 deletions

File tree

.github/workflows/ios_main.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ jobs:
1414

1515
- name: pods
1616
run: pod install
17-
- name: build.sh
18-
run: bash build-simulator.sh
1917

2018
- name: brew
2119
run: ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" < /dev/null 2> /dev/null

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
cmake_minimum_required(VERSION 3.12.4)
22

3+
project(odr-ios)
4+
35
option (ODR_TEST "" OFF)
46
set(ODR_TEST OFF)
57

Gemfile.lock

Lines changed: 61 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.3)
5-
addressable (2.7.0)
4+
CFPropertyList (3.0.4)
5+
rexml
6+
addressable (2.8.0)
67
public_suffix (>= 2.0.2, < 5.0)
78
artifactory (3.0.15)
89
atomos (0.1.3)
9-
aws-eventstream (1.1.1)
10-
aws-partitions (1.466.0)
11-
aws-sdk-core (3.114.2)
10+
aws-eventstream (1.2.0)
11+
aws-partitions (1.521.0)
12+
aws-sdk-core (3.121.5)
1213
aws-eventstream (~> 1, >= 1.0.2)
13-
aws-partitions (~> 1, >= 1.239.0)
14+
aws-partitions (~> 1, >= 1.520.1)
1415
aws-sigv4 (~> 1.1)
1516
jmespath (~> 1.0)
16-
aws-sdk-kms (1.43.0)
17-
aws-sdk-core (~> 3, >= 3.112.0)
17+
aws-sdk-kms (1.50.0)
18+
aws-sdk-core (~> 3, >= 3.121.2)
1819
aws-sigv4 (~> 1.1)
19-
aws-sdk-s3 (1.96.0)
20-
aws-sdk-core (~> 3, >= 3.112.0)
20+
aws-sdk-s3 (1.104.0)
21+
aws-sdk-core (~> 3, >= 3.121.2)
2122
aws-sdk-kms (~> 1)
22-
aws-sigv4 (~> 1.1)
23-
aws-sigv4 (1.2.3)
23+
aws-sigv4 (~> 1.4)
24+
aws-sigv4 (1.4.0)
2425
aws-eventstream (~> 1, >= 1.0.2)
2526
babosa (1.0.4)
2627
claide (1.0.3)
@@ -29,19 +30,22 @@ GEM
2930
commander (4.6.0)
3031
highline (~> 2.0.0)
3132
declarative (0.0.20)
32-
digest-crc (0.6.3)
33+
digest-crc (0.6.4)
3334
rake (>= 12.0.0, < 14.0.0)
3435
domain_name (0.5.20190701)
3536
unf (>= 0.0.5, < 1.0.0)
3637
dotenv (2.7.6)
37-
emoji_regex (3.2.2)
38-
excon (0.82.0)
39-
faraday (1.4.2)
38+
emoji_regex (3.2.3)
39+
excon (0.88.0)
40+
faraday (1.8.0)
4041
faraday-em_http (~> 1.0)
4142
faraday-em_synchrony (~> 1.0)
4243
faraday-excon (~> 1.1)
44+
faraday-httpclient (~> 1.0.1)
4345
faraday-net_http (~> 1.0)
4446
faraday-net_http_persistent (~> 1.1)
47+
faraday-patron (~> 1.0)
48+
faraday-rack (~> 1.0)
4549
multipart-post (>= 1.2, < 3)
4650
ruby2_keywords (>= 0.0.4)
4751
faraday-cookie_jar (0.0.7)
@@ -50,14 +54,17 @@ GEM
5054
faraday-em_http (1.0.0)
5155
faraday-em_synchrony (1.0.0)
5256
faraday-excon (1.1.0)
57+
faraday-httpclient (1.0.1)
5358
faraday-net_http (1.0.1)
54-
faraday-net_http_persistent (1.1.0)
55-
faraday_middleware (1.0.0)
59+
faraday-net_http_persistent (1.2.0)
60+
faraday-patron (1.0.0)
61+
faraday-rack (1.0.0)
62+
faraday_middleware (1.2.0)
5663
faraday (~> 1.0)
57-
fastimage (2.2.4)
58-
fastlane (2.185.0)
64+
fastimage (2.2.5)
65+
fastlane (2.197.0)
5966
CFPropertyList (>= 2.3, < 4.0.0)
60-
addressable (>= 2.3, < 3.0.0)
67+
addressable (>= 2.8, < 3.0.0)
6168
artifactory (~> 3.0)
6269
aws-sdk-s3 (~> 1.0)
6370
babosa (>= 1.0.3, < 2.0.0)
@@ -72,7 +79,7 @@ GEM
7279
faraday_middleware (~> 1.0)
7380
fastimage (>= 2.1.0, < 3.0.0)
7481
gh_inspector (>= 1.1.2, < 2.0.0)
75-
google-apis-androidpublisher_v3 (~> 0.1)
82+
google-apis-androidpublisher_v3 (~> 0.3)
7683
google-apis-playcustomapp_v1 (~> 0.1)
7784
google-cloud-storage (~> 1.31)
7885
highline (~> 2.0)
@@ -81,6 +88,7 @@ GEM
8188
mini_magick (>= 4.9.4, < 5.0.0)
8289
multipart-post (~> 2.0.0)
8390
naturally (~> 2.2)
91+
optparse (~> 0.1.1)
8492
plist (>= 3.1.0, < 4.0.0)
8593
rubyzip (>= 2.0.0, < 3.0.0)
8694
security (= 0.1.3)
@@ -94,75 +102,75 @@ GEM
94102
xcpretty (~> 0.3.0)
95103
xcpretty-travis-formatter (>= 0.0.3)
96104
gh_inspector (1.1.3)
97-
google-apis-androidpublisher_v3 (0.5.0)
98-
google-apis-core (~> 0.1)
99-
google-apis-core (0.3.0)
105+
google-apis-androidpublisher_v3 (0.13.0)
106+
google-apis-core (>= 0.4, < 2.a)
107+
google-apis-core (0.4.1)
100108
addressable (~> 2.5, >= 2.5.1)
101-
googleauth (~> 0.14)
102-
httpclient (>= 2.8.1, < 3.0)
109+
googleauth (>= 0.16.2, < 2.a)
110+
httpclient (>= 2.8.1, < 3.a)
103111
mini_mime (~> 1.0)
104112
representable (~> 3.0)
105-
retriable (>= 2.0, < 4.0)
113+
retriable (>= 2.0, < 4.a)
106114
rexml
107-
signet (~> 0.14)
108115
webrick
109-
google-apis-iamcredentials_v1 (0.4.0)
110-
google-apis-core (~> 0.1)
111-
google-apis-playcustomapp_v1 (0.3.0)
112-
google-apis-core (~> 0.1)
113-
google-apis-storage_v1 (0.4.0)
114-
google-apis-core (~> 0.1)
116+
google-apis-iamcredentials_v1 (0.8.0)
117+
google-apis-core (>= 0.4, < 2.a)
118+
google-apis-playcustomapp_v1 (0.6.0)
119+
google-apis-core (>= 0.4, < 2.a)
120+
google-apis-storage_v1 (0.9.0)
121+
google-apis-core (>= 0.4, < 2.a)
115122
google-cloud-core (1.6.0)
116123
google-cloud-env (~> 1.0)
117124
google-cloud-errors (~> 1.0)
118125
google-cloud-env (1.5.0)
119126
faraday (>= 0.17.3, < 2.0)
120-
google-cloud-errors (1.1.0)
121-
google-cloud-storage (1.31.1)
127+
google-cloud-errors (1.2.0)
128+
google-cloud-storage (1.34.1)
122129
addressable (~> 2.5)
123130
digest-crc (~> 0.4)
124131
google-apis-iamcredentials_v1 (~> 0.1)
125132
google-apis-storage_v1 (~> 0.1)
126-
google-cloud-core (~> 1.2)
127-
googleauth (~> 0.9)
133+
google-cloud-core (~> 1.6)
134+
googleauth (>= 0.16.2, < 2.a)
128135
mini_mime (~> 1.0)
129-
googleauth (0.16.2)
136+
googleauth (1.1.0)
130137
faraday (>= 0.17.3, < 2.0)
131138
jwt (>= 1.4, < 3.0)
132139
memoist (~> 0.16)
133140
multi_json (~> 1.11)
134141
os (>= 0.9, < 2.0)
135-
signet (~> 0.14)
142+
signet (>= 0.16, < 2.a)
136143
highline (2.0.3)
137144
http-cookie (1.0.4)
138145
domain_name (~> 0.5)
139146
httpclient (2.8.3)
140147
jmespath (1.4.0)
141-
json (2.5.1)
142-
jwt (2.2.3)
148+
json (2.6.1)
149+
jwt (2.3.0)
143150
memoist (0.16.2)
144151
mini_magick (4.11.0)
145-
mini_mime (1.1.0)
152+
mini_mime (1.1.2)
146153
multi_json (1.15.0)
147154
multipart-post (2.0.0)
148155
nanaimo (0.3.0)
149156
naturally (2.2.1)
157+
optparse (0.1.1)
150158
os (1.1.1)
151159
plist (3.6.0)
152160
public_suffix (4.0.6)
153-
rake (13.0.3)
161+
rake (13.0.6)
154162
representable (3.1.1)
155163
declarative (< 0.1.0)
156164
trailblazer-option (>= 0.1.1, < 0.2.0)
157165
uber (< 0.2.0)
158166
retriable (3.1.2)
159167
rexml (3.2.5)
160168
rouge (2.0.7)
161-
ruby2_keywords (0.0.4)
162-
rubyzip (2.3.0)
169+
ruby2_keywords (0.0.5)
170+
rubyzip (2.3.2)
163171
security (0.1.3)
164-
signet (0.15.0)
165-
addressable (~> 2.3)
172+
signet (0.16.0)
173+
addressable (~> 2.8)
166174
faraday (>= 0.17.3, < 2.0)
167175
jwt (>= 1.5, < 3.0)
168176
multi_json (~> 1.10)
@@ -180,16 +188,17 @@ GEM
180188
uber (0.1.0)
181189
unf (0.1.4)
182190
unf_ext
183-
unf_ext (0.0.7.7)
184-
unicode-display_width (1.7.0)
191+
unf_ext (0.0.8)
192+
unicode-display_width (1.8.0)
185193
webrick (1.7.0)
186194
word_wrap (1.0.0)
187-
xcodeproj (1.19.0)
195+
xcodeproj (1.21.0)
188196
CFPropertyList (>= 2.3.3, < 4.0)
189197
atomos (~> 0.1.3)
190198
claide (>= 1.0.2, < 2.0)
191199
colored2 (~> 3.1)
192200
nanaimo (~> 0.3.0)
201+
rexml (~> 3.2.4)
193202
xcpretty (0.3.0)
194203
rouge (~> 2.0.7)
195204
xcpretty-travis-formatter (1.0.1)

OpenDocument.core

0 commit comments

Comments
 (0)