Skip to content

Commit

Permalink
fix: github Action 환경에서 FirebaseCrashlytics 이슈 수정해요 (#735)
Browse files Browse the repository at this point in the history
* fix: swift.yml 파일 if 구문 제거
- Fastfile XcodeBuild 인수 전달 Parameters 추가

* fix: swift.yml fix Branch Push Event Trigger 추가

* fix: Fastfile Syntax Error 수정

* feat:  Derived data 삭제 명령어 추가
- xcargs Rosetta 환경으로 설정

* fix: Package.swift Firebase Version Upgrade

* feat: Tuist Modular+Templates Util Target 추가
- ModuleType+Templates Util 모듈 의존성 추가
- BBLogManger, Mixpanel 폴더 Util 모듈로 이동

* fix:  TargetScript+Templates Configuration 환경에 따라 Service Info 가져오는 Script 제거
- ModuleType+Templates FirebaseAnalyticsWithoutAdIdSupport로 변경

* feat: Github Actions make Google Service info 생성 명령어 추가

* fix: Github Actions Google Service Info Path 경로 출력 명령어 추가

* feat: GitHub Action mise 설치 명령어 추가

* fix: uses 키워드 제거 및 오타 수정

* fix: mise version 4.8.1 upgrade
- swift.yml mac-os 최신 환경에서 실행 하도록 수정
- xcode-version 최신 환경에서 실행 하도록 수정

* fix: Github Actions Develop Merge 했을때 배포하도록 수정
- Derived Data 삭제하는 명령어 제거

* fix: push 이벤트에 fix 브런치 제거

* fix: ProfileViewController Crashlytics 테스트 코드 제거
  • Loading branch information
Do-hyun-Kim authored Dec 29, 2024
1 parent 558ff15 commit da9b6d0
Show file tree
Hide file tree
Showing 48 changed files with 105 additions and 41 deletions.
15 changes: 11 additions & 4 deletions .github/workflows/swift.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:

jobs:
build:
runs-on: macos-13
runs-on: macos-latest
strategy:
matrix:
xcodebuild-scheme: ['App']
Expand All @@ -25,11 +25,10 @@ jobs:
with:
ruby-version: '3.2.0'


- name: Setup Xcode version
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '15.0'
xcode-version: latest-stable

- name: Checkout branch
uses: actions/checkout@v3
Expand Down Expand Up @@ -61,6 +60,15 @@ jobs:
- name: Tuist Generate Commnad
run: tuist generate

- name: make Google Service Info
run: |
echo "${{ secrets.GOOGLE_INFO_PLIST }}" | base64 --decode > ${{ secrets.GOOGLE_SERVICE_INFO_PLIST_PATH }}
- name: Verify GoogleService-Info.plist creation
run: |
ls -l ${{ secrets.GOOGLE_SERVICE_INFO_PLIST_PATH }}
echo "GOOGLE_SERVICE_INFO_PLIST_PATH: ${{ secrets.GOOGLE_SERVICE_INFO_PLIST_PATH }}"
- name: fastlane upload_prd_testflight
if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/heads/release') }}
env:
Expand All @@ -81,7 +89,6 @@ jobs:
WIDGET_NAME: ${{secrets.WIDGET_NAME}}
run: fastlane github_action_prd_upload_testflight


- name: fastlane upload_stg_testflight
if: ${{ github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'develop' }}
env:
Expand Down
2 changes: 1 addition & 1 deletion .mise.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[tools]
tuist = "4.3.4"
tuist = "4.8.1"
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import UIKit
import Core
import DesignSystem
import Util
import Domain
import PhotosUI

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
// Created by 김건우 on 12/6/23.
//

import Core
import UIKit
import Util
import Core

import FSCalendar
import ReactorKit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import UIKit

import Core
import DesignSystem
import Util
import Photos
import RxDataSources
import RxSwift
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import AVFoundation
import UIKit

import Core
import Data
import Util
import DesignSystem
import ReactorKit
import RxSwift
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import Foundation

import Data
import Domain
import Util
import DesignSystem
import ReactorKit
import Core
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import Foundation

import Domain
import Core
import Util

import ReactorKit

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import Core
import Domain
import Foundation
import Util

import ReactorKit

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import UIKit

import Core
import DesignSystem
import Util

import ReactorKit
import RxCocoa
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import Foundation

import Core
import Domain
import Util

import ReactorKit

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import UIKit
import Core
import Domain
import DesignSystem
import Util

import ReactorKit
import RxDataSources
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import UIKit
import Core
import Domain
import DesignSystem
import Util

import RxDataSources
import RxCocoa
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import Foundation

import Core
import Util
import Domain
import ReactorKit

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import Core
import DesignSystem
import Domain
import Util
import UIKit

import ReactorKit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
//

import Core
import Util
import DesignSystem
import UIKit

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import Core
import DesignSystem
import UIKit
import Util

import ReactorKit
import RxCocoa
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import UIKit
import Core
import Data
import Domain
import Util

import ReactorKit

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import UIKit
import Core
import Domain
import Util

import RxDataSources
import RxSwift
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import UIKit

import Core
import Util
import DesignSystem
import RxSwift
import RxCocoa
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import Foundation
import Core
import Domain
import Data
import Util
import ReactorKit

public final class PrivacyViewReactor: Reactor {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import UIKit

import Core
import RxSwift
import Util
import ReactorKit
import RxCocoa

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import UIKit

import Core
import Util
import DesignSystem
import Kingfisher
import PhotosUI
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import Foundation

import Core
import Domain
import Util
import ReactorKit


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import UIKit

import Core
import DesignSystem
import Util
import RxCocoa
import ReactorKit
import RxDataSources
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import Foundation

import Core
import Domain
import Util
import ReactorKit
import RxSwift

Expand Down
7 changes: 1 addition & 6 deletions 14th-team5-iOS/Core/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,7 @@ private let targets: [Target] = [
layer: .Core,
factory: .init(
products: .framework(.static),
dependencies: ModuleLayer.Core.dependencies,
settings: .settings(
base: [
"EXCLUDED_ARCHS[sdk=iphonesimulator*]": "arm64"
]
)
dependencies: ModuleLayer.Core.dependencies
)
)
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import Foundation

import Core
import Domain
import Util


public protocol FamilyInfoUserDefaultsType: UserDefaultsType {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import UIKit
import ReactorKit
import RxCocoa
import RxSwift
import Util

public enum AccountLoaction {
case profile
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
//

import Foundation
import Core

public struct CreateReactionRequest {
public let emojiId: String
Expand Down
24 changes: 24 additions & 0 deletions 14th-team5-iOS/Util/Project.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
//
// Project.swift
// 14th-team5-iOSManifests
//
// Created by 김도현 on 12/26/24.
//

import ProjectDescription
import ProjectDescriptionHelpers


private let targets: [Target] = [
.makeModular(
layer: .Util,
factory: .init(
products: .framework(.static),
dependencies: ModuleLayer.Util.dependencies
)
)
]

private let util = Project.makeApp(name: ModuleLayer.Util.rawValue, target: targets)


Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
//

import Foundation
import Core

public protocol BBAnalyticsLogType {
var name: String { get }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import FirebaseCrashlytics
import FirebaseAnalytics
import Core


public enum BBLogManager {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import Foundation
import Mixpanel
import Core

// MARK: Mixpanel Protocol
protocol MixpanelTrackable {
Expand Down
2 changes: 1 addition & 1 deletion Tuist/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ let package = Package(
.package(url: "https://github.com/ReactiveX/RxSwift.git", from: "6.6.0"),
.package(url: "https://github.com/SnapKit/SnapKit.git", from: "5.6.0"),
.package(url: "https://github.com/devxoul/Then.git", from: "3.0.0"),
.package(url: "https://github.com/firebase/firebase-ios-sdk.git", from: "10.24.0"),
.package(url: "https://github.com/firebase/firebase-ios-sdk.git", from: "10.25.0"),
.package(url: "https://github.com/RxSwiftCommunity/RxDataSources.git", from: "5.0.0"),
.package(url: "https://github.com/kakao/kakao-ios-sdk.git", from: "2.22.0"),
.package(url: "https://github.com/kakao/kakao-ios-sdk-rx.git", from: "2.22.0"),
Expand Down
21 changes: 18 additions & 3 deletions Tuist/ProjectDescriptionHelpers/Modular+Templates.swift
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ extension Target {
sources: factory.sources,
resources: factory.resources,
entitlements: factory.entitlements,
scripts: [.firebaseInfoByConfiguration, .firebaseCrashlytics],
scripts: [.firebaseCrashlytics],
dependencies: factory.dependencies,
settings: factory.settings
)
Expand All @@ -115,7 +115,7 @@ extension Target {
return .target(
name: layer.rawValue,
destinations: .iOS,
product: .staticFramework,
product: factory.products.isFramework ? .staticFramework : .framework,
bundleId: "com.\(layer.rawValue).project".lowercased(),
deploymentTargets: factory.deploymentTargets,
infoPlist: factory.infoPlist,
Expand All @@ -125,11 +125,26 @@ extension Target {
dependencies: factory.dependencies,
settings: factory.settings
)
case .Util:
return .target(
name: layer.rawValue,
destinations: .iOS,
product: factory.products.isFramework ? .staticFramework : .framework,
bundleId: "com.\(layer.rawValue).project".lowercased(),
deploymentTargets: factory.deploymentTargets,
infoPlist: factory.infoPlist,
sources: factory.sources,
resources: factory.resources,
entitlements: factory.entitlements,
dependencies: factory.dependencies,
settings: factory.settings
)

case .Core:
return .target(
name: layer.rawValue,
destinations: .iOS,
product: .staticFramework,
product: factory.products.isLibrary ? .framework : .staticFramework,
bundleId: "com.\(layer.rawValue).project".lowercased(),
deploymentTargets: factory.deploymentTargets,
infoPlist: factory.infoPlist,
Expand Down
Loading

0 comments on commit da9b6d0

Please sign in to comment.