Skip to content

Commit b3c28d3

Browse files
authored
Merge pull request #59 from depromeet/develop
[Release] 1차 mvp 릴리즈
2 parents 1b175e1 + 0472bc3 commit b3c28d3

File tree

266 files changed

+11119
-129
lines changed

Some content is hidden

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

266 files changed

+11119
-129
lines changed

.DS_Store

6 KB
Binary file not shown.
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
name: Team6 Issue Template
3+
about: "디프만 16기 6팀 안드로이드 이슈 템플릿 \U0001F680"
4+
title: "[Type] 작업 내용"
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
## What is this issue? 🛠
11+
12+
## Progress 🏃‍♀️
13+
- [ ]
14+
15+
## Additional Info

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
## #️⃣연관된 이슈
2+
3+
- #000
4+
5+
## 📝작업 내용
6+
7+
-
8+
9+
## PR 발행 전 체크 리스트
10+
11+
- [ ] 발행자 확인
12+
- [ ] 프로젝트 설정 확인
13+
- [ ] 라벨 확인
14+
- [ ] 코드 린트 확인
15+
16+
## 스크린샷 (선택)
17+
18+
## 💬리뷰 요구사항(선택)
19+
20+
- 리뷰어가 특별히 봐주었으면 하는 부분이 있다면 작성해주세요
21+
-
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
## Related issue 🛠
2+
- closed #이슈넘버
3+
4+
## Work Description ✏️
5+
- 작업 내용
6+
7+
## Screenshot 📸
8+
<img src="" width="360"/>
9+
10+
## Uncompleted Tasks 😅
11+
- [ ] Task1
12+
13+
## To Reviewers 📢

.github/workflows/android_ci.yml

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
name: Team6 CI
2+
on:
3+
pull_request:
4+
branches: [ develop, main ]
5+
6+
defaults:
7+
run:
8+
shell: bash
9+
working-directory: .
10+
11+
jobs:
12+
build:
13+
name: CI
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Checkout
17+
uses: actions/checkout@v2
18+
19+
- name: Gradle cache
20+
uses: actions/cache@v3
21+
with:
22+
path: |
23+
~/.gradle/caches
24+
~/.gradle/wrapper
25+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
26+
restore-keys: |
27+
${{ runner.os }}-gradle-
28+
29+
- name: set up JDK 17
30+
uses: actions/setup-java@v3
31+
with:
32+
java-version: 17
33+
distribution: 'temurin'
34+
35+
- name: Change gradlew permissions
36+
run: chmod +x ./gradlew
37+
38+
- name: Grant execute permission for gradlew
39+
run: chmod +x gradlew
40+
41+
- name: Touch local properties
42+
run: touch local.properties
43+
44+
- name: Debug Base64 Decoding
45+
run: |
46+
echo "$FIREBASE_SECRET" | base64 --decode || echo "Base64 Decode Failed"
47+
48+
# ✅ google-services.json 복원 (base64 디코딩)
49+
- name: Decode google-services.json
50+
env:
51+
FIREBASE_SECRET: ${{ secrets.FIREBASE_SECRET }}
52+
run: |
53+
echo $FIREBASE_SECRET | base64 --decode > app/google-services.json
54+
ls -l app
55+
cat app/google-services.json | jq .
56+
57+
# ✅ local.properties 생성 및 환경 변수 추가
58+
- name: Access local properties
59+
env:
60+
BASE_URL: ${{ secrets.BASE_URL }}
61+
run: |
62+
echo "dev.base.url=\"$BASE_URL\"" >> local.properties
63+
64+
# ✅ Lint Check
65+
- name: Lint Check
66+
run: ./gradlew ktlintCheck -PcompileSdkVersion=34
67+
68+
# ✅ Build with Gradle
69+
- name: Build with Gradle
70+
run: ./gradlew build -PcompileSdkVersion=34
71+
72+
# ✅ 성공 알림
73+
- name: Slack Notify - Success
74+
if: ${{ success() }}
75+
uses: rtCamp/action-slack-notify@v2
76+
env:
77+
SLACK_COLOR: '#B7FF1D'
78+
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
79+
SLACK_TITLE: '✅ PR Success ✅'
80+
SLACK_USERNAME: DEPORMEET-TEAM6 🍗
81+
SLACK_MESSAGE: 'PR이 완료되었습니다! 😆‍'
82+
83+
# ❌ 실패 알림
84+
- name: Slack Notify - Failure
85+
if: ${{ failure() }}
86+
uses: rtCamp/action-slack-notify@v2
87+
env:
88+
SLACK_COLOR: '#FF9254'
89+
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
90+
SLACK_TITLE: '❌ PR Failed ❌'
91+
SLACK_USERNAME: DEPORMEET-TEAM6 🍗
92+
SLACK_MESSAGE: '에러를 확인해 주세요 🫨'

app/.DS_Store

6 KB
Binary file not shown.

