Merge 15165c7931 into e0777a969e

2017-11-06 12:22:04 +00:00 · 2017-11-06 12:22:04 +00:00 · 538b4cb5bf
parent e0777a969e 15165c7931
commit 538b4cb5bf
22 changed files with 7720 additions and 1607 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -0,0 +1,113 @@
+defaults: &defaults
+  working_directory: ~/repo
+
+version: 2
+jobs:
+  test:
+    <<: *defaults
+    docker:
+      - image: circleci/node:8
+
+    environment:
+      CODECOV_TOKEN: caa771ab-3d45-4756-8e2a-e1f25996fef6
+
+    steps:
+      - checkout
+
+      - run:
+          name: Install NPM modules
+          command: |
+            npm install
+            npm install codecov
+
+      - run:
+          name: Lint
+          command: |
+            npm run lint
+
+      - run:
+          name: Test
+          command: |
+            npm test
+
+      - run:
+          name: Codecov
+          command: |
+            npx codecov
+
+  build:
+    <<: *defaults
+    docker:
+      - image: circleci/android:api-26-alpha
+
+    environment:
+      GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"
+      JVM_OPTS: -Xmx2048m
+      TERM: dumb
+      BASH_ENV: "~/.nvm/nvm.sh"
+    steps:
+      - checkout
+
+      - run:
+          name: Install Node 8
+          command: |
+            curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.6/install.sh | bash
+            source ~/.nvm/nvm.sh
+            nvm install 8
+            npm install
+
+      - restore_cache:
+          key: node-modules-{{ checksum ".circleci/config.yml" }}-{{ checksum "package.json" }}
+
+      - run:
+          name: Install NPM modules
+          command: |
+            npm install
+
+      - restore_cache:
+          key: android-{{ checksum ".circleci/config.yml" }}-{{ checksum "android/build.gradle" }}-{{ checksum  "android/app/build.gradle" }}
+
+      - run:
+          name: Install Android Depedencies
+          command: |
+            cd android
+            ./gradlew androidDependencies
+
+      - run:
+          name: Build Android App
+          command: |
+            cd android
+
+            echo $KEYSTORE_BASE64 | base64 --decode > ./app/$KEYSTORE
+            echo -e "KEYSTORE=$KEYSTORE" > ./gradle.properties
+            echo -e "KEYSTORE_PASSWORD=$KEYSTORE_PASSWORD" >> ./gradle.properties
+            echo -e "KEY_ALIAS=$KEY_ALIAS" >> ./gradle.properties
+            echo -e "KEY_PASSWORD=$KEYSTORE_PASSWORD" >> ./gradle.properties
+
+            ./gradlew assembleRelease
+
+            mkdir -p /tmp/build
+
+            mv app/build/outputs /tmp/build/
+
+      - store_artifacts:
+          path: /tmp/build/outputs
+
+      - save_cache:
+          key: node-modules-{{ checksum ".circleci/config.yml" }}-{{ checksum "package.json" }}
+          paths:
+            - ./node_modules
+
+      - save_cache:
+          key: android-{{ checksum ".circleci/config.yml" }}-{{ checksum "android/build.gradle" }}-{{ checksum  "android/app/build.gradle" }}
+          paths:
+            - ~/.gradle
+
+workflows:
+  version: 2
+  build-and-test:
+    jobs:
+      - test
+      - build:
+          requires:
+            - test
--- a/android/app/BUCK
+++ b/android/app/BUCK
@ -45,12 +45,12 @@ android_library(

 android_build_config(
    name = "build_config",
-    package = "com.rocketchatrn",
+    package = "chat.rocket.reactnative",
 )

 android_resource(
    name = "res",
-    package = "com.rocketchatrn",
+    package = "chat.rocket.reactnative",
    res = "src/main/res",
 )

--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -94,7 +94,7 @@ android {
    buildToolsVersion "25.0.1"

    defaultConfig {
-        applicationId "com.rocketchatrn"
+        applicationId "chat.rocket.reactnative"
        minSdkVersion 16
        targetSdkVersion 22
        versionCode 1
@ -105,11 +105,11 @@ android {
    }
    signingConfigs {
        release {
-            if (project.hasProperty('ROCKETCHAT_RN_RELEASE_STORE_FILE')) {
-                storeFile file(ROCKETCHAT_RN_RELEASE_STORE_FILE)
-                storePassword ROCKETCHAT_RN_RELEASE_STORE_PASSWORD
-                keyAlias ROCKETCHAT_RN_RELEASE_KEY_ALIAS
-                keyPassword ROCKETCHAT_RN_RELEASE_KEY_PASSWORD
+            if (project.hasProperty('KEYSTORE')) {
+                storeFile file(KEYSTORE)
+                storePassword KEYSTORE_PASSWORD
+                keyAlias KEY_ALIAS
+                keyPassword KEY_PASSWORD
            }
        }
    }
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.rocketchatrn"
+    package="chat.rocket.reactnative"
    android:versionCode="1"
    android:versionName="1.0">

--- a/android/app/src/main/java/com/rocketchatrn/MainActivity.java
+++ b/android/app/src/main/java/com/rocketchatrn/MainActivity.java
@ -1,4 +1,4 @@
-package com.rocketchatrn;
+package chat.rocket.reactnative;

 import com.facebook.react.ReactActivity;

--- a/android/app/src/main/java/com/rocketchatrn/MainApplication.java
+++ b/android/app/src/main/java/com/rocketchatrn/MainApplication.java
@ -1,4 +1,4 @@
-package com.rocketchatrn;
+package chat.rocket.reactnative;

 import android.app.Application;

--- a/android/app/src/main/res/drawable-hdpi/node_modules_reactnavigation_src_views_assets_backicon.png
+++ b/android/app/src/main/res/drawable-hdpi/node_modules_reactnavigation_src_views_assets_backicon.png
--- a/android/app/src/main/res/drawable-mdpi/app_images_logo.png
+++ b/android/app/src/main/res/drawable-mdpi/app_images_logo.png
--- a/android/app/src/main/res/drawable-mdpi/node_modules_reactnavigation_src_views_assets_backicon.png
+++ b/android/app/src/main/res/drawable-mdpi/node_modules_reactnavigation_src_views_assets_backicon.png
--- a/android/app/src/main/res/drawable-xhdpi/node_modules_reactnavigation_src_views_assets_backicon.png
+++ b/android/app/src/main/res/drawable-xhdpi/node_modules_reactnavigation_src_views_assets_backicon.png
--- a/android/app/src/main/res/drawable-xxhdpi/node_modules_reactnavigation_src_views_assets_backicon.png
+++ b/android/app/src/main/res/drawable-xxhdpi/node_modules_reactnavigation_src_views_assets_backicon.png
--- a/android/app/src/main/res/drawable-xxxhdpi/node_modules_reactnavigation_src_views_assets_backicon.png
+++ b/android/app/src/main/res/drawable-xxxhdpi/node_modules_reactnavigation_src_views_assets_backicon.png
--- a/app/lib/createStore.js
+++ b/app/lib/createStore.js
@ -1,6 +1,3 @@
-import 'babel-polyfill';
-import 'regenerator-runtime/runtime';
-
 import { createStore, applyMiddleware } from 'redux';
 import createSagaMiddleware from 'redux-saga';
 import logger from 'redux-logger';
--- a/index.android.js
+++ b/index.android.js
@ -1,5 +1,5 @@
-// import 'babel-polyfill';
-// import 'regenerator-runtime/runtime';
+import 'babel-polyfill';
+import 'regenerator-runtime/runtime';
 import { AppRegistry } from 'react-native';


--- a/index.ios.js
+++ b/index.ios.js
@ -1,5 +1,5 @@
-// import 'babel-polyfill';
-// import 'regenerator-runtime/runtime';
+import 'babel-polyfill';
+import 'regenerator-runtime/runtime';
 import { AppRegistry } from 'react-native';


--- a/ios/RocketChatRN.xcodeproj/project.pbxproj
+++ b/ios/RocketChatRN.xcodeproj/project.pbxproj
@ -5,6 +5,7 @@
 	};
 	objectVersion = 46;
 	objects = {
+
 /* Begin PBXBuildFile section */
 		00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
 		00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
@ -672,6 +673,7 @@
 				6533FB90166345D29F1B91C0 /* libRNFetchBlob.a */,
 				5A0EEFAF8AB14F5B9E796CDD /* libRNVectorIcons.a */,
 				DA50CE47374C4C35BE6D9D58 /* libRNSVG.a */,
+				3B696712EE2345A59F007A88 /* libRNImagePicker.a */,
 			);
 			name = "Recovered References";
 			sourceTree = "<group>";
@ -800,6 +802,7 @@
 						TestTargetID = 13B07F861A680F5B00A75B9A;
 					};
 					13B07F861A680F5B00A75B9A = {
+						DevelopmentTeam = S6UPZG7ZR3;
 						ProvisioningStyle = Automatic;
 					};
 					2D02E47A1E0B4A5D006451C7 = {
@ -1378,7 +1381,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = NO;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = S6UPZG7ZR3;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(SRCROOT)/../node_modules/realm/src/**",
@ -1397,7 +1400,7 @@
 					"-ObjC",
 					"-lc++",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.reactnative;
+				PRODUCT_BUNDLE_IDENTIFIER = "chat.rocket.reactnative-chat.rocket.reactnative";
 				PRODUCT_NAME = RocketChatRN;
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@ -1411,7 +1414,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = S6UPZG7ZR3;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(SRCROOT)/../node_modules/realm/src/**",
@ -1430,7 +1433,7 @@
 					"-ObjC",
 					"-lc++",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.reactnative;
+				PRODUCT_BUNDLE_IDENTIFIER = "chat.rocket.reactnative-chat.rocket.reactnative";
 				PRODUCT_NAME = RocketChatRN;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				VERSIONING_SYSTEM = "apple-generic";
--- a/ios/RocketChatRN.xcodeproj/xcshareddata/xcschemes/RocketChatRN-tvOS.xcscheme
+++ b/ios/RocketChatRN.xcodeproj/xcshareddata/xcschemes/RocketChatRN-tvOS.xcscheme
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0900"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "NO"
@ -54,6 +54,7 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
      shouldUseLaunchSchemeArgsEnv = "YES">
      <Testables>
         <TestableReference
@ -83,6 +84,7 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
--- a/ios/RocketChatRN.xcodeproj/xcshareddata/xcschemes/RocketChatRN.xcscheme
+++ b/ios/RocketChatRN.xcodeproj/xcshareddata/xcschemes/RocketChatRN.xcscheme
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0620"
+   LastUpgradeVersion = "0900"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "NO"
@ -54,6 +54,7 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
      shouldUseLaunchSchemeArgsEnv = "YES">
      <Testables>
         <TestableReference
@ -83,6 +84,7 @@
      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
      ignoresPersistentStateOnLaunch = "NO"
--- a/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/ios/RocketChatRN/Images.xcassets/AppIcon.appiconset/Contents.json
@ -143,6 +143,11 @@
      "idiom" : "ipad",
      "filename" : "icon-83.5@2x.png",
      "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
    }
  ],
  "info" : {
--- a/ios/RocketChatRN/Info.plist
+++ b/ios/RocketChatRN/Info.plist
@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>Rocket.Chat.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>chat.rocket.reactnative</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>0.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>2</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
@ -38,7 +38,7 @@
 	<key>NSCameraUsageDescription</key>
 	<string>Upload images from camera</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string/>
+	<string></string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>Upload images from library</string>
 	<key>UIAppFonts</key>
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -69,5 +69,10 @@
    "preset": "react-native",
    "coverageDirectory": "./coverage/",
    "collectCoverage": true
+  },
+  "engines": {
+    "node": ">=8.x",
+    "npm": ">=4.x",
+    "yarn": ">=0.21.3"
  }
 }