Merge branch 'develop' of https://github.com/Health-Food-Me/Health-Fo…

…od-Me-iOS into develop
yungu0010 · Sep 19, 2022 · ca5a324 · ca5a324
2 parents e35d207 + 0c237a3
commit ca5a324
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 17 deletions.
diff --git a/HealthFoodMe/HealthFoodMe.xcodeproj/project.pbxproj b/HealthFoodMe/HealthFoodMe.xcodeproj/project.pbxproj
@@ -2523,10 +2523,12 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = HealthFoodMe/HealthFoodMe.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 202209071;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = FY8N9XTH66;
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = FY8N9XTH66;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = HealthFoodMe/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "헬푸미";
@@ -2550,6 +2552,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.healthFoodMe.release;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match Development com.healthFoodMe.release";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.healthFoodMe.release";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
@@ -2564,9 +2567,11 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = HealthFoodMe/HealthFoodMe.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 202209071;
 				DEVELOPMENT_TEAM = FY8N9XTH66;
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = FY8N9XTH66;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = HealthFoodMe/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "헬푸미";
@@ -2590,6 +2595,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.healthFoodMe.release;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match Development com.healthFoodMe.release";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.healthFoodMe.release";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;

diff --git a/HealthFoodMe/HealthFoodMe/Presentation/Search/SearchScene/VC/SearchVC.swift b/HealthFoodMe/HealthFoodMe/Presentation/Search/SearchScene/VC/SearchVC.swift
@@ -129,6 +129,7 @@ final class SearchVC: UIViewController {
 
     override func viewWillAppear(_ animated: Bool) {
         setRecentTextField()
+        //searchTextField.becomeFirstResponder()
     }
 
     override func viewDidLoad() {

diff --git a/HealthFoodMe/fastlane/Fastfile b/HealthFoodMe/fastlane/Fastfile
@@ -77,7 +77,7 @@ lane :release do
       method: "app-store",
       signingStyle: "manual"
     }
-    )
+  )
 
   # 8. 앱스토어 업로드 🎉
   deliver(
@@ -93,18 +93,6 @@ lane :release do
     )
 end
 
-# lane이 모두 완료된 뒤 호출됨
-after_all do |lane|
-  # 9. 배포 결과 슬랙 노티 🚨
-  slack_after_lane(
-    message: "",
-    payload: {
-      "Version" => lane_context[SharedValues::VERSION_NUMBER],
-      "Build number" => lane_context[SharedValues::BUILD_NUMBER],
-      "Date" => Time.new.to_s
-      }
-    )
-end
 
 # 에러 발생 시 호출 됨
 error do |lane, exception|
@@ -117,5 +105,23 @@ error do |lane, exception|
       "Error Info" => exception.message
       }
     )
+  end
 end
+
+# match 인증서 파일 생성 -> 관리자용
+
+platform :ios do
+  lane :matchByTeam do
+      match(git_branch: "master", type: "appstore", username: "ckrgkswnsgh@icloud.com")
+      match(git_branch: "master", type: "development", username: "ckrgkswnsgh@icloud.com")
+  end
+end
+
+# match 인증서 받아오기 -> 팀원용
+
+platform :ios do
+  lane :matchReadOnly do
+      match(git_branch: "master", type: "appstore", username: "ckrgkswnsgh@icloud.com", readonly: true)
+      match(git_branch: "master", type: "development", username: "ckrgkswnsgh@icloud.com", readonly: true)
+  end
 end
diff --git a/HealthFoodMe/fastlane/Matchfile b/HealthFoodMe/fastlane/Matchfile
@@ -1,11 +1,11 @@
-git_url("git@github.com:Health-Food-Me/fastlane-match-iOS.git")
+git_url("https://github.com/L-j-h-c/fastlane-match.git")
 
 storage_mode("git")
 
-type("appstore") # The default type, can be: appstore, adhoc, enterprise or development
+type("development") # The default type, can be: appstore, adhoc, enterprise or development
 
-# app_identifier(["tools.fastlane.app", "tools.fastlane.app2"])
-# username("user@fastlane.tools") # Your Apple Developer Portal username
+app_identifier(["com.healthFoodMe.release"])
+username("ckrgkswnsgh@icloud.com") # Your Apple Developer Portal username
 
 # For all available options run `fastlane match --help`
 # Remove the # in the beginning of the line to enable the other options

diff --git a/HealthFoodMe/fastlane/README.md b/HealthFoodMe/fastlane/README.md
@@ -39,6 +39,22 @@ Push a new beta build to TestFlight
 
 
 
+### ios matchByTeam
+
+```sh
+[bundle exec] fastlane ios matchByTeam
+```
+
+
+
+### ios matchReadOnly
+
+```sh
+[bundle exec] fastlane ios matchReadOnly
+```
+
+
+
 ----
 
 This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.