Merge beta into master

.circleci/config.yml

@@ -119,7 +119,7 @@ jobs:
       - save_cache: *save-npm-cache-linux
 
   # Android builds
-  android-build:
+  android-play-build:
     <<: *defaults
     docker:
       - image: circleci/android:api-28-node
@@ -150,7 +150,7 @@ jobs:
             # echo -e "android.enableAapt2=false" >> ./gradle.properties
             echo -e "android.useAndroidX=true" >> ./gradle.properties
             echo -e "android.enableJetifier=true" >> ./gradle.properties
-            echo -e "FLIPPER_VERSION=0.33.1" >> ./gradle.properties
+            echo -e "FLIPPER_VERSION=0.51.0" >> ./gradle.properties
 
             if [[ $KEYSTORE ]]; then
               echo $KEYSTORE_BASE64 | base64 --decode > ./app/$KEYSTORE
@@ -167,21 +167,23 @@ jobs:
       - run:
           name: Set Google Services
           command: |
-            cp google-services.prod.json google-services.json
-          working_directory: android/app
+            if [[ $KEYSTORE ]]; then
+              echo $GOOGLE_SERVICES_ANDROID | base64 --decode > google-services.json
+            fi
+          working_directory: android/app/src/play
 
       - run:
           name: Config variables
           command: |
             echo -e "export default { BUGSNAG_API_KEY: '$BUGSNAG_KEY' };" > ./config.js
 
       - run:
-          name: Build Android App
+          name: Build Android Play App
           command: |
             if [[ $KEYSTORE ]]; then
-              bundle exec fastlane android release
+              bundle exec fastlane android playRelease
             else
-              bundle exec fastlane android build
+              bundle exec fastlane android playBuild
             fi
           working_directory: android
 
@@ -192,8 +194,8 @@ jobs:
               yarn generate-source-maps-android upload \
                 --api-key=$BUGSNAG_KEY \
                 --app-version=$CIRCLE_BUILD_NUM \
-                --minifiedFile=android/app/build/generated/assets/react/release/app.bundle \
-                --source-map=android/app/build/generated/sourcemaps/react/release/app.bundle.map \
+                --minifiedFile=android/app/build/generated/assets/react/play/release/app.bundle \
+                --source-map=android/app/build/generated/sourcemaps/react/play/release/app.bundle.map \
                 --minified-url=app.bundle \
                 --upload-sources
             fi
@@ -211,7 +213,68 @@ jobs:
             - android/fastlane/report.xml
             - android/app/build/outputs
 
-  android-google-play-alpha:
+  android-foss-build:
+    <<: *defaults
+    docker:
+      - image: circleci/android:api-28-node
+
+    environment:
+      JAVA_OPTS: '-Xms512m -Xmx2g'
+      GRADLE_OPTS: '-Xmx3g -Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-Xmx2g -XX:+HeapDumpOnOutOfMemoryError"'
+      TERM: dumb
+      <<: *bash-env
+
+    steps:
+      - checkout
+
+      - run: *install-node
+
+      - restore_cache: *restore-npm-cache-linux
+
+      - run: *install-npm-modules
+
+      - run: *update-fastlane-android
+
+      - restore_cache: *restore-gradle-cache
+
+      - run:
+          name: Configure Gradle
+          command: |
+            echo -e "" > ./gradle.properties
+            # echo -e "android.enableAapt2=false" >> ./gradle.properties
+            echo -e "android.useAndroidX=true" >> ./gradle.properties
+            echo -e "android.enableJetifier=true" >> ./gradle.properties
+            echo -e "FLIPPER_VERSION=0.51.0" >> ./gradle.properties
+            echo -e "VERSIONCODE=$CIRCLE_BUILD_NUM" >> ./gradle.properties
+
+            if [[ $KEYSTORE ]]; then
+              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
+            fi
+          working_directory: android
+
+      - run:
+          name: Build Android Foss App
+          command: bundle exec fastlane android fossRelease
+          working_directory: android
+
+      - store_artifacts:
+          path: android/app/build/outputs
+
+      - save_cache: *save-npm-cache-linux
+
+      - save_cache: *save-gradle-cache
+
+      - persist_to_workspace:
+          root: .
+          paths:
+            - android/fastlane/report.xml
+            - android/app/build/outputs
+
+  android-google-play-beta:
     <<: *defaults
     docker:
       - image: circleci/android:api-28-node
