From 545f8d4c2f115f3335e6c7006a3a8398a567ba3b Mon Sep 17 00:00:00 2001 From: Vlad Date: Tue, 15 Dec 2020 18:27:25 +0300 Subject: [PATCH] Fix PR --- xcode/commonFastfile | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/xcode/commonFastfile b/xcode/commonFastfile index 21fc50e..2bcb73a 100644 --- a/xcode/commonFastfile +++ b/xcode/commonFastfile @@ -107,22 +107,6 @@ private_lane :addShield do |options| end end -private_lane :generateFeaturesFile do |options| - app_target_folder_name = options[:appName] || $appName - - project_features_file_path = File.expand_path "../#{app_target_folder_name}/Resources/Features/Features.json" - build_settings_file_path = File.expand_path "../common/build_settings.yaml" - - builder_features_list = options[:features] - .split(",").map { |feature_name| feature_name.strip } # [ "Feature1", "Feature2", "Feature3" ] - - build_settings_features_list = Managers::FileManager.load_from_file_YAML(build_settings_file_path)["features"] - - features_hash = Touchlane::Features.generate_features_hash(builder_features_list, build_settings_features_list) - - Managers::FileManager.save_data_to_file_in_json(project_features_file_path, features_hash) -end - private_lane :buildConfiguration do |options| appName = options[:appName] || $appName @@ -418,6 +402,22 @@ def get_google_services_plist_path(app_target_folder_name, configuration_type) File.expand_path "../#{app_target_folder_name}/Resources/#{configuration_type.prefix}-GoogleService-Info.plist" end +def generateFeaturesFile(options) + app_target_folder_name = options[:appName] || $appName + + project_features_file_path = File.expand_path "../#{app_target_folder_name}/Resources/Features/Features.json" + build_settings_file_path = File.expand_path "../common/build_settings.yaml" + + builder_features_list = options[:features] + .split(",").map { |feature_name| feature_name.strip } # [ "Feature1", "Feature2", "Feature3" ] + + build_settings_features_list = Managers::FileManager.load_from_file_YAML(build_settings_file_path)["features"] + + features_hash = Touchlane::Features.generate_features_hash(builder_features_list, build_settings_features_list) + + Managers::FileManager.save_data_to_file_in_json(project_features_file_path, features_hash) +end + def set_xcconfig_for_configuration_of_project(lane_name, configuration, xcodeproj_path) require 'xcodeproj'