Merge pull request #154 from Pepsi-Club/dev

1차 release

.github/workflows/pull_request_test.yml

@@ -6,22 +6,29 @@ on:
       - release
 jobs:
   build_test:
-    runs-on: macos-latest
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v2
 
-      - name: Setup Xcode version
-        uses: maxim-lobanov/setup-xcode@v1
-        with:
-          xcode-version: "14.2.0"
-
       - name: Bring ignored files
         uses: actions/checkout@v3
         with:
-          repository: Pepsi-Club/BusComing-ignored
+          repository: Pepsi-Club/WhereMyBus-ignored
           path: XCConfig/
           token: ${{ secrets.ACTION_TOKEN }}
-
+
+      - name: Setup Xcode version
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: "14.3"
+
+      - uses: swift-actions/setup-swift@65540b95f51493d65f5e59e97dcef9629ddf11bf
+        with:
+            swift-version: "5.8.0"
+
+      - name: Get swift version
+        run: swift --version
+
       - name: Install Tuist
         run: curl -Ls https://install.tuist.io|bash
 

.github/workflows/upload_testflight.yml

@@ -6,27 +6,34 @@ on:
       - release
 jobs:
   upload_testflight:
-    runs-on: macos-latest
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v2
 
       - uses: shimataro/ssh-key-action@v2
         with:
           key: ${{ secrets.SSH_KEY }}
           known_hosts: ${{ secrets.KNOWN_HOSTS }}
-
-      - name: Setup Xcode version
-        uses: maxim-lobanov/setup-xcode@v1
-        with:
-          xcode-version: "14.2.0"
-
+
       - name: Bring ignored files
         uses: actions/checkout@v3
         with:
-          repository: Pepsi-Club/BusComing-ignored
+          repository: Pepsi-Club/WhereMyBus-ignored
           path: XCConfig/
           token: ${{ secrets.ACTION_TOKEN }}
-
+
+      - name: Setup Xcode version
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: "14.3"
+
+      - uses: swift-actions/setup-swift@65540b95f51493d65f5e59e97dcef9629ddf11bf
+        with:
+            swift-version: "5.8.0"
+
+      - name: Get swift version
+        run: swift --version
+
       - name: Install Tuist
         run: curl -Ls https://install.tuist.io|bash
 
@@ -51,3 +58,5 @@ jobs:
           APP_STORE_KEY_ID: ${{ secrets.APP_STORE_KEY_ID }}
           APP_STORE_ISSUER_ID: ${{ secrets.APP_STORE_ISSUER_ID }}
           APP_STORE_PRIVATE_KEY: ${{ secrets.APP_STORE_PRIVATE_KEY }}
+          MATCH_URL: ${{ secrets.MATCH_URL }}
+          MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}

.swiftlint.yml

@@ -1,9 +1,10 @@
-included:
-    - Projects
 excluded: # 린트 과정에서 무시할 파일 경로. `included`보다 우선순위 높음
     - Projects/App/Sources/AppDelegate.swift
     - Projects/App/Sources/SceneDelegate.swift
+    - Projects/App/Tests/**
     - Projects/Feature/**/AppDelegate.swift