@@ -231,7 +294,7 @@ jobs:
 
       - run:
           name: Fastlane Play Store Upload
-          command: bundle exec fastlane android alpha
+          command: bundle exec fastlane android beta
           working_directory: android
 
   # iOS builds
@@ -254,7 +317,9 @@ jobs:
       - run:
           name: Set Google Services
           command: |
-            cp GoogleService-Info.prod.plist GoogleService-Info.plist
+            if [[ $KEYSTORE ]]; then
+              echo $GOOGLE_SERVICES_REACTNATIVE | base64 --decode > GoogleService-Info.plist
+            fi
           working_directory: ios
 
       - run:
@@ -337,13 +402,20 @@ workflows:
           requires:
             - ios-hold-testflight
 
-      - android-build:
+      - android-play-build:
           requires:
             - lint-testunit
-      - android-hold-google-play-alpha:
+      - android-hold-google-play-beta:
           type: approval
           requires:
-            - android-build
-      - android-google-play-alpha:
+            - android-play-build
+      - android-google-play-beta:
+          requires:
+            - android-hold-google-play-beta
+      - android-hold-foss-build:
+          type: approval
+          requires:
+            - lint-testunit
+      - android-foss-build:
           requires:
-            - android-hold-google-play-alpha
+            - android-hold-foss-build

.github/ISSUE_TEMPLATE.md

@@ -1,6 +1,38 @@
-- Your Rocket.Chat Experimental app version: ####
-- Your Rocket.Chat server version: ####
-- Device (or Simulator) you're running with: ####
+<!-- 
 
-**The app isn't connecting to your server?**
-Make sure your server supports WebSocket. These are the minimum requirements for Apache 2.4 and Nginx 1.3 or greater.
+Please see our guide for opening issues: https://rocket.chat/docs/contributing/reporting-issues
+
+If you have questions or are looking for help/support please see: https://rocket.chat/docs/getting-support
+
+If you are experiencing a bug please search our issues to be sure it is not already present: https://github.com/RocketChat/Rocket.Chat.ReactNative/issues
+
+-->
+
+### Description:
+
+<!-- A clear and concise description of what the bug is. -->
+
+### Environment Information:
+
+- Rocket.Chat Server Version:
+- Rocket.Chat App Version:
+- Device Name: 
+- OS Version: 
+
+### Steps to reproduce:
+
+1. <!-- Go to '...' -->
+2. <!-- Click on '....' -->
+3. <!-- and so on... -->
+
+### Expected behavior:
+
+<!-- What you expect to happen -->
+
+### Actual behavior:
+
+<!-- What actually happens with SCREENSHOT, if applicable -->
+
+### Additional context:
+
+<!-- Add any other context about the problem here. -->

CONTRIBUTING.md

@@ -20,19 +20,23 @@ yarn
 
 Run the app:
 ```sh
-npx react-native run-ios
+yarn ios
 ```
 
 or
 
 ```sh
-npx react-native run-android
+yarn android
 ```
 
 At this point, the app should be running on the simulator or on your device!
 
 *Note: npm won't work on this project*
 
+### How to inspect the app
+
+We use [Reactotron](https://github.com/infinitered/reactotron) to inspect logs, redux state, redux-sagas, HTTP requests, etc.
+
 ## Issues needing help
 
 Didn't find a bug or want a new feature not already reported? Check out the [help wanted](https://github.com/RocketChat/Rocket.Chat.ReactNative/issues?q=is%3Aissue+is%3Aopen+label%3A%22%F0%9F%91%8B+help+wanted%22) or the [good first issue](https://github.com/RocketChat/Rocket.Chat.ReactNative/issues?q=is%3Aissue+is%3Aopen+label%3A%22%F0%9F%8D%AD+good+first+issue%22) labels.

__mocks__/react-native-config-reader.js

@@ -0,0 +1,3 @@
+export default {
+	BuildConfigs: null
+};