Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,11 @@ Tuist/.build/

# macOS
.DS_Store

# Secrets - API ν‚€κ°€ ν¬ν•¨λœ νŒŒμΌμ€ μ»€λ°‹ν•˜μ§€ μ•ŠμŠ΅λ‹ˆλ‹€
# μ„€μ • 방법: *.xcconfig.template νŒŒμΌμ„ μ°Έκ³ ν•˜μ—¬ 볡사 ν›„ 값을 μ±„μ›Œμ£Όμ„Έμš”
*.xcconfig
!*.xcconfig.template

# Firebase - Firebase Consoleμ—μ„œ 직접 λ‹€μš΄λ‘œλ“œ λ°›μœΌμ„Έμš”
GoogleService-Info.plist
3 changes: 2 additions & 1 deletion Projects/App/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,6 @@ let project = Project.makeModule(
sources: ["Sources/**"],
resources: ["Resources/**"],
infoPlist: .file(path: "Support/Info.plist"),
entitlements: .file(path: "Support/GOMS-iOS-V3.entitlements")
entitlements: .file(path: "Support/GOMS-iOS-V3.entitlements"),
xcconfigPath: .relativeToRoot("Projects/App/Support/Secrets.xcconfig")
)
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,91 +1,109 @@
{
"images" : [
{
"filename" : "AppIcon-40.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "20x20"
},
{
"filename" : "AppIcon-60.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "20x20"
},
{
"filename" : "AppIcon-58.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "29x29"
},
{
"filename" : "AppIcon-87.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "29x29"
},
{
"filename" : "AppIcon-80.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "40x40"
},
{
"filename" : "AppIcon-120.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "40x40"
},
{
"filename" : "AppIcon-120.png",
"idiom" : "iphone",
"scale" : "2x",
"size" : "60x60"
},
{
"filename" : "AppIcon-180.png",
"idiom" : "iphone",
"scale" : "3x",
"size" : "60x60"
},
{
"filename" : "AppIcon-20.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "20x20"
},
{
"filename" : "AppIcon-40.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "20x20"
},
{
"filename" : "AppIcon-29.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "29x29"
},
{
"filename" : "AppIcon-58.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "29x29"
},
{
"filename" : "AppIcon-40.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "40x40"
},
{
"filename" : "AppIcon-80.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "40x40"
},
{
"filename" : "AppIcon-76.png",
"idiom" : "ipad",
"scale" : "1x",
"size" : "76x76"
},
{
"filename" : "AppIcon-152.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "76x76"
},
{
"filename" : "AppIcon-167.png",
"idiom" : "ipad",
"scale" : "2x",
"size" : "83.5x83.5"
},
{
"filename" : "AppIcon-1024.png",
"idiom" : "ios-marketing",
"scale" : "1x",
"size" : "1024x1024"
Expand Down
30 changes: 0 additions & 30 deletions Projects/App/Resources/GoogleService-Info.plist

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
<?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">
<!-- 이 νŒŒμΌμ„ GoogleService-Info.plist둜 λ³΅μ‚¬ν•œ ν›„ μ‹€μ œ 값을 μ±„μ›Œμ£Όμ„Έμš”:
cp Projects/App/Resources/GoogleService-Info.plist.template Projects/App/Resources/GoogleService-Info.plist -->
<plist version="1.0">
<dict>
<key>API_KEY</key>
<string>AIzaSyApAUEezH-Mlj8FPqeczHbHiy5c8KSeUFU</string>
<string>YOUR_FIREBASE_API_KEY</string>
<key>GCM_SENDER_ID</key>
<string>371885187431</string>
<string>YOUR_GCM_SENDER_ID</string>
<key>PLIST_VERSION</key>
<string>1</string>
<key>BUNDLE_ID</key>
<string>HARIBO.GOMS-iOS-V2</string>
<key>PROJECT_ID</key>
<string>gsm-goms</string>
<string>YOUR_PROJECT_ID</string>
<key>STORAGE_BUCKET</key>
<string>gsm-goms.firebasestorage.app</string>
<string>YOUR_STORAGE_BUCKET</string>
<key>IS_ADS_ENABLED</key>
<false></false>
<key>IS_ANALYTICS_ENABLED</key>
Expand All @@ -25,6 +27,6 @@
<key>IS_SIGNIN_ENABLED</key>
<true></true>
<key>GOOGLE_APP_ID</key>
<string>1:371885187431:ios:8c95f804f4678251398fc2</string>
<string>YOUR_GOOGLE_APP_ID</string>
</dict>
</plist>
</plist>
3 changes: 2 additions & 1 deletion Projects/App/Sources/Application/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
) -> Bool {

SDKInitializer.InitSDK(appKey: "7fe97f25eb228b1f07f0d982272290d1")
let kakaoAppKey = Bundle.main.infoDictionary?["KAKAO_APP_KEY"] as? String ?? ""
SDKInitializer.InitSDK(appKey: kakaoAppKey)
Comment thread
juunpy0 marked this conversation as resolved.
Outdated

FirebaseApp.configure()
Messaging.messaging().delegate = self
Expand Down
2 changes: 1 addition & 1 deletion Projects/App/Support/GOMS-iOS-V3.entitlements
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<plist version="1.0">
<dict>
<key>aps-environment</key>
<string>$(APS_ENVIRONMENT)</string>
<string>development</string>
Comment thread
juunpy0 marked this conversation as resolved.
Outdated
</dict>
</plist>
4 changes: 3 additions & 1 deletion Projects/App/Support/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@
<string>UIInterfaceOrientationPortraitUpsideDown</string>
</array>
<key>KAKAO_APP_KEY</key>
<string>7fe97f25eb228b1f07f0d982272290d1</string>
<string>$(KAKAO_NATIVE_APP_KEY)</string>
<key>KAKAO_REST_API_KEY</key>
<string>$(KAKAO_REST_API_KEY)</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>μœ„μΉ˜ μ‚¬μš©</string>
</dict>
Expand Down
6 changes: 6 additions & 0 deletions Projects/App/Support/Secrets.xcconfig.template
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// Secrets.xcconfig.template
// 이 νŒŒμΌμ„ Secrets.xcconfig둜 λ³΅μ‚¬ν•œ ν›„ μ‹€μ œ 값을 μ±„μ›Œμ£Όμ„Έμš”:
// cp Projects/App/Support/Secrets.xcconfig.template Projects/App/Support/Secrets.xcconfig

KAKAO_NATIVE_APP_KEY = YOUR_KAKAO_NATIVE_APP_KEY
KAKAO_REST_API_KEY = YOUR_KAKAO_REST_API_KEY
3 changes: 2 additions & 1 deletion Projects/Service/Sources/Services/Map/PlaceServices.swift
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,8 @@ extension PlaceServices: TargetType {

switch self {
case .getRoute:
commonHeaders["Authorization"] = "KakaoAK b47f0cac2134d01481d23d13ffa419e6"
let kakaoRestKey = Bundle.main.infoDictionary?["KAKAO_REST_API_KEY"] as? String ?? ""
commonHeaders["Authorization"] = "KakaoAK \(kakaoRestKey)"
Comment thread
juunpy0 marked this conversation as resolved.
Outdated
case .getRecommendedPlaces(let auth),
.getRecommendedPlacesCount(let auth),
.searchPlace(_, let auth),
Expand Down
7 changes: 4 additions & 3 deletions Tuist/ProjectDescriptionHelpers/Project+Templates.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@ public extension Project {
sources: SourceFilesList = ["Sources/**"],
resources: ResourceFileElements? = nil,
infoPlist: InfoPlist = .default,
entitlements: Entitlements? = nil
entitlements: Entitlements? = nil,
xcconfigPath: Path? = nil
) -> Project {
let settings: Settings = .settings(
base: [:],
configurations: [
.debug(name: .debug, settings: entitlements == nil ? [:] : ["APS_ENVIRONMENT": "development"]),
.release(name: .release, settings: entitlements == nil ? [:] : ["APS_ENVIRONMENT": "production"])
.debug(name: .debug, settings: entitlements == nil ? [:] : ["APS_ENVIRONMENT": "development"], xcconfig: xcconfigPath),
.release(name: .release, settings: entitlements == nil ? [:] : ["APS_ENVIRONMENT": "production"], xcconfig: xcconfigPath)
],
defaultSettings: .recommended
)
Expand Down
Loading