From 591da1b494a07b07f779540c4862222b3f338ad5 Mon Sep 17 00:00:00 2001 From: enahum Date: Wed, 22 Mar 2017 08:16:04 -0300 Subject: [PATCH] Android Version Bump to 18 (#381) * Removed default server and set mattermost-redux to the right commit * Version Bump to 18 --- android/app/build.gradle | 2 +- assets/base/config.json | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index dd4d50d8c..d279e38b7 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -91,7 +91,7 @@ android { applicationId "com.mattermost.react.native" minSdkVersion 16 targetSdkVersion 23 - versionCode 17 + versionCode 18 versionName "1.0" multiDexEnabled true ndk { diff --git a/assets/base/config.json b/assets/base/config.json index 95169a5b6..587710424 100644 --- a/assets/base/config.json +++ b/assets/base/config.json @@ -1,5 +1,5 @@ { - "DefaultServerUrl": "http://localhost:8065", + "DefaultServerUrl": "", "TestServerUrl": "http://localhost:8065", "DefaultLocale": "en", "DefaultTheme": "default", diff --git a/package.json b/package.json index b8b1e8d94..bad7b086b 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "harmony-reflect": "1.5.1", "intl": "1.2.5", "isomorphic-fetch": "2.2.1", - "mattermost-redux": "mattermost/mattermost-redux#957b27015b46538c707f534c24e750e5d1d1e517", + "mattermost-redux": "mattermost/mattermost-redux#c0451f9fe8a6df3330c4b5d415a208e85ed08cba", "react": "15.4.1", "react-addons-pure-render-mixin": "15.4.1", "react-intl": "2.2.2",