Merge branch 'feature/QA' of https://github.com/DDD-Community/OPeace …

…into develop
DDD-Community · Sep 1, 2024 · 07a3a5b · 07a3a5b
2 parents effa5ea + 1b5a99e
commit 07a3a5b
Show file tree

Hide file tree

Showing 7 changed files with 92 additions and 52 deletions.
diff --git a/OPeace/Projects/App/OPeace.xcodeproj/project.pbxproj b/OPeace/Projects/App/OPeace.xcodeproj/project.pbxproj
diff --git a/OPeace/Projects/App/OPeace.xcodeproj/xcshareddata/xcschemes/OPeace.xcscheme b/OPeace/Projects/App/OPeace.xcodeproj/xcshareddata/xcschemes/OPeace.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1010"
-   version = "1.7">
+   version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -44,10 +44,12 @@
       disableMainThreadChecker = "YES">
       <TestPlans>
          <TestPlanReference
-            reference = "container:OPeaceTests/Sources/OPeaceTestPlan.xctestplan"
-            default = "YES">
+            default = "YES"
+            reference = "container:OPeaceTests/Sources/OPeaceTestPlan.xctestplan">
          </TestPlanReference>
       </TestPlans>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"

diff --git a/...esentation/Presentation/Sources/CreateQuestion/WriteQuestion/View/WriteQuestionView.swift b/...esentation/Presentation/Sources/CreateQuestion/WriteQuestion/View/WriteQuestionView.swift
@@ -122,15 +122,26 @@ extension WriteQuestionView {
                                         store.isInuputEmoji = true
                                         isFocused = true
                                     }
-                                    .offset(x: -70)
+                                    .offset(x: -75)
                             }
                         }
 
 
                     Spacer()
                 }
 
-                UnderlineView(text: store.selectEmojiText.isEmpty ? "😀" : store.selectEmojiText)
+                Spacer()
+                    .frame(height: 15)
+
+              HStack {
+                    Spacer()
+
+                  Divider()
+                      .frame(width: 80, height: 1)
+                      .background(Color.gray200)
+
+                  Spacer()
+                }
 
             } else if let emojiImage = store.emojiImage {
                 emojiImage

diff --git a/OPeace/Tuist/Config.swift b/OPeace/Tuist/Config.swift
@@ -9,7 +9,7 @@ import Foundation
 import ProjectDescription
 
 let config = Config(
-//    fullHandle:  "suhwj81/Opeace",
+    fullHandle:  "suhwj81/Opeace",
     swiftVersion: "5.10.0",
     plugins: [
         .local(path: .relativeToRoot("Plugins/ProjectTemplatePlugin")),

diff --git a/OPeace/fastlane/Fastfile b/OPeace/fastlane/Fastfile
@@ -48,13 +48,36 @@ desc "Install Profiles and Build My App"
     )
 
    end
+
+
+desc "Install Profiles and Build My App"
+  lane :build_ipa_Git do
+    clear_derived_data
+   build_app(
+      workspace: "OPeace.xcworkspace",
+      scheme: "OPeace-QA",
+    silent: true,
+    clean: true,
+    output_directory: "./fastlane/output/",
+    output_name: "OPeace.ipa",
+      export_method: "app-store",
+      export_options: {
+      signingStyle: "manual",
+          uploadBitcode: false,
+            provisioningProfiles: {
+            "io.Opeace.Opeace" => "match AppStore io.Opeace.Opeace",
+
+             }
+        }
+    )
+
+   end
+
 #  ✅ 테스트 플라이트 업로드
   desc "Push to TestFlight"
   lane :QA do |options|
 app_store_connect_api_key(is_key_content_base64: true, in_house: false)
 
-
-
 build_ipa
 upload_to_testflight(
        demo_account_required: true,
@@ -64,7 +87,6 @@ upload_to_testflight(
        groups: ["Opeace"],
        skip_waiting_for_build_processing: true)
 
-
       send_slack
     end
     # ✅ if 문을 
@@ -91,4 +113,21 @@ lane :send_slack do
     )
    end
 end
+
+  desc "Push to TestFlight"
+  lane :QA_GIT do |options|
+app_store_connect_api_key(is_key_content_base64: true, in_house: false)
+
+:build_ipa_Git
+upload_to_testflight(
+       demo_account_required: true,
+       beta_app_description:" OPeace",
+       ipa:"./fastlane/output/OPeace.ipa",
+       changelog:"변경사항",
+       groups: ["Opeace"],
+       skip_waiting_for_build_processing: true)
+
+      send_slack
+    end
+    # ✅ if 문을1
 end
diff --git a/OPeace/fastlane/README.md b/OPeace/fastlane/README.md
@@ -31,6 +31,14 @@ Description of what the lane does
 
 Install Profiles and Build My App
 
+### ios build_ipa_Git
+
+```sh
+[bundle exec] fastlane ios build_ipa_Git
+```
+
+Install Profiles and Build My App
+
 ### ios QA
 
 ```sh
@@ -47,6 +55,14 @@ Push to TestFlight
 
 
 
+### ios QA_GIT
+
+```sh
+[bundle exec] fastlane ios QA_GIT
+```
+
+Push to TestFlight
+
 ----
 
 This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.

diff --git a/OPeace/fastlane/report.xml b/OPeace/fastlane/report.xml
@@ -5,57 +5,32 @@
 
 
 
-      <testcase classname="fastlane.lanes" name="00: update_fastlane" time="5.436225">
+      <testcase classname="fastlane.lanes" name="0: update_fastlane" time="4.962253">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="01: default_platform" time="0.000245">
+      <testcase classname="fastlane.lanes" name="1: default_platform" time="0.026474">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="02: app_store_connect_api_key" time="0.001578">
+      <testcase classname="fastlane.lanes" name="2: app_store_connect_api_key" time="0.00665">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="03: Switch to ios build_ipa lane" time="0.000148">
+      <testcase classname="fastlane.lanes" name="3: Switch to ios build_ipa lane" time="8.9e-05">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="04: clear_derived_data" time="2.188174">
+      <testcase classname="fastlane.lanes" name="4: clear_derived_data" time="0.014676">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="05: build_app" time="258.586253">
-
-      </testcase>
-
-
-      <testcase classname="fastlane.lanes" name="06: upload_to_testflight" time="101.106809">
-
-      </testcase>
-
-
-      <testcase classname="fastlane.lanes" name="07: Switch to ios send_slack lane" time="0.00018">
-
-      </testcase>
-
-
-      <testcase classname="fastlane.lanes" name="08: get_version_number" time="0.037687">
-
-      </testcase>
-
-
-      <testcase classname="fastlane.lanes" name="09: latest_testflight_build_number" time="1.222147">
-
-      </testcase>
-
-
-      <testcase classname="fastlane.lanes" name="10: slack" time="0.831126">
+      <testcase classname="fastlane.lanes" name="5: build_app" time="25.050111">
 
       </testcase>