From 81d98abf1a1ef2c1ff5528d462f38d8931a94856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=89=E1=85=A9=E1=86=BC=E1=84=8B=E1=85=A7=E1=86=BC?= =?UTF-8?q?=E1=84=86=E1=85=A9?= Date: Tue, 3 Oct 2023 17:22:52 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20google=20analytics=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .../Taget+Extensions/TargetDependency+Module.swift | 3 ++- .../Folio/Shared/DesignSystem/Sources/MinimalButton.swift | 2 +- Projects/Toolinder/App/Sources/AppDelegate.swift | 5 ++++- Projects/Toolinder/App/Sources/RootApp.swift | 2 ++ Tuist/Dependencies.swift | 4 +++- 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0ea58a5..bf49e5f 100644 --- a/.gitignore +++ b/.gitignore @@ -121,3 +121,4 @@ Derived/ *.p12 master.key *.package.resolved +GoogleService-Info.plist diff --git a/Plugins/ModulePlugin/ProjectDescriptionHelpers/Taget+Extensions/TargetDependency+Module.swift b/Plugins/ModulePlugin/ProjectDescriptionHelpers/Taget+Extensions/TargetDependency+Module.swift index 07275d7..79e4aa4 100644 --- a/Plugins/ModulePlugin/ProjectDescriptionHelpers/Taget+Extensions/TargetDependency+Module.swift +++ b/Plugins/ModulePlugin/ProjectDescriptionHelpers/Taget+Extensions/TargetDependency+Module.swift @@ -119,7 +119,8 @@ public extension [TargetDependency] { ] case .Folio: return [ - .external(name: "GoogleMobileAds") + .external(name: "GoogleMobileAds"), + .external(name: "FirebaseAnalytics") ] default: return [] } diff --git a/Projects/Folio/Shared/DesignSystem/Sources/MinimalButton.swift b/Projects/Folio/Shared/DesignSystem/Sources/MinimalButton.swift index 9843534..af11440 100644 --- a/Projects/Folio/Shared/DesignSystem/Sources/MinimalButton.swift +++ b/Projects/Folio/Shared/DesignSystem/Sources/MinimalButton.swift @@ -40,7 +40,7 @@ public struct MinimalButton: View { } .padding(.vertical, 10) }) - .background(isActive ? Color.foreground : .gray) + .background(isActive ? Color.foreground : Color.foreground) //TODO: active 현재 미사용 .clipShape( RoundedRectangle( cornerRadius: 8, diff --git a/Projects/Toolinder/App/Sources/AppDelegate.swift b/Projects/Toolinder/App/Sources/AppDelegate.swift index 7614bed..508b59d 100644 --- a/Projects/Toolinder/App/Sources/AppDelegate.swift +++ b/Projects/Toolinder/App/Sources/AppDelegate.swift @@ -7,6 +7,8 @@ // import UIKit +import SwiftUI +import FirebaseCore import GoogleMobileAds @@ -22,7 +24,8 @@ class AppDelegate: NSObject, UIApplicationDelegate { GADMobileAds.sharedInstance().start(completionHandler: nil) } } - + + FirebaseApp.configure() return true } diff --git a/Projects/Toolinder/App/Sources/RootApp.swift b/Projects/Toolinder/App/Sources/RootApp.swift index 6bb1b1a..5760166 100644 --- a/Projects/Toolinder/App/Sources/RootApp.swift +++ b/Projects/Toolinder/App/Sources/RootApp.swift @@ -15,6 +15,8 @@ import ToolinderDomain @main struct RootApp: App { + @UIApplicationDelegateAdaptor(AppDelegate.self) var delegate + var body: some Scene { WindowGroup { RootView( diff --git a/Tuist/Dependencies.swift b/Tuist/Dependencies.swift index a7eb0cf..9216c6a 100644 --- a/Tuist/Dependencies.swift +++ b/Tuist/Dependencies.swift @@ -4,7 +4,9 @@ let dependencies = Dependencies( swiftPackageManager: [ .remote(url: "https://github.com/googleads/swift-package-manager-google-mobile-ads", requirement: .upToNextMajor(from: "10.9.0")), .remote(url: "https://github.com/pointfreeco/swift-composable-architecture", requirement: .upToNextMajor(from: "1.2.0")), - .remote(url: "https://github.com/realm/realm-swift", requirement: .upToNextMajor(from: "10.42.2")) + .remote(url: "https://github.com/realm/realm-swift", requirement: .upToNextMajor(from: "10.42.2")), + .remote(url: "https://github.com/firebase/firebase-ios-sdk", requirement: .upToNextMajor(from: "10.15.0")) + ], platforms: [.iOS] )