Skip to content

Commit ad01c6f

Browse files
committed
Merge branch 'develop'
2 parents 493dde4 + 0908724 commit ad01c6f

File tree

705 files changed

+31383
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

705 files changed

+31383
-0
lines changed
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
name: Bug report
3+
about: 버그 이슈 템플릿
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
### 버그 설명
11+
12+
<br>
13+
14+
### 어떤 상황에서 발생했는지 구체적으로 서술
15+
16+
<br>
17+
18+
### 원래 예상되는 동작
19+
20+
<br>
21+
22+
### 해결 방안
23+
24+
1. ~
25+
2. ~
26+
27+
<br>
28+
29+
### 참고
30+
31+
<br>
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
name: Feature request
3+
about: 이슈 템플릿
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
### 이슈 설명
11+
12+
<br>
13+
14+
### 작업 상세 내용
15+
- [ ] TODO
16+
- [ ] TODO
17+
- [ ] TODO
18+
19+
### 참고

.github/pull_request_template.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
## 관련 이슈
2+
- Close #이슈번호
3+
- Related #이슈번호
4+
<br>
5+
6+
## 작업 내용
7+
- 이번 pr에서 작업한 내용 설명
8+
<br>
9+
10+
## 참고 사항
11+
<br>
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: Build & upload to Firebase App Distribution
2+
3+
on:
4+
push:
5+
branches: [ develop ] # dev 브런치에 push가 올 때 이벤트 트리거
6+
7+
jobs:
8+
build:
9+
runs-on: ubuntu-latest # 이후의 jobs들은 ubuntu의 최신버전에서 실행한다.
10+
11+
env:
12+
LOCAL_PROPERTIES_CONTENTS: ${{ secrets.LOCAL_PROPERTIES_CONTENTS }} # scerets에서 로컬 프로퍼티 값 변수(LOCAL_PROPERTIES_CONTENTS)로 설정
13+
GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }} # scerets에서 구글 제이슨 값 변수(GOOGLE_SERVICES_JSON)로 설정
14+
15+
steps:
16+
- uses: actions/checkout@v1
17+
- name: set up JDK 17 # 깃허브 runner에서 돌아가는 환경은 java 17버전으로 설정한다.
18+
uses: actions/setup-java@v1
19+
with:
20+
java-version: 17
21+
22+
- name: Grant Permission for gradlew # gradlew 에 대한 퍼미션을 허용한다.
23+
run: chmod +x gradlew
24+
working-directory: CatchMate
25+
shell: bash
26+
27+
- name: Create google-services.json # 환경변수(GOOGLE_SERVICES_JSON) 값의 내용을 기반으로 `app/google-services.json`를 만든다.
28+
run: echo "$GOOGLE_SERVICES_JSON" > app/google-services.json
29+
working-directory: CatchMate
30+
31+
- name: Create local.properties # (LOCAL_PROPERTIES_CONTENTS)를 기반으로 local.properties를 만들고 keystore.jks 위치를 추가해 준다.
32+
run: |
33+
echo "$LOCAL_PROPERTIES_CONTENTS" > local.properties
34+
working-directory: CatchMate
35+
36+
- name: Build debug # APK를 빌드한다. (디버그용)
37+
run: ./gradlew :app:assembleDebug
38+
working-directory: CatchMate
39+
40+
- name: Authenticate to Firebase
41+
uses: google-github-actions/auth@v1
42+
with:
43+
credentials_json: ${{ secrets.FIREBASE_SERVICE_ACCOUNT }}
44+
45+
- name: Upload to Firebase App Distribution # 파이어베이스에 앱 디스트리 뷰션에 배포한다.
46+
uses: wzieba/[email protected]
47+
with:
48+
appId: ${{ secrets.FIREBASE_APP_ID }}
49+
serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }}
50+
groups: AOSTest
51+
file: CatchMate/app/build/outputs/apk/debug/app-debug.apk

