Fastlane for Android and ios (mattermost#165)

.gitattributes

@@ -0,0 +1 @@
+*.pbxproj -text

.gitignore

@@ -22,6 +22,7 @@ xcuserdata
 DerivedData
 *.hmap
 *.ipa
+*.apk
 *.xcuserstate
 project.xcworkspace
 
@@ -52,3 +53,8 @@ Session.vim
 .netrwhist
 *~
 tags
+
+fastlane/report.xml
+*.zip
+server.PID
+mattermost.keystore

Makefile

@@ -1,4 +1,9 @@
 .PHONY: run run-ios run-android check-style test clean post-install
+.PHONY: check-ios-target prepare-ios-build build-ios after-ios-build
+.PHONY: check-android-target prepare-android-build build-android after-android-build
+
+ios_target := $(filter-out build-ios,$(MAKECMDGOALS))
+android_target := $(filter-out build-android,$(MAKECMDGOALS))
 
 .npminstall: package.json
 	@if ! [ $(shell command -v npm) ]; then \
@@ -24,7 +29,6 @@ dist/assets: $(BASE_ASSETS) $(OVERRIDE_ASSETS)
 
 	node scripts/make-dist-assets.js
 
-.PHONY: prepare
 pre-run: .npminstall dist/assets
 
 run: run-ios
@@ -91,3 +95,55 @@ post-install:
 	sed -i'' -e 's|"./lib/locales": false|"./lib/locales": "./lib/locales"|g' node_modules/intl-messageformat/package.json
 	sed -i'' -e 's|"./lib/locales": false|"./lib/locales": "./lib/locales"|g' node_modules/intl-relativeformat/package.json
 	sed -i'' -e 's|"./locale-data/complete.js": false|"./locale-data/complete.js": "./locale-data/complete.js"|g' node_modules/intl/package.json
+
+check-ios-target:
+ifneq ($(ios_target), $(filter $(ios_target), dev beta release))
+	@echo "Try running make build-ios TARGET\nWhere TARGET is one of dev, beta or release"
+	@exit 1
+endif
+
+prepare-ios-build:
+	# We need to do this as the react-native packager minifies the output and that is causing issues
+	@sed -i'' -e 's|--dev $$DEV|--dev true|g' ./node_modules/react-native/packager/react-native-xcode.sh
+
+	@node ./node_modules/react-native/local-cli/cli.js start --reset-cache & echo $$! > server.PID
+
+do-build-ios:
+	@echo "Building ios $(ios_target) app"
+	@cd fastlane && fastlane ios $(ios_target)
+
+after-ios-build:
+	@echo Cleaning up
+	@sed -i'' -e 's|--dev true|--dev $$DEV|g' ./node_modules/react-native/packager/react-native-xcode.sh
+	@kill -9 `cat server.PID` && rm server.PID
+
+build-ios: | check-ios-target pre-run check-style prepare-ios-build do-build-ios after-ios-build
+
+check-android-target:
+ifneq ($(android_target), $(filter $(android_target), dev beta release))
+	@echo "Try running make build-android TARGET\nWhere TARGET is one of dev, beta or release"
+	@exit 1
+endif
+
+prepare-android-build:
+	@rm -rf ./node_modules/react-native/local-cli/templates/HelloWorld
+	@sed -i'' -e 's|def devEnabled = !targetName.toLowerCase().contains("release")|def devEnabled = true|g' ./node_modules/react-native/react.gradle
+
+do-build-android:
+	@echo "Building android $(android_target) app"
+	@cd fastlane && fastlane android $(android_target)
+
+after-android-build:
+	@echo Cleaning up
+	@sed -i'' -e 's|def devEnabled = true|def devEnabled = !targetName.toLowerCase().contains("release")|g' ./node_modules/react-native/react.gradle
+
+build-android: | check-android-target pre-run check-style prepare-android-build do-build-android after-android-build
+
+dev:
+	@:
+
+beta:
+	@:
+
+release:
+	@:

android/app/build.gradle

@@ -88,15 +88,24 @@ android {
     buildToolsVersion "23.0.1"
 
     defaultConfig {
-        applicationId "com.mattermost"
+        applicationId "com.mattermost.react.native"
         minSdkVersion 16
-        targetSdkVersion 22
-        versionCode 1
+        targetSdkVersion 23
+        versionCode 2
         versionName "1.0"
+        multiDexEnabled true
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }
     }
+    signingConfigs {
+        release {
+            storeFile file(MATTERMOST_RELEASE_STORE_FILE)
+            storePassword MATTERMOST_RELEASE_PASSWORD
+            keyAlias MATTERMOST_RELEASE_KEY_ALIAS
+            keyPassword MATTERMOST_RELEASE_PASSWORD
+        }
+    }
     splits {
         abi {
             reset()
@@ -109,6 +118,7 @@ android {
         release {
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
+            signingConfig signingConfigs.release
         }
     }
     // applicationVariants are e.g. debug, release
@@ -127,6 +137,7 @@ android {
 }
 
 dependencies {
+    compile project(':react-native-vector-icons')
     compile project(':react-native-svg')
     compile fileTree(dir: "libs", include: ["*.jar"])
     compile "com.android.support:appcompat-v7:23.0.1"
@@ -136,6 +147,6 @@ dependencies {
 // Run this once to be able to run the application with BUCK
 // puts all compile dependencies into folder libs for BUCK to use
 task copyDownloadableDepsToLibs(type: Copy) {
-  from configurations.compile
-  into 'libs'
+    from configurations.compile
+    into 'libs'
 }

android/app/src/main/java/com/mattermost/MainApplication.java

@@ -4,11 +4,13 @@
 import android.util.Log;
 
 import com.facebook.react.ReactApplication;
+import com.oblador.vectoricons.VectorIconsPackage;
 import com.horcrux.svg.RNSvgPackage;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
+import com.facebook.soloader.SoLoader;
 
 import java.util.Arrays;
 import java.util.List;
@@ -25,13 +27,20 @@ protected boolean getUseDeveloperSupport() {
     protected List<ReactPackage> getPackages() {
       return Arrays.<ReactPackage>asList(
           new MainReactPackage(),
+            new VectorIconsPackage(),
             new RNSvgPackage()
       );
     }
   };
 
   @Override
   public ReactNativeHost getReactNativeHost() {
-      return mReactNativeHost;
+    return mReactNativeHost;
+  }
+
+  @Override
+  public void onCreate() {
+    super.onCreate();
+    SoLoader.init(this, /* native exopackage */ false);
   }
 }

android/settings.gradle

@@ -1,4 +1,6 @@
 rootProject.name = 'Mattermost'
+include ':react-native-vector-icons'
+project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
 
 include ':app'
 include ':react-native-svg'

app/mattermost.js

@@ -5,10 +5,11 @@ import React from 'react';
 import {Provider} from 'react-redux';
 
 import configureStore from 'app/store';
+import initialState from 'app/initial_state';
 import Router from 'app/navigation/router';
 import RootLayout from 'app/layouts/root_layout/root_layout_container';
 
-const store = configureStore();
+const store = configureStore(initialState);
 
 export default class Mattermost extends React.Component {
     render() {