Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Setting] #113 - xcconfigs로 개발 환경 분기 #139

Merged
merged 33 commits into from
Apr 6, 2023
Merged

[Setting] #113 - xcconfigs로 개발 환경 분기 #139

merged 33 commits into from
Apr 6, 2023

Conversation

L-j-h-c
Copy link
Contributor

@L-j-h-c L-j-h-c commented Apr 5, 2023 •
edited
Loading

🌴 PR 요약

🌱 작업한 브랜치

1.xcconfigs로 개발 환경을 분기했습니다

image

DEV : 실제 프로덕트 BaseURL을 사용하는 debug scheme
TEST : 테스트 BaseURL을 사용하는 debug scheme
QA : 테스트 BaseURL을 사용하는 release scheme
RELEASE : 실제 프로덕트 BaseURL을 사용하는 release scheme

서버에 요청을 날려 본 결과 분기별로 잘 작동합니다.

2. 전처리문 사용 BaseURL 분기

모든 xcconfig이 import하는 shared.xcconfig은 아래와 같은 swift flags를 정의합니다.

OTHER_SWIFT_FLAGS[config=Development][sdk=*] = $(inherited) -DDEV
OTHER_SWIFT_FLAGS[config=Test][sdk=*] = $(inherited) -DTEST
OTHER_SWIFT_FLAGS[config=QA][sdk=*] = $(inherited) -DQA
OTHER_SWIFT_FLAGS[config=PROD][sdk=*] = $(inherited) -DPROD

따라서 해당 전처리문을 이용하여 baseURL을 분기할 수 있습니다.

image

📮 관련 이슈

lsj8706 and others added 27 commits April 1, 2023 00:01
@lsj8706
[Chore] sopt-makers#134 - DSKit의 Component 일부의 이름 앞에 ST(Soptamp)를 붙임
e37ca5a
@lsj8706
[Chore] sopt-makers#134 - Soptamp 관련 Component 파일 위치를 DSKit에서 StampFe…
4e9ca53 
…ature로 이동
@lsj8706
[Add] sopt-makers#134 - MainFeature를 위한 파일들 생성
0d5f8b8
@lsj8706
[Feat] sopt-makers#134 - MainVC에 의존성 주입
b31e4a3
@lsj8706
[Feat] sopt-makers#134 - 메인뷰의 NavigationBar UI 구현
4488359
@lsj8706
[Feat] sopt-makers#134 - CollectionView 기초 세팅
98a500b
@lsj8706
[Feat] sopt-makers#144 - UserHistoryHeaderView UI 구현
d428ac5
@lsj8706
[Feat] sopt-makers#134 - UserHistory Section Inset 설정
d346520
@lsj8706
[Feat] sopt-makers#134 - UserHistoryCVC 구현
7b8279a
@lsj8706
[Feat] sopt-makers#134 - BriefNoticeCVC UI 구현
639a764
@lsj8706
[Feat] sopt-makers#134 - createMainServiceSection 함수 구현
fc5d124
@lsj8706
[Feat] sopt-makers#134 - BriefNoticeCVC에서 비회원 UI 처리
a7be1d3
@lsj8706
[Feat] sopt-makers#134 - ServiceType 열거형 추가
cd5218b
@lsj8706
[Feat] sopt-makers#134 - MainServiceCVC 구현
40038e5
@lsj8706
[Feat] sopt-makers#134 - otherServiceSection 구현
955f5f4
@lsj8706
[Feat] sopt-makers#134 - 메인뷰의 Cell이 보여줄 정보를 viewModel에 위치시킴
89ab240
@lsj8706
[Feat] sopt-makers#134 - AppServiceHeaderView 구현
bafda56
@lsj8706
[Fix] sopt-makers#134 - UserHistoryCVC에서 Cell 재사용 시 뷰가 중복 생성되는 문제 해결
2d59340
@lsj8706
[Feat] sopt-makers#134 - AppServiceCVC 구현
e621b04
@lsj8706
[Chore] sopt-makers#134 - StringLiterals 수정
637cd04
@lsj8706
[Feat] sopt-makers#134 - Service 위치에 따른 UI 분기 처리
fe5226a
@lsj8706
[Feat] sopt-makers#134 - viewModel에 appServiceList 추가
9b2da26
@lsj8706
[Chore] sopt-makers#134 - UI 수정
5bddc64
@lsj8706
[Feat] sopt-makers#134 - Array+ 생성
9a19528
@lsj8706
[Fix] sopt-makers#134 - Label의 폰트 수정
ec5a122
@L-j-h-c
[Fix] sopt-makers#113 - 폴더명 변경
7704cef
@L-j-h-c
[Feat] sopt-makers#113 - xcconfig 분기
867e24c
@L-j-h-c L-j-h-c self-assigned this Apr 5, 2023
@L-j-h-c L-j-h-c requested a review from a team April 5, 2023 09:31
@L-j-h-c L-j-h-c requested review from elesahich, 0inn, lsj8706 and devxsby and removed request for a team April 5, 2023 09:31
lsj8706 and others added 5 commits April 5, 2023 18:49
@lsj8706
[Chore] sopt-makers#124 - CollectionView에 사용되는 inset 수치를 Metric 열거형으로 생성
cffcde5
@lsj8706
[Feat] sopt-makers#134 - UserHistoryHeaderView에서 attributedText를 주는 방…
db70ce4 
…식 변경
@lsj8706
Merge pull request sopt-makers#138 from lsj8706/feat/sopt-makers#134-…
d1dad44 
…메인뷰UI

