Fix app size for iPhone X

RocketChat · Apr 14, 2018 · 06788e5 · 06788e5
1 parent b620c4f
commit 06788e5
Show file tree

Hide file tree

Showing 17 changed files with 120 additions and 58 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -54,9 +54,11 @@ jobs:
           command: |
             rm -rf platforms
             rm -rf plugins
-            rm -rf resources
+            rm -rf resources/icons
+            rm -rf resources/splash
             node hooks/downloadCache.js
             cordova prepare android
+            sed -i.bkp 's/<clobbers target="ga" \/>/<clobbers target="cordovaga" \/>/' plugins/cordova-plugin-google-analytics/plugin.xml
 
             if [[ $KEYSTORE ]]; then
               echo $KEYSTORE_BASE64 | base64 --decode > ./$KEYSTORE
@@ -117,10 +119,12 @@ jobs:
           command: |
             rm -rf platforms
             rm -rf plugins
-            rm -rf resources
+            rm -rf resources/icons
+            rm -rf resources/splash
             sed -i '.bkp' 's/ios-CFBundleVersion="[[:digit:]]*"/ios-CFBundleVersion="'$CIRCLE_BUILD_NUM'"/' config.xml
             node hooks/downloadCache.js
             cordova prepare ios
+            sed -i '.bkp' 's/<clobbers target="ga" \/>/<clobbers target="cordovaga" \/>/' plugins/cordova-plugin-google-analytics/plugin.xml
             bundle exec fastlane ios build
 
       - store_artifacts:
@@ -154,7 +158,7 @@ jobs:
           name: Fastlane Tesflight Upload
           command: |
             cd ios
-            bundle exec fastlane pilot upload --ipa platforms/ios/Rocket.Chat.ipa --changelog "$(sh ../.circleci/changelog.sh)"
+            bundle exec fastlane pilot upload --ipa platforms/ios/Rocket.Chat\ Cordova\ Legacy.ipa --changelog "$(sh ../.circleci/changelog.sh)"
 workflows:
   version: 2
   build:

diff --git a/config.xml b/config.xml
@@ -72,16 +72,14 @@
         <icon height="152" src="resources/icons/Resources/iphone/appicon-76@2x.png" width="152" />
         <icon height="167" src="resources/icons/Resources/iphone/appicon-83.5@2x.png" width="167" />
         <icon height="180" src="resources/icons/Resources/iphone/appicon-60@3x.png" width="180" />
-        <splash height="480" src="resources/splash/Resources/iphone/Default.png" width="320" />
-        <splash height="960" src="resources/splash/Resources/iphone/Default@2x.png" width="640" />
-        <splash height="1136" src="resources/splash/Resources/iphone/Default-568h@2x.png" width="640" />
-        <splash height="1334" src="resources/splash/Resources/iphone/Default-667h@2x.png" width="750" />
-        <splash height="2208" src="resources/splash/Resources/iphone/Default-Portrait-736h@3x.png" width="1242" />
-        <splash height="1242" src="resources/splash/Resources/iphone/Default-Landscape-736h@3x.png" width="2208" />
-        <splash height="1024" src="resources/splash/Resources/iphone/Default-Portrait.png" width="768" />
-        <splash height="2048" src="resources/splash/Resources/iphone/Default-Portrait@2x.png" width="1536" />
-        <splash height="768" src="resources/splash/Resources/iphone/Default-Landscape.png" width="1024" />
-        <splash height="1536" src="resources/splash/Resources/iphone/Default-Landscape@2x.png" width="2048" />
+        <splash src="resources/ios-splash/Default@2x~iphone~anyany.png" />
+        <splash src="resources/ios-splash/Default@2x~iphone~comany.png" />
+        <splash src="resources/ios-splash/Default@2x~iphone~comcom.png" />
+        <splash src="resources/ios-splash/Default@3x~iphone~anyany.png" />
+        <splash src="resources/ios-splash/Default@3x~iphone~anycom.png" />
+        <splash src="resources/ios-splash/Default@3x~iphone~comany.png" />
+        <splash src="resources/ios-splash/Default@2x~ipad~anyany.png" />
+        <splash src="resources/ios-splash/Default@2x~ipad~comany.png" />
         <preference name="Orientation" value="all" />
         <config-file parent="ITSAppUsesNonExemptEncryption" platform="ios" target="*-Info.plist">
             <false />