.github/workflows/ktlint.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: ktlint
2+
on:
3+
pull_request:
4+
branches:
5+
- develop
6+
push:
7+
paths:
8+
- '**.kt'
9+
jobs:
10+
ktlint:
11+
name: ktlint
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: checkout
15+
uses: actions/checkout@master
16+
with:
17+
fetch-depth: 1
18+
- name: ktlint
19+
uses: ScaCap/action-ktlint@master
20+
with:
21+
github_token: ${{ secrets.github_token }}
22+
reporter: github-pr-check
23+
android: true
24+
fail_on_error: true
25+
level: warning

CatchMate/.gitignore

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
*.iml
2+
.gradle
3+
/local.properties
4+
/.idea/caches
5+
/.idea/libraries
6+
/.idea/modules.xml
7+
/.idea/workspace.xml
8+
/.idea/navEditor.xml
9+
/.idea/assetWizardSettings.xml
10+
.DS_Store
11+
/build
12+
/captures
13+
.externalNativeBuild
14+
.cxx
15+
local.properties

CatchMate/app/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build

CatchMate/app/build.gradle.kts

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
import java.io.FileInputStream
2+
import java.util.Properties
3+
4+
plugins {
5+
id("catchmate.android.application")
6+
id("com.google.gms.google-services")
7+
}
8+
9+
val properties = Properties()
10+
properties.load(FileInputStream(rootProject.file("local.properties")))
11+
12+
android {
13+
namespace = "com.catchmate.android"
14+
15+
val kakaoNativeAppKey = properties["kakao_native_app_key"] as? String ?: ""
16+
val naverClientId = properties["naver_client_id"] as? String ?: ""
17+
val naverClientSecret = properties["naver_client_secret"] as? String ?: ""
18+
19+
defaultConfig {
20+
applicationId = "com.catchmate.android"
21+
versionCode = 1
22+
versionName = "1.0"
23+
24+
buildConfigField("String", "KAKAO_NATIVE_APP_KEY", kakaoNativeAppKey)
25+
buildConfigField("String", "NAVER_CLIENT_ID", naverClientId)
26+
buildConfigField("String", "NAVER_CLIENT_SECRET", naverClientSecret)
27+
manifestPlaceholders["kakaoNativeAppKeyManifest"] = properties["kakao_native_app_key_manifest"] as String
28+
}
29+
30+
buildFeatures {
31+
buildConfig = true
32+
}
33+
}
34+
35+
dependencies {
36+
implementation(project(":data"))
37+
implementation(project(":domain"))
38+
implementation(project(":presentation"))
39+
40+
implementation(libs.kakao.user)
41+
implementation(libs.naver.user)
42+
43+
implementation(platform(libs.firebase.bom))
44+
implementation(libs.firebase.messaging)
45+
}

CatchMate/app/proguard-rules.pro

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Add project specific ProGuard rules here.
2+
# You can control the set of applied configuration files using the
3+
# proguardFiles setting in build.gradle.kts.
4+
#
5+
# For more details, see
6+
# http://developer.android.com/guide/developing/tools/proguard.html
7+
8+
# If your project uses WebView with JS, uncomment the following
9+
# and specify the fully qualified class name to the JavaScript interface
10+
# class:
11+
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
12+
# public *;
13+
#}
14+
15+
# Uncomment this to preserve the line number information for
16+
# debugging stack traces.
17+
#-keepattributes SourceFile,LineNumberTable
18+
19+
# If you keep the line number information, uncomment this to
20+
# hide the original source file name.
21+
#-renamesourcefileattribute SourceFile
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package com.catchmate.android
2+
3+
import androidx.test.ext.junit.runners.AndroidJUnit4
4+
import androidx.test.platform.app.InstrumentationRegistry
5+
import org.junit.Assert.assertEquals
6+
import org.junit.Test
7+
import org.junit.runner.RunWith
8+
9+
/**
10+
* Instrumented test, which will execute on an Android device.
11+
*
12+
* See [testing documentation](http://d.android.com/tools/testing).
13+
*/
14+
@RunWith(AndroidJUnit4::class)
15+
class ExampleInstrumentedTest {
16+
@Test
17+
fun useAppContext() {
18+
// Context of the app under test.
19+
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
20+
assertEquals("com.catchmate.android", appContext.packageName)
21+
}
22+
}

0 commit comments

Comments
 (0)