Merge branch 'develop' into new-apps

.circleci/changelog.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+git log --format="%cd" -n 14 --date=short | sort -u -r | while read DATE ; do
+    echo $DATE
+    GIT_PAGER=cat git log --no-merges --format="- %s" --since="$DATE 00:00:00" --until="$DATE 24:00:00"
+	echo
+done

.circleci/config.yml

@@ -0,0 +1,167 @@
+defaults: &defaults
+  working_directory: ~/repo
+
+version: 2
+jobs:
+  android-build:
+    <<: *defaults
+    docker:
+      - image: circleci/android:api-23-alpha
+    environment:
+      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
+      - run:
+          name: Install ImageMagick
+          command: |
+            sudo apt-get update
+            sudo apt-get install imagemagick
+      - run:
+          name: Install Gradle
+          command: |
+            export TERM=xterm
+            wget https://services.gradle.org/distributions/gradle-2.13-all.zip
+            sudo mkdir /opt/gradle
+            sudo unzip -d /opt/gradle/ gradle-2.13-all.zip
+            export PATH=$PATH:/opt/gradle/gradle-2.13/bin
+            mkdir -p /opt/android/sdk/tools/templates/gradle/wrapper
+            cd /opt/android/sdk/tools/templates/gradle/wrapper
+            gradle wrapper
+            cd ~/repo
+      - run:
+          name: Install global dependencies
+          command: |
+            npm install -g cordova coffee-script
+      - run:
+          name: Install NPM modules
+          command: |
+            rm -rf node_modules
+            npm install
+      - run:
+          name: Create configuration files
+          command: |
+            echo "Bugsnag.apiKey = '$BUGSNAG_API_KEY';" > www/js/bugsnag_apikey.js
+            echo "window.ANDROID_SENDER_ID = '$ANDROID_SENDER_ID';" > www/shared/js/android_sender_id.js
+      - run:
+          name: Cordova build
+          command: |
+            rm -rf platforms
+            rm -rf plugins
+            rm -rf resources
+            cordova prepare android
+
+            if [[ $KEYSTORE ]]; then
+              echo $KEYSTORE_BASE64 | base64 --decode > ./$KEYSTORE
+              cordova build android --release -- --keystore=./$KEYSTORE --storePassword=$KEYSTORE_PASSWORD --alias=$KEY_ALIAS --password=$KEY_PASSWORD
+            else
+              cordova build android
+            fi
+
+            mkdir -p /tmp/build
+            mv platforms/android/build/outputs/apk /tmp/build/outputs
+
+      - store_artifacts:
+          path: /tmp/build/outputs
+
+  ios-build:
+    macos:
+      xcode: "9.0"
+    environment:
+      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
+            # https://github.com/creationix/nvm/issues/1394
+            set +e
+            nvm install 8
+      - run:
+          name: Update Fastlane
+          command: |
+            brew update
+            brew install ruby
+            sudo gem install fastlane
+            bundle install
+      - run:
+          name: Install ImageMagick
+          command: |
+            brew install imagemagick
+      - run:
+          name: Install global dependencies
+          command: |
+            sudo npm install -g cordova coffee-script
+      - run:
+          name: Install NPM modules
+          command: |
+            rm -rf node_modules
+            npm install
+      - run:
+          name: Create configuration files
+          command: |
+            echo "Bugsnag.apiKey = '$BUGSNAG_API_KEY';" > www/js/bugsnag_apikey.js
+            echo "window.ANDROID_SENDER_ID = '$ANDROID_SENDER_ID';" > www/shared/js/android_sender_id.js
+      - run:
+          name: Cordova configuration
+          command: |
+            rm -rf platforms
+            rm -rf plugins
+            rm -rf resources
+            sed -i '.bkp' 's/ios-CFBundleVersion="[[:digit:]]*"/ios-CFBundleVersion="'$CIRCLE_BUILD_NUM'"/' config.xml
+            cordova prepare ios
+            bundle exec fastlane ios build
+      
+      - store_artifacts:
+          path: ios/RocketChat.ipa
+
+      - persist_to_workspace:
+          root: .
+          paths:
+            - platforms/ios/*.ipa
+            - fastlane/report.xml
+
+  ios-testflight:
+    macos:
+      xcode: "9.0"
+
+    steps:
+      - checkout
+
+      - attach_workspace:
+          at: ios
+
+      - run:
+          name: Update Fastlane
+          command: |
+            brew update
+            brew install ruby
+            sudo gem install fastlane
+            bundle install
+
+      - run:
+          name: Fastlane Tesflight Upload
+          command: |
+            cd ios
+            bundle exec fastlane pilot upload --ipa platforms/ios/Rocket.Chat.ipa --changelog "$(sh ../.circleci/changelog.sh)"
+workflows:
+  version: 2
+  build:
+    jobs:
+      - ios-build
+      - ios-testflight:
+          requires:
+            - ios-build
+          # filters:
+          #   branches:
+          #     only:
+          #       - develop
+          #       - master
+      - android-build

Gemfile

@@ -0,0 +1,10 @@
+# Autogenerated by fastlane
+#
+# Ensure this file is checked in to source control!
+
+source "https://rubygems.org"
+
+gem 'fastlane'
+
+plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
+eval_gemfile(plugins_path) if File.exist?(plugins_path)

Gemfile.lock

@@ -0,0 +1,147 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (2.3.6)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    atomos (0.1.2)
+    babosa (1.0.2)
+    claide (1.0.2)
+    colored (1.2)
+    colored2 (3.1.2)
+    commander-fastlane (4.4.6)
+      highline (~> 1.7.2)
+    declarative (0.0.10)
+    declarative-option (0.1.0)
+    domain_name (0.5.20170404)
+      unf (>= 0.0.5, < 1.0.0)
+    dotenv (2.2.1)
+    excon (0.60.0)
+    faraday (0.14.0)
+      multipart-post (>= 1.2, < 3)
+    faraday-cookie_jar (0.0.6)
+      faraday (>= 0.7.4)
+      http-cookie (~> 1.0.0)
+    faraday_middleware (0.12.2)
+      faraday (>= 0.7.4, < 1.0)
+    fastimage (2.1.1)
+    fastlane (2.84.0)
+      CFPropertyList (>= 2.3, < 4.0.0)
+      addressable (>= 2.3, < 3.0.0)
+      babosa (>= 1.0.2, < 2.0.0)
+      bundler (>= 1.12.0, < 2.0.0)
+      colored
+      commander-fastlane (>= 4.4.6, < 5.0.0)
+      dotenv (>= 2.1.1, < 3.0.0)
+      excon (>= 0.45.0, < 1.0.0)
+      faraday (~> 0.9)
+      faraday-cookie_jar (~> 0.0.6)
+      faraday_middleware (~> 0.9)
+      fastimage (>= 2.1.0, < 3.0.0)
+      gh_inspector (>= 1.1.2, < 2.0.0)
+      google-api-client (>= 0.13.1, < 0.14.0)
+      highline (>= 1.7.2, < 2.0.0)
+      json (< 3.0.0)
+      mini_magick (~> 4.5.1)
+      multi_json
+      multi_xml (~> 0.5)
+      multipart-post (~> 2.0.0)
+      plist (>= 3.1.0, < 4.0.0)
+      public_suffix (~> 2.0.0)
+      rubyzip (>= 1.1.0, < 2.0.0)
+      security (= 0.1.3)
+      slack-notifier (>= 2.0.0, < 3.0.0)
+      terminal-notifier (>= 1.6.2, < 2.0.0)
+      terminal-table (>= 1.4.5, < 2.0.0)
+      tty-screen (>= 0.6.3, < 1.0.0)
+      tty-spinner (>= 0.8.0, < 1.0.0)
+      word_wrap (~> 1.0.0)
+      xcodeproj (>= 1.5.2, < 2.0.0)
+      xcpretty (>= 0.2.4, < 1.0.0)
+      xcpretty-travis-formatter (>= 0.0.3)
+    fastlane-plugin-upgrade_super_old_xcode_project (0.0.2)
+    gh_inspector (1.1.3)
+    google-api-client (0.13.6)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (~> 0.5)
+      httpclient (>= 2.8.1, < 3.0)
+      mime-types (~> 3.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.0)
+    googleauth (0.6.2)
+      faraday (~> 0.12)
+      jwt (>= 1.4, < 3.0)
+      logging (~> 2.0)
+      memoist (~> 0.12)
+      multi_json (~> 1.11)
+      os (~> 0.9)
+      signet (~> 0.7)
+    highline (1.7.10)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    httpclient (2.8.3)
+    json (2.1.0)
+    jwt (2.1.0)
+    little-plugger (1.1.4)
+    logging (2.2.2)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
+    memoist (0.16.0)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_magick (4.5.1)
+    multi_json (1.13.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    nanaimo (0.2.3)
+    os (0.9.6)
+    plist (3.4.0)
+    public_suffix (2.0.5)
+    representable (3.0.4)
+      declarative (< 0.1.0)
+      declarative-option (< 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.1)
+    rouge (2.0.7)
+    rubyzip (1.2.1)
+    security (0.1.3)
+    signet (0.8.1)
+      addressable (~> 2.3)
+      faraday (~> 0.9)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    slack-notifier (2.3.2)
+    terminal-notifier (1.8.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    tty-cursor (0.5.0)
+    tty-screen (0.6.4)
+    tty-spinner (0.8.0)
+      tty-cursor (>= 0.5.0)
+    uber (0.1.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.5)
+    unicode-display_width (1.3.0)
+    word_wrap (1.0.0)
+    xcodeproj (1.5.6)
+      CFPropertyList (~> 2.3.3)
+      atomos (~> 0.1.2)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.2.3)
+    xcpretty (0.2.8)
+      rouge (~> 2.0.7)
+    xcpretty-travis-formatter (1.0.0)
+      xcpretty (~> 0.2, >= 0.0.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fastlane
+  fastlane-plugin-upgrade_super_old_xcode_project
+
+BUNDLED WITH
+   1.16.1

config.xml

@@ -109,6 +109,12 @@
                 </dict>
             </array>
         </config-file>
+        <config-file parent="NSCameraUsageDescription" platform="ios" target="*-Info.plist">
+            <string>Upload photos directly from the camera</string>
+        </config-file>
+        <config-file parent="NSPhotoLibraryUsageDescription" platform="ios" target="*-Info.plist">
+            <string>Upload photos from library</string>
+        </config-file>
     </platform>
     <preference name="xwalkVersion" value="23" />
     <preference name="xwalkCommandLine" value="--disable-pull-to-refresh-effect" />
@@ -126,7 +132,7 @@
     <preference name="AndroidLaunchMode" value="singleTask" />
     <hook src="hooks/beforePrepare.js" type="before_prepare" />
     <plugin name="com.meteor.cordova-update" spec="https://github.com/RocketChat/com.meteor.cordova-update" />
-    <plugin name="com.verso.cordova.clipboard" spec="https://github.com/danielsogl/cordova-plugin-clipboard" />
+    <plugin name="com.danielsogl.cordova.clipboard" spec="https://github.com/danielsogl/cordova-plugin-clipboard.git" />
     <plugin name="cordova-sharingreceptor" spec="https://github.com/burstaholic/cordova-sharingreceptor" />
     <plugin name="cordova-plugin-1password" spec="0.1.5" />
     <plugin name="cordova-plugin-3dtouch" spec="~1.3.5" />

fastlane/Appfile

@@ -0,0 +1,8 @@
+app_identifier "com.konecty.rocket.chat" # The bundle identifier of your app
+apple_id "rodrigo.nascimento@rocket.chat" # Your Apple email address
+
+team_id "S6UPZG7ZR3" # Developer Portal Team ID
+itc_team_id "118376632"
+
+# you can even provide different app identifiers, Apple IDs and team names per lane:
+# More information: https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Appfile.md