Merge pull request Health-Food-Me#251 from L-j-h-c/feature/Health-Foo…

…d-Me#250 [Hotfix] Health-Food-Me#250 - 애플로그인 버튼 문구 apple로 변경
yungu0010 · Sep 8, 2022 · 41b8127 · 41b8127
2 parents 6fc1f6f + c1bb127
commit 41b8127
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 6 deletions.
diff --git a/HealthFoodMe/HealthFoodMe.xcodeproj/project.pbxproj b/HealthFoodMe/HealthFoodMe.xcodeproj/project.pbxproj
@@ -2524,7 +2524,7 @@
 				CODE_SIGN_ENTITLEMENTS = HealthFoodMe/HealthFoodMe.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2022.0905.0021;
+				CURRENT_PROJECT_VERSION = 202209071;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = FY8N9XTH66;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -2565,7 +2565,7 @@
 				CODE_SIGN_ENTITLEMENTS = HealthFoodMe/HealthFoodMe.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2022.0905.0021;
+				CURRENT_PROJECT_VERSION = 202209071;
 				DEVELOPMENT_TEAM = FY8N9XTH66;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = HealthFoodMe/Info.plist;

diff --git a/...oodMe/Global/Resources/Assets.xcassets/Common/btn_loginAlert_apple.imageset/Contents.json b/...oodMe/Global/Resources/Assets.xcassets/Common/btn_loginAlert_apple.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "btn_login_apple.png",
+      "filename" : "btn_loginAlert_apple.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "btn_login_apple@2x.png",
+      "filename" : "btn_loginAlert_apple@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "btn_login_apple@3x.png",
+      "filename" : "btn_loginAlert_apple@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

diff --git a/...s/Assets.xcassets/Common/btn_loginAlert_apple.imageset/btn_loginAlert_apple.png b/...s/Assets.xcassets/Common/btn_loginAlert_apple.imageset/btn_loginAlert_apple.png
diff --git a/...ssets.xcassets/Common/btn_loginAlert_apple.imageset/btn_loginAlert_apple@2x.png b/...ssets.xcassets/Common/btn_loginAlert_apple.imageset/btn_loginAlert_apple@2x.png
diff --git a/...ssets.xcassets/Common/btn_loginAlert_apple.imageset/btn_loginAlert_apple@3x.png b/...ssets.xcassets/Common/btn_loginAlert_apple.imageset/btn_loginAlert_apple@3x.png
diff --git a/...ources/Assets.xcassets/Common/btn_loginAlert_apple.imageset/btn_login_apple.png b/...ources/Assets.xcassets/Common/btn_loginAlert_apple.imageset/btn_login_apple.png
diff --git a/...ces/Assets.xcassets/Common/btn_loginAlert_apple.imageset/btn_login_apple@2x.png b/...ces/Assets.xcassets/Common/btn_loginAlert_apple.imageset/btn_login_apple@2x.png
diff --git a/...ces/Assets.xcassets/Common/btn_loginAlert_apple.imageset/btn_login_apple@3x.png b/...ces/Assets.xcassets/Common/btn_loginAlert_apple.imageset/btn_login_apple@3x.png
diff --git a/HealthFoodMe/fastlane/Fastfile b/HealthFoodMe/fastlane/Fastfile
@@ -18,7 +18,6 @@ default_platform(:ios)
 platform :ios do
   desc "Push a new beta build to TestFlight"
   lane :beta do
-    increment_build_number(xcodeproj: "HealthFoodMe.xcodeproj")
     build_app(workspace: "HealthFoodMe.xcworkspace", scheme: "HealthFoodMe")
     upload_to_testflight
   end

diff --git a/HealthFoodMe/fastlane/README.md b/HealthFoodMe/fastlane/README.md
@@ -31,6 +31,14 @@ Push a new beta build to TestFlight
 
 
 
+### ios release
+
+```sh
+[bundle exec] fastlane ios release
+```
+
+
+
 ----
 
 This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,6 +31,14 @@ Push a new beta build to TestFlight @@
+    ### ios release
+    ```sh
+    [bundle exec] fastlane ios release
+    ```
     ----
     This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
@@ Expand Down @@