Skip to content

Commit 0578b53

Browse files
authored
Merge pull request #235 from BranchMetrics/update-dependencies
Update dependencies
2 parents 6a10798 + 4be603c commit 0578b53

File tree

692 files changed

+30869
-6761
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

692 files changed

+30869
-6761
lines changed

Gemfile.lock

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1-
PATH
2-
remote: examples/fastlane-plugin-branch
1+
GIT
2+
remote: https://github.com/BranchMetrics/fastlane-plugin-branch
3+
revision: 340b439c90abc3d3b78ee666f9ceb8b66b368279
34
specs:
45
fastlane-plugin-branch (0.1.0)
6+
nokogiri
57
plist
6-
xcodeproj (~> 1.4)
8+
xcodeproj
79

810
GEM
911
remote: https://rubygems.org/
1012
specs:
1113
CFPropertyList (2.3.5)
12-
activesupport (4.2.8)
14+
activesupport (4.2.9)
1315
i18n (~> 0.7)
1416
minitest (~> 5.1)
1517
thread_safe (~> 0.3, >= 0.3.4)
@@ -19,10 +21,10 @@ GEM
1921
babosa (1.0.2)
2022
backports (3.8.0)
2123
claide (1.0.2)
22-
cocoapods (1.2.1)
24+
cocoapods (1.3.0)
2325
activesupport (>= 4.0.2, < 5)
24-
claide (>= 1.0.1, < 2.0)
25-
cocoapods-core (= 1.2.1)
26+
claide (>= 1.0.2, < 2.0)
27+
cocoapods-core (= 1.3.0)
2628
cocoapods-deintegrate (>= 1.0.1, < 2.0)
2729
cocoapods-downloader (>= 1.1.3, < 2.0)
2830
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -37,9 +39,9 @@ GEM
3739
molinillo (~> 0.5.7)
3840
nap (~> 1.0)
3941
ruby-macho (~> 1.1)
40-
xcodeproj (>= 1.4.4, < 2.0)
41-
cocoapods-core (1.2.1)
42-
activesupport (>= 4.0.2, < 5)
42+
xcodeproj (>= 1.5.1, < 2.0)
43+
cocoapods-core (1.3.0)
44+
activesupport (>= 4.0.2, < 6)
4345
fuzzy_match (~> 2.0.4)
4446
nap (~> 1.0)
4547
cocoapods-deintegrate (1.0.1)
@@ -54,7 +56,7 @@ GEM
5456
cocoapods-try (1.1.0)
5557
colored (1.2)
5658
colored2 (3.1.2)
57-
commander-fastlane (4.4.4)
59+
commander-fastlane (4.4.5)
5860
highline (~> 1.7.2)
5961
connection_pool (2.2.1)
6062
declarative (0.0.9)
@@ -65,28 +67,28 @@ GEM
6567
escape (0.0.4)
6668
ethon (0.10.1)
6769
ffi (>= 1.3.0)
68-
excon (0.57.0)
69-
faraday (0.12.1)
70+
excon (0.58.0)
71+
faraday (0.12.2)
7072
multipart-post (>= 1.2, < 3)
7173
faraday-cookie_jar (0.0.6)
7274
faraday (>= 0.7.4)
7375
http-cookie (~> 1.0.0)
74-
faraday_middleware (0.11.0.1)
76+
faraday_middleware (0.12.2)
7577
faraday (>= 0.7.4, < 1.0)
7678
fastimage (2.1.0)
77-
fastlane (2.39.1)
79+
fastlane (2.50.1)
7880
CFPropertyList (>= 2.3, < 3.0.0)
7981
addressable (>= 2.3, < 3.0.0)
8082
babosa (>= 1.0.2, < 2.0.0)
8183
bundler (>= 1.12.0, < 2.0.0)
8284
colored
83-
commander-fastlane (>= 4.4.0, < 5.0.0)
85+
commander-fastlane (>= 4.4.5, < 5.0.0)
8486
dotenv (>= 2.1.1, < 3.0.0)
8587
excon (>= 0.45.0, < 1.0.0)
8688
faraday (~> 0.9)
8789
faraday-cookie_jar (~> 0.0.6)
8890
faraday_middleware (~> 0.9)
89-
fastimage (>= 1.6)
91+
fastimage (>= 2.1.0, < 3.0.0)
9092
gh_inspector (>= 1.0.1, < 2.0.0)
9193
google-api-client (>= 0.12.0, < 0.13.0)
9294
highline (>= 1.7.2, < 2.0.0)
@@ -124,8 +126,8 @@ GEM
124126
mime-types (~> 3.0)
125127
representable (~> 3.0)
126128
retriable (>= 2.0, < 4.0)
127-
googleauth (0.5.1)
128-
faraday (~> 0.9)
129+
googleauth (0.5.3)
130+
faraday (~> 0.12)
129131
jwt (~> 1.4)
130132
logging (~> 2.0)
131133
memoist (~> 0.12)
@@ -136,7 +138,7 @@ GEM
136138
http-cookie (1.0.3)
137139
domain_name (~> 0.5)
138140
httpclient (2.8.3)
139-
i18n (0.8.4)
141+
i18n (0.8.6)
140142
json (2.1.0)
141143
jwt (1.5.6)
142144
launchy (2.4.3)
@@ -145,12 +147,13 @@ GEM
145147
logging (2.2.2)
146148
little-plugger (~> 1.1)
147149
multi_json (~> 1.10)
148-
memoist (0.15.0)
150+
memoist (0.16.0)
149151
mime-types (3.1)
150152
mime-types-data (~> 3.2015)
151153
mime-types-data (3.2016.0521)
152154
mini_magick (4.5.1)
153-
minitest (5.10.2)
155+
mini_portile2 (2.2.0)
156+
minitest (5.10.3)
154157
molinillo (0.5.7)
155158
multi_json (1.12.1)
156159
multi_xml (0.6.0)
@@ -161,6 +164,8 @@ GEM
161164
connection_pool (~> 2.2)
162165
net-http-pipeline (1.0.1)
163166
netrc (0.7.8)
167+
nokogiri (1.8.0)
168+
mini_portile2 (~> 2.2.0)
164169
os (0.9.6)
165170
plist (3.3.0)
166171
public_suffix (2.0.5)
@@ -171,7 +176,7 @@ GEM
171176
declarative (< 0.1.0)
172177
declarative-option (< 0.2.0)
173178
uber (< 0.2.0)
174-
retriable (3.0.2)
179+
retriable (3.1.1)
175180
rouge (2.0.7)
176181
ruby-macho (1.1.0)
177182
rubyzip (1.2.1)
@@ -204,10 +209,10 @@ GEM
204209
unf (0.1.4)
205210
unf_ext
206211
unf_ext (0.0.7.4)
207-
unicode-display_width (1.2.1)
212+
unicode-display_width (1.3.0)
208213
websocket (1.2.4)
209214
word_wrap (1.0.0)
210-
xcodeproj (1.5.0)
215+
xcodeproj (1.5.1)
211216
CFPropertyList (~> 2.3.3)
212217
claide (>= 1.0.2, < 2.0)
213218
colored2 (~> 3.1)
@@ -227,4 +232,4 @@ DEPENDENCIES
227232
travis
228233

229234
BUNDLED WITH
230-
1.15.1
235+
1.15.3

examples/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ See each app for further details, including build instructions.
1010
[webview_example]: ./webview_example
1111
[webview_example_native_ios]: ./webview_example_native_ios
1212

13-
## Automatically set up iOS Branch configuration (experimental)
13+
## Automatically set up iOS Branch configuration with Fastlane
1414

1515
To run any of the 2.0 iOS examples ([testbed_native_ios], [testbed_simple], [webview_example], [webview_example_native_ios]) on a device,
1616
you can use Fastlane to set the following Branch-related configuration parameters without changing settings manually
@@ -38,8 +38,8 @@ bundle exec fastlane update_branch
3838
```
3939

4040
The plugin crawls the Branch-generated apple-app-site-association file for the domain to get the
41-
team and bundle identifiers that you entered in the Branch Dashboard. Both the live and test keys
42-
are required.
41+
team and bundle identifiers that you entered in the Branch Dashboard. The live or test key is required.
42+
Both are not required, but both may be supplied to set up both environments.
4343

4444
## webview_example apps
4545

examples/fastlane-plugin-branch/.gitignore

Lines changed: 0 additions & 8 deletions
This file was deleted.

examples/fastlane-plugin-branch/.rspec

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)