@@ -131,6 +129,9 @@
     <preference name="deployment-target" value="9.0" />
     <preference name="AndroidLaunchMode" value="singleTask" />
     <hook src="hooks/beforePrepare.js" type="before_prepare" />
+    <preference name="TwitterConsumerKey" value="njl2I82AXrOo0YftZyKHyC8aV" />
+    <preference name="TwitterConsumerSecret" value="2RmFsMIZmOXY4mMQ1qTuoOOcOPDVtgNMbJLPFgigaYTPpQuVVQ" />
+    <plugin name="cordova-plugin-splashscreen" spec="^5.0.2" />
     <plugin name="com.meteor.cordova-update" spec="https://github.com/RocketChat/com.meteor.cordova-update" />
     <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" />
@@ -153,7 +154,6 @@
     <plugin name="cordova-plugin-legacy-whitelist" spec="1.1.2" />
     <plugin name="cordova-plugin-media" spec="~2.4.1" />
     <plugin name="cordova-plugin-media-capture" spec="~1.4.1" />
-    <plugin name="cordova-plugin-splashscreen" spec="4.0.1" />
     <plugin name="cordova-plugin-statusbar" spec="2.2.1" />
     <plugin name="cordova-plugin-x-socialsharing" spec="~5.1.3" />
     <plugin name="ionic-plugin-keyboard" spec="2.2.1" />
@@ -165,16 +165,14 @@
     <plugin name="twitter-connect-plugin" spec="~0.6.0">
         <variable name="FABRIC_KEY" value="d28a3f04738fd742320f2ae1f2049bf85a5a6144" />
     </plugin>
-    <preference name="TwitterConsumerKey" value="njl2I82AXrOo0YftZyKHyC8aV" />
-    <preference name="TwitterConsumerSecret" value="2RmFsMIZmOXY4mMQ1qTuoOOcOPDVtgNMbJLPFgigaYTPpQuVVQ" />
     <plugin name="cordova-plugin-googleplus" spec="~5.1.1">
         <variable name="REVERSED_CLIENT_ID" value="com.googleusercontent.apps.673693445664-pa3k48sg81r89rn65e9rlnu4gpmm5vem" />
     </plugin>
     <plugin name="cordova-custom-config" spec="~3.1.2" />
     <plugin name="cordova-plugin-customurlscheme" spec="~4.2.0">
         <variable name="URL_SCHEME" value="clientapp-rocketchat" />
     </plugin>
-    <plugin name="cordova-plugin-google-analytics" spec="https://github.com/RocketChat/google-analytics-plugin.git" />
+    <plugin name="cordova-plugin-google-analytics-rocketchat" spec="^1.8.3" />
     <engine name="android" spec="5.2.2" />
     <engine name="ios" spec="4.3.1" />
 </widget>
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -12,15 +12,15 @@ platform :ios do
 
   desc "Build App"
   lane :build do |options|
-    project_path = "./platforms/ios/Rocket.Chat.xcodeproj"
-    workspace_path = "./platforms/ios/Rocket.Chat.xcworkspace"
+    project_path = "./platforms/ios/Rocket.Chat\ Cordova\ Legacy.xcodeproj"
+    workspace_path = "./platforms/ios/Rocket.Chat\ Cordova\ Legacy.xcworkspace"
     match(
       type: "appstore",
       git_url: "git@github.com:RocketChat/Rocket.Chat.Cordova.FastLane.git",
     )
     sigh()
     upgrade_super_old_xcode_project(
-      path: project_path,
+      path: project_path
     )
     disable_automatic_code_signing(path: project_path)
     update_project_provisioning(
@@ -29,7 +29,7 @@ platform :ios do
     )
     gym(
       workspace: workspace_path,
-      scheme: "Rocket.Chat",
+      scheme: "Rocket.Chat Cordova Legacy",
       output_directory: "./platforms/ios/"
     )
   end
