toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PLT-5679 Connect iOS to plain http servers (#316)

Browse source 
* PLT-5679 connect to plain http servers

* fix identation
This commit is contained in:
enahum 2017-03-01 13:12:57 -03:00 committed by Harrison Healey
parent 542555d3bb
commit 5759ae48db
3 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -122,7 +122,7 @@ endif
do-build-ios:
@echo "Building ios $(ios_target) app"
@cd fastlane && fastlane ios $(ios_target)
@cd fastlane && bundle exec fastlane ios $(ios_target)
build-ios: | check-ios-target pre-run check-style start-packager do-build-ios stop-packager
@ -139,7 +139,7 @@ prepare-android-build:
do-build-android:
@echo "Building android $(android_target) app"
@cd fastlane && fastlane android $(android_target)
@cd fastlane && bundle exec fastlane android $(android_target)
build-android: | check-android-target pre-run check-style start-packager prepare-android-build do-build-android stop-packager

32
fastlane/Gemfile.lock
View file

@ -1,10 +1,9 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (2.3.4)
activesupport (4.2.7.1)
CFPropertyList (2.3.5)
activesupport (4.2.8)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
@ -15,24 +14,23 @@ GEM
colored (1.2)
commander (4.4.3)
highline (~> 1.7.2)
domain_name (0.5.20161129)
domain_name (0.5.20170223)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.1.2)
excon (0.54.0)
dotenv (2.2.0)
excon (0.55.0)
faraday (0.11.0)
multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6)
faraday (>= 0.7.4)
http-cookie (~> 1.0.0)
faraday_middleware (0.11.0)
faraday_middleware (0.11.0.1)
faraday (>= 0.7.4, < 1.0)
fastimage (2.0.1)
addressable (~> 2)
fastlane (2.9.0)
fastimage (2.1.0)
fastlane (2.18.3)
activesupport (< 5)
addressable (>= 2.3, < 3.0.0)
babosa (>= 1.0.2, < 2.0.0)
bundler (~> 1.12)
bundler (>= 1.12.0, < 2.0.0)
colored
commander (>= 4.4.0, < 5.0.0)
dotenv (>= 2.1.1, < 3.0.0)
@ -55,6 +53,7 @@ GEM
slack-notifier (>= 1.3, < 2.0.0)
terminal-notifier (>= 1.6.2, < 2.0.0)
terminal-table (>= 1.4.5, < 2.0.0)
tty-screen (~> 0.5.0)
word_wrap (~> 1.0.0)
xcodeproj (>= 0.20, < 2.0.0)
xcpretty (>= 0.2.4, < 1.0.0)
@ -62,7 +61,7 @@ GEM
fastlane-plugin-commit_android_version_bump (0.1.3)
fastlane-plugin-increment_version_code (0.3.1)
gh_inspector (1.0.3)
google-api-client (0.9.20)
google-api-client (0.9.28)
addressable (~> 2.3)
googleauth (~> 0.5)
httpclient (~> 2.7)
@ -84,8 +83,8 @@ GEM
domain_name (~> 0.5)
httpclient (2.8.3)
hurley (0.2)
i18n (0.7.0)
json (1.8.6)
i18n (0.8.1)
json (2.0.3)
jwt (1.5.6)
little-plugger (1.1.4)
logging (2.1.0)
@ -108,7 +107,7 @@ GEM
uber (~> 0.0.7)
retriable (2.1.0)
rouge (1.11.1)
rubyzip (1.2.0)
rubyzip (1.2.1)
security (0.1.3)
signet (0.7.3)
addressable (~> 2.3)
@ -119,7 +118,8 @@ GEM
terminal-notifier (1.7.1)
terminal-table (1.7.3)
unicode-display_width (~> 1.1.1)
thread_safe (0.3.5)
thread_safe (0.3.6)
tty-screen (0.5.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uber (0.0.15)

2
ios/Mattermost/Info.plist
View file

@ -32,6 +32,8 @@
<true/>
</dict>
</dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
<key>NSLocationWhenInUseUsageDescription</key>
<string></string>