Skip to content

Commit

Permalink
Merge pull request #600 from TeamSparker/release
Browse files Browse the repository at this point in the history
[Chore] #599 - develop 브랜치에서 release 브랜치 생성 및 main 브랜치로 머지
  • Loading branch information
hyun99999 authored May 6, 2022
2 parents bc98662 + 94a1eaa commit c6a0b07
Show file tree
Hide file tree
Showing 793 changed files with 29,201 additions and 1 deletion.
15 changes: 15 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
name: Spark Issue Template
about: "Spark 이슈 템플릿입니다.🎇"
title: '[Prefix] #이슈 번호 - 이슈 타이틀'
labels: ''
assignees: ''

---

## 🛠 Issue
<!-- 이슈에 대해 간략하게 설명해주세요 -->

## 📝 To-do
<!-- 진행할 작업에 대해 적어주세요 -->
- [ ] todo!
18 changes: 18 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
## 🔥*Pull requests*

⛳️ **작업한 브랜치**
- feature/#이슈번호

👷 **작업한 내용**
<!-- 작업한 내용을 적어주세요. -->

## 🚨참고 사항
<!-- 참고할 사항이 있다면 적어주세요. -->

## 📸 스크린샷
|기능|스크린샷|
|:--:|:--:|
|GIF|<img src = "" width ="250">|

## 📟 관련 이슈
- Resolved: #이슈번호
143 changes: 143 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@

# Created by https://www.toptal.com/developers/gitignore/api/cocoapods,macos,swift,xcode
# Edit at https://www.toptal.com/developers/gitignore?templates=cocoapods,macos,swift,xcode

### 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/

### macOS ###
# General
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon


# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

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

## User settings
xcuserdata/

## 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

## 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:
# 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/

# Accio dependency management
Dependencies/
.accio/

# 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/

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




## Gcc Patch
/*.gcno

### Xcode Patch ###
*.xcodeproj/*
!*.xcodeproj/project.pbxproj
!*.xcodeproj/xcshareddata/
!*.xcworkspace/contents.xcworkspacedata
**/xcshareddata/WorkspaceSettings.xcsettings

# End of https://www.toptal.com/developers/gitignore/api/cocoapods,macos,swift,xcode
38 changes: 37 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,37 @@
# Spark-iOS
<img src ="https://user-images.githubusercontent.com/69136340/150557491-0097a4f4-0c8d-4d8e-b84d-a4db5908d002.png" width ="1000">
<img src ="https://user-images.githubusercontent.com/81167570/157395785-f79b859d-c94d-459d-ba7f-1ea48393e677.png" width ="1000">


### ⚡️Coding Convention
see [Spark Coding Convention Wiki](https://github.com/TeamSparker/Spark-iOS/wiki/Code-Convention) page.

### ⚡️Git branch
see [Spark Git branch 전략 Wiki](https://github.com/TeamSparker/Spark-iOS/wiki/Git-branch-%EC%A0%84%EB%9E%B5) page.

### ⚡️Commit Convention
see [Spark Commit Convention Wiki](https://github.com/TeamSparker/Spark-iOS/wiki/Commit-Convention) page.

### ⚡️Foldering
```
Spark-iOS
|── Source
│ |── AppDelegate
│ |── SceneDelegate
│ |── AppModels
│ |── Cells
│ |── Extensions
│ |── NetworkServices
│ |── Protocols
│ |── ViewControllers
│ └── Views
└── Resource
|── Info.plist
|── Assets
|── Constants
|── Fonts
└── Storyboards
```

<!-- <img src ="https://user-images.githubusercontent.com/69136340/150557506-ceb378c4-9fcc-4c27-ae98-6b22d61386d9.png" width ="1000"> -->

12 changes: 12 additions & 0 deletions Spark-iOS/.swiftlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
disabled_rules:
- line_length
- trailing_whitespace
- function_parameter_count
- identifier_name
- function_body_length
- nesting

excluded: # 린트 과정에서 무시할 파일 경로. `included`보다 우선순위 높음
- Pods
- Spark-iOS/Resource/AppDelegate.swift
- Spark-iOS/Resource/SceneDelegate.swift
23 changes: 23 additions & 0 deletions Spark-iOS/Podfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Uncomment the next line to define a global platform for your project
# platform :ios, '9.0'

target 'Spark-iOS' do
# Comment the next line if you don't want to use dynamic frameworks
use_frameworks!

# Pods for Spark-iOS
pod 'SnapKit', '~> 5.0.0'
pod 'Kingfisher', '~> 7.0'
pod 'SwiftLint'
pod 'Moya', '~> 15.0'
pod 'JJFloatingActionButton', :git => 'https://github.com/TeamSparker/JJFloatingActionButton.git', :branch => 'spark'
pod 'KakaoSDKCommon'
pod 'KakaoSDKUser'
pod 'KakaoSDKAuth'
pod 'Firebase/Analytics'
pod 'Firebase/Messaging'
pod 'lottie-ios'
pod 'Kingfisher', '~> 7.0'
pod 'RxSwift', '6.5.0'
pod 'RxCocoa', '6.5.0'
end
Loading

0 comments on commit c6a0b07

Please sign in to comment.