From fc4300ede1d58970640e8134752e9b78ed888cef Mon Sep 17 00:00:00 2001 From: Jisoo Ham <133845468+isakatty@users.noreply.github.com> Date: Mon, 24 Mar 2025 02:10:36 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[Add]=20api=20url=20=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?=EB=B0=8F=20=EC=A0=81=EC=9A=A9=20=EB=B0=A9=EC=8B=9D=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20#322?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectDescriptionHelpers/InfoPlist.swift | 3 ++- Projects/Core/Sources/Extension/String+.swift | 7 +++++++ .../RegularAlarmEndPoint/RegularAlarmEndPoint.swift | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Plugins/EnvironmentPlugin/ProjectDescriptionHelpers/InfoPlist.swift b/Plugins/EnvironmentPlugin/ProjectDescriptionHelpers/InfoPlist.swift index d82177a8..323dc365 100644 --- a/Plugins/EnvironmentPlugin/ProjectDescriptionHelpers/InfoPlist.swift +++ b/Plugins/EnvironmentPlugin/ProjectDescriptionHelpers/InfoPlist.swift @@ -50,7 +50,8 @@ public extension [String: Plist.Value] { "NMFClientId": "$(NAVERMAP_CLIENT_ID)", "TERMS_OF_PRIVACY_URL": "$(TERMS_OF_PRIVACY_URL)", "LOCATION_PRIVACY_URL": "$(LOCATION_PRIVACY_URL)", - "INQURY_URL": "$(INQURY_URL)" + "INQURY_URL": "$(INQURY_URL)", + "ALARM_API": "$(ALARM_API)" ] static let additionalInfoPlist: Self = [ diff --git a/Projects/Core/Sources/Extension/String+.swift b/Projects/Core/Sources/Extension/String+.swift index 4be1e8cc..5a19f901 100644 --- a/Projects/Core/Sources/Extension/String+.swift +++ b/Projects/Core/Sources/Extension/String+.swift @@ -34,6 +34,13 @@ public extension String { return serverKey } + static var alarmServerURL: Self { + guard let any = Bundle.main.object(forInfoDictionaryKey: "ALARM_API"), + let alarmURL = any as? String + else { fatalError("Can't Find Alarm API URL")} + return alarmURL + } + static func getCurrentVersion() -> String { guard let dictionary = Bundle.main.infoDictionary, let version = dictionary["CFBundleShortVersionString"] as? String diff --git a/Projects/NetworkService/Sources/EndPoint/RegularAlarmEndPoint/RegularAlarmEndPoint.swift b/Projects/NetworkService/Sources/EndPoint/RegularAlarmEndPoint/RegularAlarmEndPoint.swift index 257ffa17..37055932 100644 --- a/Projects/NetworkService/Sources/EndPoint/RegularAlarmEndPoint/RegularAlarmEndPoint.swift +++ b/Projects/NetworkService/Sources/EndPoint/RegularAlarmEndPoint/RegularAlarmEndPoint.swift @@ -16,7 +16,7 @@ public extension RegularAlarmEndPoint { } var host: String { - "api.wherebybus.shop" + return .alarmServerURL } var path: String { From e9f20f53903c1faf51ccc792e5da46575f26cbc4 Mon Sep 17 00:00:00 2001 From: Jisoo Ham <133845468+isakatty@users.noreply.github.com> Date: Mon, 24 Mar 2025 16:22:17 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[Fix]=20Lint=EC=97=90=20=EB=A7=9E=EC=B6=B0?= =?UTF-8?q?=20=EC=BB=A8=EB=B2=A4=EC=85=98=20=EC=A0=81=EC=9A=A9=20#322?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Projects/App/Widget/ArrivalInfo/View/ArrivalInfoView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Projects/App/Widget/ArrivalInfo/View/ArrivalInfoView.swift b/Projects/App/Widget/ArrivalInfo/View/ArrivalInfoView.swift index 6c04dbb9..2ce1068d 100644 --- a/Projects/App/Widget/ArrivalInfo/View/ArrivalInfoView.swift +++ b/Projects/App/Widget/ArrivalInfo/View/ArrivalInfoView.swift @@ -10,7 +10,7 @@ import SwiftUI import WidgetKit import DesignSystem -@available (iOS 17.0, *) +@available(iOS 17.0, *) struct ArrivalInfoView: View { var entry: ArrivalInfoProvider.Entry @Environment(\.widgetFamily) var widgetFamily From 47e0e1e71cbb549da49d6cfe899a0e66fefb8e2d Mon Sep 17 00:00:00 2001 From: Jisoo Ham <133845468+isakatty@users.noreply.github.com> Date: Fri, 28 Mar 2025 13:37:06 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[Refactor]=20#322=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=EB=90=9C=20=EB=8F=84=EB=A9=94=EC=9D=B8=20url=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Projects/Core/Sources/Extension/String+.swift | 17 ++++++++++++++--- .../RegularAlarmEndPoint.swift | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Projects/Core/Sources/Extension/String+.swift b/Projects/Core/Sources/Extension/String+.swift index 29902ba7..e4162762 100644 --- a/Projects/Core/Sources/Extension/String+.swift +++ b/Projects/Core/Sources/Extension/String+.swift @@ -34,12 +34,23 @@ public extension String { return serverKey } - static func getCurrentVersion() -> [Int] { + /// domain url + static var domainURL: Self { + guard let any = Bundle.main.object( + forInfoDictionaryKey: "DOMAIN_URL" + ), + let domain = any as? String + else { return "" } + return domain + } + + /// 프로젝트 버전 + static func getCurrentVersion() -> Self { guard let dictionary = Bundle.main.infoDictionary, let version = dictionary["CFBundleShortVersionString"] as? String - else { return [1, 0, 0] } + else { return "1.0.0" } - return version.split(separator: ".").compactMap { Int($0) } + return version } static func getDeviceIdentifier() -> String { diff --git a/Projects/NetworkService/Sources/EndPoint/RegularAlarmEndPoint/RegularAlarmEndPoint.swift b/Projects/NetworkService/Sources/EndPoint/RegularAlarmEndPoint/RegularAlarmEndPoint.swift index 37055932..365931a3 100644 --- a/Projects/NetworkService/Sources/EndPoint/RegularAlarmEndPoint/RegularAlarmEndPoint.swift +++ b/Projects/NetworkService/Sources/EndPoint/RegularAlarmEndPoint/RegularAlarmEndPoint.swift @@ -16,7 +16,7 @@ public extension RegularAlarmEndPoint { } var host: String { - return .alarmServerURL + return .domainURL } var path: String {