@@ -44,15 +44,15 @@ platform :ios do
   #   pem()
   #   sigh()
   #   upgrade_super_old_xcode_project(
-  #     path: "./platforms/ios/Rocket.Chat.xcodeproj",
+  #     path: "./platforms/ios/Rocket.Chat\ Cordova\ Legacy.xcodeproj",
   #   )
-  #   disable_automatic_code_signing(path: "./platforms/ios/Rocket.Chat.xcodeproj")
+  #   disable_automatic_code_signing(path: "./platforms/ios/Rocket.Chat\ Cordova\ Legacy.xcodeproj")
   #   update_project_provisioning(
-  #     xcodeproj: "./platforms/ios/Rocket.Chat.xcodeproj",
+  #     xcodeproj: "./platforms/ios/Rocket.Chat\ Cordova\ Legacy.xcodeproj",
   #     build_configuration: "Release"
   #   )
   #   gym(
-  #     workspace: "./platforms/ios/Rocket.Chat.xcworkspace",
+  #     workspace: "./platforms/ios/Rocket.Chat\ Cordova\ Legacy.xcworkspace",
   #     scheme: "Rocket.Chat"
   #   )
   #   pilot()
@@ -67,15 +67,15 @@ platform :ios do
   #   pem()
   #   sigh()
   #   upgrade_super_old_xcode_project(
-  #     path: "./platforms/ios/Rocket.Chat.xcodeproj",
+  #     path: "./platforms/ios/Rocket.Chat\ Cordova\ Legacy.xcodeproj",
   #   )
-  #   disable_automatic_code_signing(path: "./platforms/ios/Rocket.Chat.xcodeproj")
+  #   disable_automatic_code_signing(path: "./platforms/ios/Rocket.Chat\ Cordova\ Legacy.xcodeproj")
   #   update_project_provisioning(
-  #     xcodeproj: "./platforms/ios/Rocket.Chat.xcodeproj",
+  #     xcodeproj: "./platforms/ios/Rocket.Chat\ Cordova\ Legacy.xcodeproj",
   #     build_configuration: "Release"
   #   )
   #   gym(
-  #     workspace: "./platforms/ios/Rocket.Chat.xcworkspace",
+  #     workspace: "./platforms/ios/Rocket.Chat\ Cordova\ Legacy.xcworkspace",
   #     scheme: "Rocket.Chat"
   #   )
   # end
@@ -97,4 +97,4 @@ platform :ios do
     delete_keychain(name: ENV["MATCH_KEYCHAIN_NAME"])
   end
 
-end
+end
diff --git a/fastlane/report.xml b/fastlane/report.xml
@@ -5,27 +5,16 @@
 
 
 
-      <testcase classname="fastlane.lanes" name="0: match" time="13.064394">
+      <testcase classname="fastlane.lanes" name="0: create_keychain" time="17.658356">
 
