From b216095142dda59219b3ed5dc9b4b27e6b62c1b0 Mon Sep 17 00:00:00 2001
From: Ivan Smolin <ivan.smolin@touchin.ru>
Date: Mon, 25 Feb 2019 16:52:38 +0300
Subject: [PATCH] =?UTF-8?q?revert=20code=20in=20afterBuild=20private=20lan?=
 =?UTF-8?q?e.=20open=20or=20create=20keychain=20befor=D1=83=20syncCodeSign?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xcode/commonFastfile | 102 +++++++++++++++++++++++++++++++------------
 1 file changed, 73 insertions(+), 29 deletions(-)

diff --git a/xcode/commonFastfile b/xcode/commonFastfile
index 32db2ec..42c5396 100644
--- a/xcode/commonFastfile
+++ b/xcode/commonFastfile
@@ -25,27 +25,29 @@ private_lane :beforeBuild do |options|
 end
 
 private_lane :afterBuild do |options|
-  appName = options[:appName] || $appName
-  podsReposPath = File.expand_path "~/.cocoapods/repos/master/"
-  lockFilePath = "#{podsReposPath}/.git/index.lock"
+  if options[:uploadToFabric]
+    appName = options[:appName] || $appName
 
-  # check if .lock file exists in pod repos - then remove all master repo
-  if File.exists? lockFilePath
-    sh("rm -rf #{podsReposPath}")
+    token = sh("cat ../#{appName}.xcodeproj/project.pbxproj | grep 'Fabric/run' | awk '{print $4}' | tr -d '\\n'")
+    secret = sh("printf `cat ../#{appName}.xcodeproj/project.pbxproj | grep 'Fabric/run' | awk '{print $5}' | sed 's/..$//'` | tr -d '\\n'")
+
+    releaseNotesFile = "release-notes.txt"
+    sh("touch ../#{releaseNotesFile}")
+
+    crashlytics(
+      ipa_path: "./#{appName}.ipa",
+      crashlytics_path: "./Pods/Crashlytics/",
+      api_token: token,
+      build_secret: secret,
+      notes_path: releaseNotesFile,
+      groups: "touch-instinct"
+    )
+
+    upload_symbols_to_crashlytics(
+      dsym_path: "./#{appName}.app.dSYM.zip",
+      api_token: token
+    )
   end
-
-  carthage(platform: "iOS")
-
-  cocoapods(
-    clean: true,
-    repo_update: true
-  )
-
-  set_info_plist_value(
-    path: "./#{appName}/Info.plist",
-    key: "CFBundleVersion",
-    value: options[:buildNumber] || 10000
-  )
 end
 
 private_lane :buildConfiguration do |options|
@@ -59,6 +61,12 @@ private_lane :buildConfiguration do |options|
   exportOptions = icloudEnvironment.to_s.empty? ? {} : {iCloudContainerEnvironment: icloudEnvironment}
   exportOptions[:compileBitcode] = options[:compileBitcode] || false
 
+  options.merge(get_keychain_options(options))
+  openKeychain(options)
+
+  options[:type] = method
+  syncCodeSigning(options)
+
   gym(
     clean: true,
     workspace: "./#{appName}.xcworkspace",
@@ -72,10 +80,12 @@ private_lane :buildConfiguration do |options|
     skip_package_ipa: !uploadToFabric
   )
 
+  closeKeychain(options)
+
   afterBuild(options)
 end
 
-lane :createPushCertificate do |options|
+lane :СreatePushCertificate do |options|
   certificates_path = File.expand_path "../Certificates"
   Dir.mkdir(certificates_path) unless File.directory?(certificates_path)
 
@@ -90,16 +100,11 @@ lane :createPushCertificate do |options|
   )
 end
 
-private_lane :syncCodeSigning do |options|
+lane :syncCodeSigning do |options|
   type = options[:type] || "development"
 
-  options_override = load_options_from("configurations.yaml")[type.to_sym]
-  options = options.merge(options_override)
-
-  keychain_password = options[:keychain_password] || prompt(
-    text: "Please enter your keychain password (account password): ",
-    secure_text: true
-  )
+  options_override = load_options_from("configurations.yaml")
+  options = options.merge(options_override[type.to_sym])
 
   match(
     app_identifier: options[:app_identifier],
@@ -110,12 +115,51 @@ private_lane :syncCodeSigning do |options|
     storage_mode: "git",
     git_url: options[:git_url],
     git_branch: "fastlane_certificates",
-    keychain_password: keychain_password,
+    keychain_name: options[:keychain_name],
+    keychain_password: options[:keychain_password],
     skip_docs: true,
     platform: "ios"
   )
 end
 
+private_lane :openKeychain do |options|
+  if is_ci?
+    create_keychain(
+      name: options[:keychain_name],
+      password: options[:keychain_password],
+      unlock: true
+    )
+  else
+    unlock_keychain(
+      name: options[:keychain_name],
+      password: options[:keychain_password]
+    )
+  end
+end
+
+private_lane :closeKeychain do |options|
+  if is_ci?
+    delete_keychain(name: options[:keychain_name])
+  end
+end
+
+def get_keychain_options(options)
+  keychain_name = options[:keychain_name]
+  keychain_password = options[:keychain_password]
+
+  if is_ci?
+    keychain_name = keychain_name || "ci.keychain"
+    keychain_password = keychain_name ||  ""
+  else
+    keychain_password = keychain_password || prompt(
+      text: "Please enter your keychain password (account password): ",
+      secure_text: true
+    )
+  end
+
+  return {:keychain_name => keychain_name, :keychain_password => keychain_password}
+end
+
 def load_options_from(file_path)
   if File.exists? file_path
     require "yaml"