Merge pull request #301 from TouchInstinct/release/vuzbank_c2b

release/vuzbank_c2b -> vuzbank

xcode/commonFastfile

@@ -11,6 +11,14 @@ Match.module_eval do
   end
 end
 
+# ugly hack to add support for custom storage
+
+Match.module_eval do
+  def self.storage_modes
+    return %w(git google_cloud s3 local)
+  end
+end
+
 private_lane :installDependencies do |options|
   podsReposPath = File.expand_path "~/.cocoapods/repos/master/"
   lockFilePath = "#{podsReposPath}/.git/index.lock"
@@ -102,9 +110,11 @@ private_lane :buildConfiguration do |options|
 
   openKeychain(options)
 
-  if !options[:buildNumber].nil?
+  if is_ci
-    increment_build_number(
+    increment_build_number_in_xcodeproj(
-      build_number: options[:buildNumber]
+      build_number: options[:buildNumber],
+      xcodeproj: "./#{options[:appName]}.xcodeproj",
+      target: options[:appName]
     )
   end
 
@@ -398,7 +408,7 @@ def get_configuration_for_type(type)
 end
 
 def get_google_services_plist_path(app_target_folder_name, configuration_type)
-  File.expand_path "../#{app_target_folder_name}/Resources/GoogleService-Info.plist"
+  File.expand_path "../#{app_target_folder_name}/Resources/#{configuration_type.prefix}-GoogleService-Info.plist"
 end
 
 def generate_enabled_features_extension_if_needed(options)
@@ -446,6 +456,7 @@ def set_xcconfig_for_configuration_of_project(lane_name, configuration, xcodepro
   application_targets = project.native_targets.select(&target_to_modify_selector)
 
   application_targets.each do |target|
+    build_configuration = target.build_configuration_list[configuration]
     config_name = target.name + lane_name
     build_configuration_reference = project.files.select { |f| f.path.start_with?(config_name) }.first
 
@@ -477,4 +488,4 @@ def run_code_generation_phase_if_needed(options)
   if File.exists? code_generation_script_path
     sh(code_generation_script_path, options[:workspace])
   end
-end
+end

xcode/fastlane/touchlane/lib/match/storage/local_storage.rb

@@ -42,6 +42,8 @@ module Touchlane
       # Those doesn't mean they're new, it might just be they're changed
       # Either way, we'll upload them using the same technique
 
+      Dir.mkdir(self.signing_identities_path) unless File.exists?(self.signing_identities_path)
+
       files_to_upload.each do |current_file|
         # Go from
         #   "/var/folders/px/bz2kts9n69g8crgv4jpjh6b40000gn/T/d20181026-96528-1av4gge/profiles/development/Development_me.mobileprovision"
@@ -51,11 +53,7 @@ module Touchlane
 
         # We also have to remove the trailing `/` as Google Cloud doesn't handle it nicely
         target_path = current_file.gsub(self.working_directory + "/", "")
-        absolute_target_path = File.join(self.signing_identities_path, target_path)
+        FileUtils.cp_r(current_file, File.join(self.signing_identities_path, target_path), remove_destination: true)
-
-        FileUtils.mkdir_p(File.dirname(absolute_target_path))
-
-        FileUtils.cp_r(current_file, absolute_target_path, remove_destination: true)
       end
     end