Skip to content

Commit

Permalink
✨[feat]: 프로젝트 파일 변경
Browse files Browse the repository at this point in the history
  • Loading branch information
Roy-wonji committed Jan 6, 2024
1 parent ce16beb commit 1bcab24
Show file tree
Hide file tree
Showing 64 changed files with 442 additions and 501 deletions.
6 changes: 0 additions & 6 deletions BeatMaster/.github/.gitMessage.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,3 @@ Commit 메세지 </br>

- `STEP1`, `STEP2`, `STEP3`

<br>

## Git flow
- `main` 브랜 치는 앱 출시
- `Dev`는 테스트 및 각종 파일 merge
- 각 스텝 뱔로 브런치 생성해서 관리
42 changes: 42 additions & 0 deletions BeatMaster/.github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
## 작업내용
<!-- 작업 내용과 이미지를 첨부해주세요. -->
- [x] 작업 내용

<!-- (+스크린샷)이 있다면 적어주세요. 없으면 지워주세요-->
|작업 전|작업 후|
|:---:|:---:|
|<img width="250" src="">|<img width="250" src="">|

## 리뷰포인트
<!-- 리뷰가 필요한 포인트와 해당 되는 커밋을 링크로 걸어주세요. -->

## Reference
<!-- 참고한 자료를 작성해주세요 -->

## Motivation 🥳 (코드를 추가/변경하게 된 이유)

## Key Changes 🔥 (주요 구현/변경 사항)

## ToDo 📆 (남은 작업)
- [ ] todo

## ScreenShot 📷 (참고 사진)

## To Reviewers 🙏 (리뷰어에게 전달하고 싶은 말)

## Reference 🔗

## Close Issues 🔒 (닫을 Issue)
Close #No.

## Checklist
- [ ] 브랜치를 가져와 작업한 경우 이전 브랜치에 PR을 보냈는지 확인
- [ ] 빌드를 위해 SceneDelegate 수정한 것 PR로 올리지 않았는지 확인
- [ ] 필요없는 주석, 프린트문 제거했는지 확인
- [ ] 컨벤션 지켰는지 확인
- [ ] final, private 제대로 넣었는지 확인
- [ ] 다양한 디바이스에 레이아웃이 대응되는지 확인
- [ ] iPhone SE
- [ ] iPhone 13
- [ ] iPhone 13 Pro Max

13 changes: 13 additions & 0 deletions BeatMaster/.github/auto_assign.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
addReviewers: true

# Set to true to add assignees to pull requests
addAssignees: author

# A list of reviewers to be added to pull requests (GitHub user name)
reviewers:
- Roy
- Byeon Jinha

# A number of reviewers added to the pull request
# Set 0 to add all the reviewers (default: 0)
numberOfReviewers: 0
44 changes: 44 additions & 0 deletions BeatMaster/.github/workflows/ios.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: iOS starter workflow

on:
push:
branches: [ "Dev" ]
pull_request:
branches: [ "Dev" ]

jobs:
build:
name: Build and Test default scheme using any available iPhone simulator
runs-on: macos-latest

steps:
- name: Checkout
uses: actions/checkout@v3
- name: Set Default Scheme
run: |
scheme_list=$(xcodebuild -list -json | tr -d "\n")
default=$(echo $scheme_list | ruby -e "require 'json'; puts JSON.parse(STDIN.gets)['project']['targets'][0]")
echo $default | cat >default
echo Using default scheme: $default
- name: Build
env:
scheme: ${{ 'default' }}
platform: ${{ 'iOS Simulator' }}
run: |
# xcrun xctrace returns via stderr, not the expected stdout (see https://developer.apple.com/forums/thread/663959)
device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}' | sed -e "s/ Simulator$//"`
if [ $scheme = default ]; then scheme=$(cat default); fi
if [ "`ls -A | grep -i \\.xcworkspace\$`" ]; then filetype_parameter="workspace" && file_to_build="`ls -A | grep -i \\.xcworkspace\$`"; else filetype_parameter="project" && file_to_build="`ls -A | grep -i \\.xcodeproj\$`"; fi
file_to_build=`echo $file_to_build | awk '{$1=$1;print}'`
xcodebuild build-for-testing -scheme "$scheme" -"$filetype_parameter" "$file_to_build" -destination "platform=$platform,name=$device"
- name: Test
env:
scheme: ${{ 'default' }}
platform: ${{ 'iOS Simulator' }}
run: |
# xcrun xctrace returns via stderr, not the expected stdout (see https://developer.apple.com/forums/thread/663959)
device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}' | sed -e "s/ Simulator$//"`
if [ $scheme = default ]; then scheme=$(cat default); fi
if [ "`ls -A | grep -i \\.xcworkspace\$`" ]; then filetype_parameter="workspace" && file_to_build="`ls -A | grep -i \\.xcworkspace\$`"; else filetype_parameter="project" && file_to_build="`ls -A | grep -i \\.xcodeproj\$`"; fi
file_to_build=`echo $file_to_build | awk '{$1=$1;print}'`
xcodebuild test-without-building -scheme "$scheme" -"$filetype_parameter" "$file_to_build" -destination "platform=$platform,name=$device"
30 changes: 30 additions & 0 deletions BeatMaster/.github/workflows/objective-c-xcode.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Xcode - Build and Analyze

on:
push:
branches: [ "Dev" ]
pull_request:
branches: [ "Dev" ]

jobs:
build:
name: Build and analyse default scheme using xcodebuild command
runs-on: macos-latest