[Feat] sopt-makers#134 - 메인뷰 UI
@L-j-h-c
[Fix] Merge용 커밋
aa3952c
@L-j-h-c
Merge branch 'feature/sopt-makers#113' into feature/sopt-makers#113-m…
38a3d58 
…erge

# Conflicts:
#	SOPT-Stamp-iOS/Projects/Modules/DSKit/Sources/Components/ChartRectangleView.swift
#	SOPT-Stamp-iOS/Projects/Modules/DSKit/Sources/Components/CustomButton.swift
#	SOPT-Stamp-iOS/Projects/Modules/DSKit/Sources/Components/CustomNavigationBar.swift
#	SOPT-Stamp-iOS/Projects/Modules/DSKit/Sources/Components/CustomTextFieldView.swift
#	SOPT-Stamp-iOS/Projects/Modules/DSKit/Sources/Components/SpeechBalloonView.swift
#	SOPT-Stamp-iOS/Projects/Modules/DSKit/Sources/Components/StarView.swift
#	SOPT-iOS/Projects/Features/StampFeature/Sources/Components/STChartRectangleView.swift
#	SOPT-iOS/Projects/Features/StampFeature/Sources/Components/STSpeechBalloonView.swift
#	SOPT-iOS/Projects/Features/StampFeature/Sources/Components/STStarView.swift
#	SOPT-iOS/Projects/Modules/DSKit/Sources/Components/ChartRectangleView.swift
#	SOPT-iOS/Projects/Modules/DSKit/Sources/Components/CustomButton.swift
#	SOPT-iOS/Projects/Modules/DSKit/Sources/Components/CustomNavigationBar.swift
#	SOPT-iOS/Projects/Modules/DSKit/Sources/Components/CustomTextFieldView.swift
#	SOPT-iOS/Projects/Modules/DSKit/Sources/Components/SoptampComponents/STCustomButton.swift
#	SOPT-iOS/Projects/Modules/DSKit/Sources/Components/SoptampComponents/STNavigationBar.swift
#	SOPT-iOS/Projects/Modules/DSKit/Sources/Components/SoptampComponents/STTextFieldView.swift
#	SOPT-iOS/Projects/Modules/DSKit/Sources/Components/SpeechBalloonView.swift
#	SOPT-iOS/Projects/Modules/DSKit/Sources/Components/StarView.swift
devxsby
devxsby approved these changes Apr 6, 2023
View reviewed changes
Copy link
Member

@devxsby devxsby left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

고생하셨습니다 👍🏻
근데 밑에 엄청난 컨플릭트는 먼가여...? 🫥

lsj8706
lsj8706 approved these changes Apr 6, 2023
View reviewed changes
Copy link
Member

@lsj8706 lsj8706 left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

폴더명 바꾸는 작업을 하면서 Files Changed가 엄청 커졌네요 ㅋㅋㅋㅋㅋ 너무 수고하셨습니다.
깃허브가 렉이 걸리는 현상....😮
개발 환경 분리가 필요했었는데 덕분에 편하게 작업 할 수 있겠네요!! 👍

궁금한 것이 있어요! DEV 환경에서도 실제 프로덕트 BaseURL를 사용하는 debug scheme을 사용한다고 하셨는데 DEV로 놓고 개발하다가 잘못된 데이터가 들어가지는 않을까요..?

@L-j-h-c
Copy link
Contributor Author

L-j-h-c commented Apr 6, 2023

@lsj8706 데이터가 추가를 테스트해야 한다면 TEST 스킴에서 해주시면 됩니다!

@L-j-h-c L-j-h-c merged commit ccdef7a into sopt-makers:develop Apr 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@devxsby devxsby devxsby approved these changes

@lsj8706 lsj8706 lsj8706 approved these changes

@elesahich elesahich Awaiting requested review from elesahich elesahich was automatically assigned from sopt-makers/ios-chapter-2nd

@0inn 0inn Awaiting requested review from 0inn 0inn was automatically assigned from sopt-makers/ios-chapter-2nd

Assignees

@L-j-h-c L-j-h-c

Labels
준호🏅
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Feat] XC Config으로 개발 환경 분기
3 participants
@L-j-h-c @lsj8706 @devxsby