-      </testcase>
-
-
-      <testcase classname="fastlane.lanes" name="1: pem" time="3.153143">
-
-      </testcase>
-
-
-      <testcase classname="fastlane.lanes" name="2: upgrade_super_old_xcode_project" time="0.177386">
+          <failure message="/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/actions/actions_helper.rb:48:in `execute_action'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/runner.rb:236:in `block in execute_action'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/runner.rb:231:in `chdir'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/runner.rb:231:in `execute_action'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/runner.rb:157:in `trigger_action_by_name'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/fast_file.rb:148:in `method_missing'&#10;Fastfile:6:in `block (2 levels) in parsing_binding'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/runner.rb:292:in `execute_flow_block'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/runner.rb:46:in `block in execute'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/runner.rb:45:in `chdir'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/runner.rb:45:in `execute'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/lane_manager.rb:57:in `cruise_lane'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/command_line_handler.rb:36:in `handle'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/commands_generator.rb:108:in `block (2 levels) in run'&#10;/Library/Ruby/Gems/2.3.0/gems/commander-fastlane-4.4.6/lib/commander/command.rb:178:in `call'&#10;/Library/Ruby/Gems/2.3.0/gems/commander-fastlane-4.4.6/lib/commander/command.rb:153:in `run'&#10;/Library/Ruby/Gems/2.3.0/gems/commander-fastlane-4.4.6/lib/commander/runner.rb:476:in `run_active_command'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane_core/lib/fastlane_core/ui/fastlane_runner.rb:76:in `run!'&#10;/Library/Ruby/Gems/2.3.0/gems/commander-fastlane-4.4.6/lib/commander/delegates.rb:15:in `run!'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/commands_generator.rb:337:in `run'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/commands_generator.rb:42:in `start'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/cli_tools_distributor.rb:98:in `take_off'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/bin/fastlane:20:in `&lt;top (required)&gt;'&#10;/usr/local/bin/fastlane:22:in `load'&#10;/usr/local/bin/fastlane:22:in `&lt;top (required)&gt;'&#10;/Library/Ruby/Gems/2.3.0/gems/bundler-1.16.1/lib/bundler/cli/exec.rb:75:in `load'&#10;/Library/Ruby/Gems/2.3.0/gems/bundler-1.16.1/lib/bundler/cli/exec.rb:75:in `kernel_load'&#10;/Library/Ruby/Gems/2.3.0/gems/bundler-1.16.1/lib/bundler/cli/exec.rb:28:in `run'&#10;/Library/Ruby/Gems/2.3.0/gems/bundler-1.16.1/lib/bundler/cli.rb:424:in `exec'&#10;/Library/Ruby/Gems/2.3.0/gems/bundler-1.16.1/lib/bundler/vendor/thor/lib/thor/command.rb:27:in `run'&#10;/Library/Ruby/Gems/2.3.0/gems/bundler-1.16.1/lib/bundler/vendor/thor/lib/thor/invocation.rb:126:in `invoke_command'&#10;/Library/Ruby/Gems/2.3.0/gems/bundler-1.16.1/lib/bundler/vendor/thor/lib/thor.rb:387:in `dispatch'&#10;/Library/Ruby/Gems/2.3.0/gems/bundler-1.16.1/lib/bundler/cli.rb:27:in `dispatch'&#10;/Library/Ruby/Gems/2.3.0/gems/bundler-1.16.1/lib/bundler/vendor/thor/lib/thor/base.rb:466:in `start'&#10;/Library/Ruby/Gems/2.3.0/gems/bundler-1.16.1/lib/bundler/cli.rb:18:in `start'&#10;/Library/Ruby/Gems/2.3.0/gems/bundler-1.16.1/exe/bundle:30:in `block in &lt;top (required)&gt;'&#10;/Library/Ruby/Gems/2.3.0/gems/bundler-1.16.1/lib/bundler/friendly_errors.rb:122:in `with_friendly_errors'&#10;/Library/Ruby/Gems/2.3.0/gems/bundler-1.16.1/exe/bundle:22:in `&lt;top (required)&gt;'&#10;/usr/local/bin/bundle:22:in `load'&#10;/usr/local/bin/bundle:22:in `&lt;main&gt;'&#10;&#10;undefined method `shellescape' for nil:NilClass" />
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="3: automatic_code_signing" time="0.204715">
+      <testcase classname="fastlane.lanes" name="1: delete_keychain" time="0.001981">
 