app/.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
/build
1+
/build
2+
/keystore

app/build.gradle.kts

Lines changed: 72 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,53 @@
1+
import java.util.Properties
2+
13
plugins {
24
alias(libs.plugins.android.application)
35
alias(libs.plugins.kotlin.android)
46
alias(libs.plugins.kotlin.compose)
7+
alias(libs.plugins.ktlint)
8+
alias(libs.plugins.kotlin.serialization)
9+
alias(libs.plugins.dagger.hilt)
10+
alias(libs.plugins.kotlin.kapt)
11+
id("com.google.gms.google-services")
12+
}
13+
14+
val properties = Properties().apply {
15+
load(project.rootProject.file("local.properties").inputStream())
516
}
617

718
android {
819
namespace = "com.depromeet.team6"
9-
compileSdk = 34
20+
compileSdk = 35
1021

1122
defaultConfig {
23+
manifestPlaceholders += mapOf()
1224
applicationId = "com.depromeet.team6"
13-
minSdk = 33
25+
minSdk = 26
1426
targetSdk = 34
15-
versionCode = 1
27+
versionCode = 2
1628
versionName = "1.0"
1729

1830
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
31+
buildConfigField("String", "KAKAO_NATIVE_APP_KEY", properties["kakao.native.app.key"].toString())
32+
manifestPlaceholders["KAKAO_NATIVE_APP_KEY_MANIFEST"] = properties["kakao.native.app.key.manifest"]?.toString() ?: ""
33+
buildConfigField("String", "TMAP_API_KEY", properties["tmap.api.key"].toString())
1934
}
2035

2136
buildTypes {
2237
release {
23-
isMinifyEnabled = false
38+
isMinifyEnabled = true
39+
isShrinkResources = true
40+
buildConfigField("String", "BASE_URL", properties["release.base.url"].toString())
2441
proguardFiles(
2542
getDefaultProguardFile("proguard-android-optimize.txt"),
2643
"proguard-rules.pro"
2744
)
2845
}
46+
debug {
47+
isMinifyEnabled = false
48+
isDebuggable = true
49+
buildConfigField("String", "BASE_URL", properties["dev.base.url"].toString())
50+
}
2951
}
3052
compileOptions {
3153
sourceCompatibility = JavaVersion.VERSION_1_8
@@ -36,6 +58,7 @@ android {
3658
}
3759
buildFeatures {
3860
compose = true
61+
buildConfig = true
3962
}
4063
}
4164

@@ -49,11 +72,55 @@ dependencies {
4972
implementation(libs.androidx.ui.graphics)
5073
implementation(libs.androidx.ui.tooling.preview)
5174
implementation(libs.androidx.material3)
75+
implementation(libs.material)
76+
implementation(libs.androidx.appcompat)
77+
implementation(libs.firebase.messaging.ktx)
78+
implementation(libs.play.services.maps)
79+
implementation(libs.play.services.location)
80+
implementation(libs.play.services.auth)
5281
testImplementation(libs.junit)
5382
androidTestImplementation(libs.androidx.junit)
5483
androidTestImplementation(libs.androidx.espresso.core)
5584
androidTestImplementation(platform(libs.androidx.compose.bom))
5685
androidTestImplementation(libs.androidx.ui.test.junit4)
5786
debugImplementation(libs.androidx.ui.tooling)
5887
debugImplementation(libs.androidx.ui.test.manifest)
59-
}
88+
89+
// Network
90+
implementation(platform(libs.okhttp.bom))
91+
implementation(libs.okhttp)
92+
implementation(libs.okhttp.logging.interceptor)
93+
implementation(libs.retrofit)
94+
implementation(libs.retrofit.kotlin.serialization.converter)
95+
implementation(libs.kotlinx.serialization.json)
96+
97+
// Hilt
98+
implementation(libs.bundles.hilt)
99+
kapt(libs.hilt.compiler)
100+
101+
// Navigation
102+
implementation(libs.androidx.compose.navigation)
103+
implementation(libs.hilt.navigation.compose)
104+
105+
// Kakao
106+
implementation(libs.bundles.kakao)
107+
108+
// Security
109+
implementation(libs.androidx.security.crypto)
110+
111+
// Tmap
112+
implementation(files("libs/tmap-sdk-1.8.aar"))
113+
implementation(files("libs/vsm-tmap-sdk-v2-android-1.7.23.aar"))
114+
115+
// Firebase
116+
implementation(platform(libs.firebase.bom))
117+
implementation(libs.firebase.analytics)
118+
119+
// WebView
120+
implementation(libs.accompanist.webview)
121+
}
122+
java {
123+
toolchain {
124+
languageVersion = JavaLanguageVersion.of(17)
125+
}
126+
}

app/libs/tmap-sdk-1.8.aar

238 KB
Binary file not shown.
13.3 MB
Binary file not shown.

0 commit comments

Comments
 (0)