steps:
- name: Checkout
uses: actions/checkout@v3
- name: Set Default Scheme
run: |
scheme_list=$(xcodebuild -list -json | tr -d "\n")
default=$(echo $scheme_list | ruby -e "require 'json'; puts JSON.parse(STDIN.gets)['project']['targets'][0]")
echo $default | cat >default
echo Using default scheme: $default
- name: Build
env:
scheme: ${{ 'default' }}
run: |
if [ $scheme = default ]; then scheme=$(cat default); fi
if [ "`ls -A | grep -i \\.xcworkspace\$`" ]; then filetype_parameter="workspace" && file_to_build="`ls -A | grep -i \\.xcworkspace\$`"; else filetype_parameter="project" && file_to_build="`ls -A | grep -i \\.xcodeproj\$`"; fi
file_to_build=`echo $file_to_build | awk '{$1=$1;print}'`
xcodebuild clean build analyze -scheme "$scheme" -"$filetype_parameter" "$file_to_build" | xcpretty && exit ${PIPESTATUS[0]}
23 changes: 23 additions & 0 deletions BeatMaster/.github/workflows/swift.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# This workflow will build a Swift project
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift

name: Swift

on:
push:
branches: [ "Release" ]
pull_request:
branches: [ "Dev" ]

jobs:
build:

runs-on: macos-latest

steps:
- uses: actions/checkout@v3
- name: Build
run: swift build -v
- name: Run tests
run: tuist clean tuist fetch tuist generate --project-directory=PingPong/
xcodebuild clean test -workspace PingPong/PingPong.xcworkspace -scheme PingPong -destination 'platform=iOS Simulator,name=iPhone 14 Pro,OS=latest'
135 changes: 135 additions & 0 deletions BeatMaster/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,137 @@
# Created by https://www.toptal.com/developers/gitignore/api/xcode,cocoapods,swiftpackagemanager,fastlane,swift,swiftpm,objective-c
# Edit at https://www.toptal.com/developers/gitignore?templates=xcode,cocoapods,swiftpackagemanager,fastlane,swift,swiftpm,objective-c

### CocoaPods ###
## CocoaPods GitIgnore Template

# CocoaPods - Only use to conserve bandwidth / Save time on Pushing
# - Also handy if you have a large number of dependant pods
# - AS PER https://guides.cocoapods.org/using/using-cocoapods.html NEVER IGNORE THE LOCK FILE
Pods/

### fastlane ###
# fastlane - A streamlined workflow tool for Cocoa deployment
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/#source-control

# fastlane specific
**/fastlane/report.xml

# deliver temporary files
**/fastlane/Preview.html

# snapshot generated screenshots
**/fastlane/screenshots

# scan temporary files
**/fastlane/test_output

# Fastlane.swift runner binary
**/fastlane/FastlaneRunner

### Objective-C ###
# Xcode
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## User settings
xcuserdata/
.DS_Store/

*.Gemfile
*,lock
*.p8
*.env
*.cer
*.swp
*.json
*.p12
*.DS_Store
*.pbxproj
*.resolved
*.DS_Store/
*.key

## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
*.xcscmblueprint
*.xccheckout

## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
build/
DerivedData/
*.moved-aside
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3

## Obj-C/Swift specific
*.hmap

## App packaging
*.ipa
*.dSYM.zip
*.dSYM

# CocoaPods
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
# Pods/
# Add this line if you want to avoid checking in source code from the Xcode workspace
# *.xcworkspace

# Carthage
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts

Carthage/Build/

# fastlane
# It is recommended to not store the screenshots in the git repo.
# Instead, use fastlane to re-generate the screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/#source-control

fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots/**/*.png
fastlane/test_output

# Code Injection
# After new code Injection tools there's a generated folder /iOSInjectionProject
# https://github.com/johnno1962/injectionforxcode

iOSInjectionProject/

### Objective-C Patch ###

### Swift ###
# Xcode
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## Playgrounds
timeline.xctimeline
playground.xcworkspace

# Swift Package Manager
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
# Package.pins
# Package.resolved
# *.xcodeproj
# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
# hence it is not needed unless you have added a package configuration file to your project
# .swiftpm

.build/

# CocoaPods
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
Expand Down Expand Up @@ -51,3 +185,4 @@ xcuserdata

# End of https://www.toptal.com/developers/gitignore/api/xcode,cocoapods,swiftpackagemanager,fastlane,swift,swiftpm,objective-c.DS_Store
.DS_Store

2 changes: 1 addition & 1 deletion BeatMaster/.tuist-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.33.3
3.35.5
6 changes: 0 additions & 6 deletions BeatMaster/BeatMaster/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,3 @@ Derived/

### Tuist managed dependencies ###
Tuist/Dependencies
Tuist/master.key
*.p12
*.cer
Tuist/Signing
BuildConfigurations
*.p8

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version: 5.4
// swift-tools-version: 5.8

import PackageDescription

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
//
// Extension+TargetDependency.swift
// MyPlugin
//
// Created by 서원지 on 1/6/24.
//

import ProjectDescription

public extension TargetDependency {
enum SPM {}
}

public extension TargetDependency.SPM {
static let Moya = TargetDependency.external(name: "Moya", condition: .none)
static let CombineMoya = TargetDependency.external(name: "CombineMoya", condition: .none)
static let ComposableArchitecture = TargetDependency.external(name: "ComposableArchitecture", condition: .none)
}
Loading

0 comments on commit 1bcab24

Please sign in to comment.