Merge pull request #250 from Team-Smeme/develop

update build number
Team-Smeme · Feb 17, 2025 · 4dc34b0 · 4dc34b0
2 parents ffcad9d + d4c9e55
commit 4dc34b0
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 17 deletions.
diff --git a/.github/workflows/smeemDev.yml b/.github/workflows/smeemDev.yml
@@ -13,11 +13,23 @@ jobs:
   build:
 
     runs-on: macos-latest
-
+    
     steps:
     - uses: actions/checkout@v4
+    - name: Uninstall existing Xcode
+      run: |
+          sudo rm -rf /Applications/Xcode15.4.app
+          sudo xcode-select --reset
+    - name: soft update list
+      run: softwareupdate --list
+    - name: xcode install
+      run: xcode-select --install
+    - name: xcode path
+      run: xcode-select -p
     - name: Set Xcode version
       run: sudo xcode-select -switch /Applications/Xcode_16.app
+    - name: Resolve Dependencies
+      run: xcodebuild -resolvePackageDependencies
     - name: Resolve Dependencies
       run: xcodebuild -resolvePackageDependencies
       working-directory: ./Smeem-iOS

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# 누적 다운로드 수 500+, 영어 일기 서비스 Smeem 🧡
+# 누적 다운로드 수 800+, 영어 일기 서비스 Smeem 🧡
 
 <img width="908" alt="image" src="https://github.com/Team-Smeme/Smeme-server-renewal/assets/55437339/d375dc1c-abb0-4e2e-a6e5-aad074913114">
 

diff --git a/Smeem-iOS/Smeem-iOS.xcodeproj/project.pbxproj b/Smeem-iOS/Smeem-iOS.xcodeproj/project.pbxproj
@@ -2217,7 +2217,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.1.0;
+				MARKETING_VERSION = 4.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "Team.Smeem-dev";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2239,7 +2239,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Smeem-iOS/Smeem-iOS.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Distribution: YuJi Lee (K8LLWYQWXD)";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2024122401;
+				CURRENT_PROJECT_VERSION = 2025021700;
 				DEVELOPMENT_TEAM = K8LLWYQWXD;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Smeem-iOS/Info.plist";
@@ -2255,7 +2255,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.1.0;
+				MARKETING_VERSION = 4.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "Team.Smeem-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = smeem_release;

diff --git a/Smeem-iOS/Smeem-iOS/Global/UIComponents/SwiftUI/CoachingContentView.swift b/Smeem-iOS/Smeem-iOS/Global/UIComponents/SwiftUI/CoachingContentView.swift
@@ -28,12 +28,12 @@ struct CoachingContentView: View {
                     }
                 }
             }
-            .frame(width: screenWidth, height: screenHeight * (286 / screenHeight), alignment: .top)
+            .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
             .tabViewStyle(.page(indexDisplayMode: .never))
-            .padding(.horizontal, 16.scaledByWidth())
 
             PageControl(currentPage: $currentIndex, coachingResponse: $corrections)
         }
+        .frame(maxWidth: .infinity, maxHeight: .infinity)
     }
 }
 

diff --git a/Smeem-iOS/Smeem-iOS/Global/UIComponents/SwiftUI/CustomSegmentedControl.swift b/Smeem-iOS/Smeem-iOS/Global/UIComponents/SwiftUI/CustomSegmentedControl.swift
@@ -37,13 +37,10 @@ struct SegmentButton: View {
     var body: some View {
         Button(action: action) {
             Text(title)
-                .padding(.vertical, 8.scaledByHeight())
-                .padding(.horizontal, 10.scaledByWidth())
-                .frame(maxWidth: .infinity)
+                .frame(maxWidth: .infinity, maxHeight: .infinity)
                 .background(backgroundColor)
                 .foregroundColor(foregroundColor)
                 .font(Font(UIFont.c5))
-                .minimumScaleFactor(0.9)
                 .overlay(
                     Group {
                         if isSelected && isFirstButton {
@@ -62,6 +59,7 @@ struct SegmentButton: View {
                     }
                 )
         }
+        .frame(width: 70, height: 32)
     }
 
     private var backgroundColor: Color {

diff --git a/Smeem-iOS/Smeem-iOS/Presentation/Splash/Splah/ViewModel/SplashViewModel.swift b/Smeem-iOS/Smeem-iOS/Presentation/Splash/Splah/ViewModel/SplashViewModel.swift
@@ -157,10 +157,10 @@ extension SplashViewModel {
         // x 버전이 더 크면 강제 업데이트
         if forceVersion[0] > clientVersion[0] {
             return true
-        // x 버전이 같고, y 버전이 더 크면 강제 업데이트
+        // x 버전이 같고, y 버전 또한 더 크면 강제 업데이트
         } else if forceVersion[0] == clientVersion[0] && forceVersion[1] > clientVersion[1] {
             return true
-        // x, y 버전이 같고, z버전이 더 크면 강제 업데이트
+        // x 버전이 같고, y 버전이 클 때, z버전이 더 크면 강제 업데이트
         } else if (forceVersion[0] == clientVersion[0] && forceVersion[1] > clientVersion[1]) && forceVersion[2] > clientVersion[2] {
             return true
         }

diff --git a/Smeem-iOS/Smeem-iOSTests/Onboarding/ViewModel/SplashViewModelTest.swift b/Smeem-iOS/Smeem-iOSTests/Onboarding/ViewModel/SplashViewModelTest.swift
@@ -21,9 +21,9 @@ final class SplashViewModelTest: XCTestCase {
     override func setUpWithError() throws {
         self.mockService = SplashServiceMock()
         self.viewModel = SplashViewModel(provider: mockService)
-        self.beforeAppVersion = "3.0.1"
-        self.afterAppVersion = "3.1.0"
-        self.forceVersion = "3.1.0"
+        self.beforeAppVersion = "3.1.0"
+        self.afterAppVersion = "4.0.0"
+        self.forceVersion = "4.0.0"
     }
 
     func test_강제업데이트안한유저_정확한데이터_return하는지() {
@@ -50,7 +50,7 @@ final class SplashViewModelTest: XCTestCase {
 
     func test_첫업데이트로직유저_강제업데이트팝업잘뜨는지() {
         // Given
-        let result = self.viewModel.checkVersion2(client: "2.0.3", now: "2.0.4", force: self.forceVersion)
+        let result = self.viewModel.checkVersion2(client: "3.1.0", now: "2.0.4", force: self.forceVersion)
 
         // When
         let expectedResult = true
@@ -69,6 +69,28 @@ final class SplashViewModelTest: XCTestCase {
         // Then
         XCTAssertEqual(result, expectedResult)
     }
+
+    func test_서버로부터_3_2_0_값이내려올때_강제업데이트팝업잘뜨는지() {
+        // Given
+        let result = self.viewModel.checkVersion(client: self.beforeAppVersion, force: self.forceVersion)
+
+        // When
+        let expectedResult = true
+
+        // Then
+        XCTAssertEqual(result, expectedResult)
+    }
+
+    func test_서버로부터_3_2_0_값이내려올때_강업잘됐는지() {
+        // Given
+        let result = self.viewModel.checkVersion(client: self.afterAppVersion, force: self.forceVersion)
+
+        // When
+        let expectedResult = false
+
+        // Then
+        XCTAssertEqual(result, expectedResult)
+    }
 
     override func tearDownWithError() throws {
         self.mockService = nil