-      </testcase>
-
-
-      <testcase classname="fastlane.lanes" name="4: gym" time="57.549166">
+          <failure message="/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/actions/actions_helper.rb:48:in `execute_action'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/runner.rb:236:in `block in execute_action'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/runner.rb:231:in `chdir'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/runner.rb:231:in `execute_action'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/runner.rb:157:in `trigger_action_by_name'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/fast_file.rb:148:in `method_missing'&#10;Fastfile:97:in `block (2 levels) in parsing_binding'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/runner.rb:62:in `block in execute'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/runner.rb:59:in `chdir'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/runner.rb:59:in `rescue in execute'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/runner.rb:44:in `execute'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/lane_manager.rb:57:in `cruise_lane'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/command_line_handler.rb:36:in `handle'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/commands_generator.rb:108:in `block (2 levels) in run'&#10;/Library/Ruby/Gems/2.3.0/gems/commander-fastlane-4.4.6/lib/commander/command.rb:178:in `call'&#10;/Library/Ruby/Gems/2.3.0/gems/commander-fastlane-4.4.6/lib/commander/command.rb:153:in `run'&#10;/Library/Ruby/Gems/2.3.0/gems/commander-fastlane-4.4.6/lib/commander/runner.rb:476:in `run_active_command'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane_core/lib/fastlane_core/ui/fastlane_runner.rb:76:in `run!'&#10;/Library/Ruby/Gems/2.3.0/gems/commander-fastlane-4.4.6/lib/commander/delegates.rb:15:in `run!'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/commands_generator.rb:337:in `run'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/commands_generator.rb:42:in `start'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/fastlane/lib/fastlane/cli_tools_distributor.rb:98:in `take_off'&#10;/Library/Ruby/Gems/2.3.0/gems/fastlane-2.84.0/bin/fastlane:20:in `&lt;top (required)&gt;'&#10;/usr/local/bin/fastlane:22:in `load'&#10;/usr/local/bin/fastlane:22:in `&lt;top (required)&gt;'&#10;/Library/Ruby/Gems/2.3.0/gems/bundler-1.16.1/lib/bundler/cli/exec.rb:75:in `load'&#10;/Library/Ruby/Gems/2.3.0/gems/bundler-1.16.1/lib/bundler/cli/exec.rb:75:in `kernel_load'&#10;/Library/Ruby/Gems/2.3.0/gems/bundler-1.16.1/lib/bundler/cli/exec.rb:28:in `run'&#10;/Library/Ruby/Gems/2.3.0/gems/bundler-1.16.1/lib/bundler/cli.rb:424:in `exec'&#10;/Library/Ruby/Gems/2.3.0/gems/bundler-1.16.1/lib/bundler/vendor/thor/lib/thor/command.rb:27:in `run'&#10;/Library/Ruby/Gems/2.3.0/gems/bundler-1.16.1/lib/bundler/vendor/thor/lib/thor/invocation.rb:126:in `invoke_command'&#10;/Library/Ruby/Gems/2.3.0/gems/bundler-1.16.1/lib/bundler/vendor/thor/lib/thor.rb:387:in `dispatch'&#10;/Library/Ruby/Gems/2.3.0/gems/bundler-1.16.1/lib/bundler/cli.rb:27:in `dispatch'&#10;/Library/Ruby/Gems/2.3.0/gems/bundler-1.16.1/lib/bundler/vendor/thor/lib/thor/base.rb:466:in `start'&#10;/Library/Ruby/Gems/2.3.0/gems/bundler-1.16.1/lib/bundler/cli.rb:18:in `start'&#10;/Library/Ruby/Gems/2.3.0/gems/bundler-1.16.1/exe/bundle:30:in `block in &lt;top (required)&gt;'&#10;/Library/Ruby/Gems/2.3.0/gems/bundler-1.16.1/lib/bundler/friendly_errors.rb:122:in `with_friendly_errors'&#10;/Library/Ruby/Gems/2.3.0/gems/bundler-1.16.1/exe/bundle:22:in `&lt;top (required)&gt;'&#10;/usr/local/bin/bundle:22:in `load'&#10;/usr/local/bin/bundle:22:in `&lt;main&gt;'&#10;&#10;You either have to set :name or :keychain_path" />
 
       </testcase>