+    - Projects/Feature/**/SceneDelegate.swift
+    - Projects/FeatureDependency/Sources/Mock/**
     - Tuist
     - Derived
     - Plugins
@@ -18,7 +19,7 @@ function_body_length:
     warning: 150
     error: 300
 type_body_length:
-    warning: 300
+    warning: 400
     error: 500
 file_length:
     warning: 1000
@@ -30,5 +31,9 @@ disabled_rules: # 제외하고 싶은 룰
     - trailing_whitespace
     - type_name # 타입명에 _가 들어가면 경고
     - trailing_comma # 배열 마지막 아이템에 ,가 붙으면 경고
+    - nesting # 중첩타입
+    - cyclomatic_complexity #
+    - function_parameter_count #
+    - todo #
 opt_in_rules:
     - empty_string

.tuist-version

@@ -1 +1 @@
-3.26.0
+3.28.0

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Pepsi-Club
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Makefile

@@ -26,7 +26,7 @@ regenerate:
 	rm -rf *.xcworkspace
 	tuist generate
 
-BASE_URL = https://raw.githubusercontent.com/Pepsi-Club/BusComing-ignored/main
+BASE_URL = https://raw.githubusercontent.com/Pepsi-Club/WhereMyBus-ignored/main
 
 define download_file
 	@echo "Downloading $(3) to $(1) using token: $(2)"
@@ -41,6 +41,8 @@ download-privates: download-xcconfigs download-env
 download-xcconfigs:
 	$(call download_file, XCConfig, $(token),Debug.xcconfig)
 	$(call download_file, XCConfig, $(token),Release.xcconfig)
+	$(call download_file, XCConfig, $(token),NotificationExtension_Debug.xcconfig)
+	$(call download_file, XCConfig, $(token),NotificationExtension_Release.xcconfig)
 
 download-env:
-	$(call download_file, fastlane, $(token),.env)
+	$(call download_file, fastlane, $(token),.env)

Plugins/DependencyPlugin/ProjectDescriptionHelpers/Dependency+Module.swift

@@ -14,7 +14,8 @@ public extension TargetDependency {
     static let core: Self = .module(name: "Core")
     static let data: Self = .module(name: "Data")
     static let domain: Self = .module(name: "Domain")
-    static let networks: Self = .module(name: "Networks")
+    static let networkService: Self = .module(name: "NetworkService")
+    static let coreDataService: Self = .module(name: "CoreDataService")
     static let designSystem: Self = .module(name: "DesignSystem")
     static let thirdPartyLibs: Self = .module(name: "ThirdPartyLibs")
 

Plugins/DependencyPlugin/ProjectDescriptionHelpers/Dependency+ThirdPartyExternal.swift

@@ -8,16 +8,14 @@
 import ProjectDescription
 
 public extension Array<TargetDependency> {
-    enum ThirdPartyExternal: CaseIterable {
-        case rxCocoa, kakaoMap
+    enum ThirdPartyExternal: String, CaseIterable {
+        case rxCocoa
 
         public var name: String {
-            switch self {
-            case .rxCocoa:
-                return "RxCocoa"
-            case .kakaoMap:
-                return "KakaoMapsSDK_SPM"
-            }
+            var name = rawValue.map { $0 }
+            name.removeFirst()
+            name.insert(Character(rawValue.first!.uppercased()), at: 0)
+            return "\(String(name))"
         }
     }
 }

Plugins/DependencyPlugin/ProjectDescriptionHelpers/Dependency+ThirdPartyRemote.swift

@@ -14,23 +14,19 @@ public extension Array<Package> {
 
 public extension Array<Package>.ThirdPartyRemote {
     enum SPM: CaseIterable {
-        case rxSwift, kakaoMap
+        case rxSwift
 
         public var url: String {
             switch self {
             case .rxSwift:
                 return "https://github.com/ReactiveX/RxSwift"
-            case .kakaoMap:
-                return "https://github.com/kakao-mapsSDK/KakaoMapsSDK-SPM"
             }
         }
 
         public var upToNextMajor: Version {
             switch self {
             case .rxSwift:
                 return "6.0.0"
-            case .kakaoMap:
-                return "2.6.3"
             }
         }
     }

Plugins/EnvironmentPlugin/ProjectDescriptionHelpers/Environment.swift

@@ -9,11 +9,12 @@ import Foundation
 import ProjectDescription
 
 public extension String {
-    static let appName: Self = "BusComing"
+    static let appName: Self = "WhereMyBus"
     static let displayName: Self = "버스어디"
     static let organizationName = "Pepsi-Club"
+    static let teamId = "T4W7695R5C"
     /// 앱스토어에 게시할 때마다 증가해줘야 하는 버전
-    static let marketingVersion: Self = "1"
+    static let marketingVersion: Self = "1.0.2"
     /// 개발자가 내부적으로 확인하기 위한 용도 (날짜를 사용하기도 함 - 2023.12.8.1 )
     static var buildVersion: Self {
         "1.0"
@@ -26,7 +27,7 @@ public extension String {
     static let targetVersion: Self = "16.0"
 }
 
-extension InfoPlist.Value {
+extension Plist.Value {
     static let bundleDisplayName: Self = .string(.displayName)
     static let bundleShortVersionString: Self = .string(.marketingVersion)
     static let bundleVersion: Self = .string(.buildVersion)

Plugins/EnvironmentPlugin/ProjectDescriptionHelpers/InfoPlist.swift

@@ -18,6 +18,24 @@ public extension InfoPlist {
                 newValue
             }
     )
+
+    static func demoAppInfoPlist(name: String) -> Self {
+        .extendingDefault(
+            with: .baseInfoPlist
+                .merging(.additionalInfoPlist) { oldValue, newValue in
+                    newValue
+                }
+                .merging(.secrets) { oldValue, newValue in
+                    newValue
+                }
+                .merging([
+                    "CFBundleDisplayName": "\(name)"
+                ]) { oldValue, newValue in
+                    newValue
+                }
+        )
+    }
+
     static let frameworkInfoPlist: Self = .extendingDefault(
         with: .framework
             .merging(.secrets) { oldValue, newValue in
@@ -26,12 +44,17 @@ public extension InfoPlist {
     )
 }
 
-public extension [String: InfoPlist.Value] {
+public extension [String: Plist.Value] {
     static let secrets: Self = [
-        "SERVER_KEY": "$(SERVER_KEY)"
+        "DATA_GO_KR_API_KEY": "$(DATA_GO_KR_API_KEY)",
+        "KAKAO_APP_KEY": "$(KAKAO_APP_KEY)",
+        "KAKAO_PHASE": "alpha",
+        "TERMS_OF_PRIVACY_URL": "$(TERMS_OF_PRIVACY_URL)",
+        "LOCATION_PRIVACY_URL": "$(LOCATION_PRIVACY_URL)"
     ]
 
     static let additionalInfoPlist: Self = [
+        "FirebaseAppDelegateProxyEnabled": false,
         "ITSAppUsesNonExemptEncryption": "NO",
         "NSAppTransportSecurity": [
             "NSExceptionDomains": [
@@ -40,7 +63,15 @@ public extension [String: InfoPlist.Value] {
                     "NSExceptionAllowsInsecureHTTPLoads": true,
                 ]
             ]
-        ]
+        ],
+        "UIBackgroundModes": [
+            "fetch",
+            "processing",
+            "remote-notification"
+        ],
+        "BGTaskSchedulerPermittedIdentifiers" : [.string(.bundleID)],
+        "NSLocationWhenInUseUsageDescription" : "주변 정류장을 찾기 위해 권한이 필요합니다.",
+        "NSLocationAlwaysAndWhenInUseUsageDescription" : "주변 정류장을 찾기 위해 권한이 필요합니다."
     ]
 
     static let baseInfoPlist: Self = [
@@ -59,6 +90,26 @@ public extension [String: InfoPlist.Value] {
                 ]
             ]
         ],
+        "UISupportedInterfaceOrientations": ["UIInterfaceOrientationPortrait"],
+    ]
+
+    static let notificationInfoPlist: Self = [
+        "DATA_GO_KR_API_KEY": "$(DATA_GO_KR_API_KEY)",
+        "CFBundleShortVersionString": .bundleShortVersionString,
+        "CFBundleVersion": .bundleVersion,
+        "CFBundleDisplayName": "$(PRODUCT_NAME)",
+        "NSExtension": [
+            "NSExtensionPointIdentifier": "com.apple.usernotifications.service",
+            "NSExtensionPrincipalClass": "$(PRODUCT_MODULE_NAME).NotificationService"
+        ],
+        "NSAppTransportSecurity": [
+            "NSExceptionDomains": [
+                "ws.bus.go.kr": [
+                    "NSIncludesSubdomains": true,
+                    "NSExceptionAllowsInsecureHTTPLoads": true,
+                ]
+            ]
+        ],
     ]
 
     static let framework: Self = [
@@ -68,7 +119,7 @@ public extension [String: InfoPlist.Value] {
         "CFBundleInfoDictionaryVersion": "6.0",
         "CFBundleName": "$(PRODUCT_NAME)",
         "CFBundlePackageType": "FMWK",
-        "CFBundleShortVersionString": "1.0",
-        "CFBundleVersion": "1",
+        "CFBundleShortVersionString": .bundleShortVersionString,
+        "CFBundleVersion": .bundleVersion,
     ]
 }

Plugins/EnvironmentPlugin/ProjectDescriptionHelpers/Scheme.swift

@@ -27,4 +27,24 @@ public extension Scheme {
             analyzeAction: .analyzeAction(configuration: "Debug")
         )
     }
+
+    static func uiTestsScheme(name: String) -> Self {
+        Scheme(
+            name: "\(name)UITests",
+            shared: true,
+            buildAction: .buildAction(targets: ["\(name)"]),
+            testAction: .targets(
+                ["\(name)UITests"],
+                configuration: "Debug",
+                options: .options(
+                    coverage: true,
+                    codeCoverageTargets: ["\(name)UITests"]
+                )
+            ),
+            runAction: .runAction(configuration: "Debug"),
+            archiveAction: .archiveAction(configuration: "Debug"),
+            profileAction: .profileAction(configuration: "Debug"),
+            analyzeAction: .analyzeAction(configuration: "Debug")
+        )
+    }
 }

Plugins/EnvironmentPlugin/ProjectDescriptionHelpers/XCConfig.swift

@@ -107,7 +107,7 @@ public extension SettingsDictionary {
         merging(
             [
                 "CODE_SIGN_STYLE": .string("Manual"),
-                "DEVELOPMENT_TEAM": .string("ASU4PNB5MG"),
+                "DEVELOPMENT_TEAM": .string(.teamId),
                 "CODE_SIGN_IDENTITY": .string("$(CODE_SIGN_IDENTITY)")
             ]
         )

Projects/App/App.entitlements

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>aps-environment</key>
+	<string>development</string>
+</dict>
+</plist>