Skip to content

Commit b548d99

Browse files
authored
Merge pull request #87 from YAPP-Github/revert-86-refactor/#85-random-pose-call-site
Revert "[refactor] #85 랜덤포즈 중복 확인 위치 변경"
2 parents 748ff59 + 6dfd26e commit b548d99

402 files changed

Lines changed: 428 additions & 21759 deletions

File tree

Some content is hidden

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

.editorconfig

Lines changed: 0 additions & 13 deletions
This file was deleted.

.github/workflows/android-ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
steps:
2222
- uses: actions/checkout@v4
2323

24-
- name: set up JDK 21
24+
- name: set up JDK 17
2525
uses: actions/setup-java@v4
2626
with:
27-
java-version: '21'
27+
java-version: '17'
2828
distribution: 'temurin'
2929
cache: gradle
3030

@@ -49,9 +49,9 @@ jobs:
4949
# run: |
5050
# echo '${{ secrets.GOOGLE_SERVICES }}' >> ./app/google-services.json
5151

52-
- name: Code style checks
53-
run: |
54-
./gradlew detekt --continue
52+
# - name: Code style checks
53+
# run: |
54+
# ./gradlew detekt --continue
5555

5656
- name: Run build
57-
run: ./gradlew buildDebug --stacktrace
57+
run: ./gradlew buildDebug --stacktrace

.github/workflows/discord_push_event_notify.yml

Lines changed: 0 additions & 81 deletions
This file was deleted.

.github/workflows/discord_review_event_notify.yml

Lines changed: 0 additions & 182 deletions
This file was deleted.

app/build.gradle.kts

Lines changed: 10 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
1-
import java.util.Properties
2-
import kotlin.apply
3-
41
plugins {
52
alias(libs.plugins.neki.android.application)
6-
alias(libs.plugins.neki.android.application.compose)
7-
alias(libs.plugins.oss.licenses)
8-
}
9-
10-
val localPropertiesFile = project.rootProject.file("local.properties")
11-
val properties = Properties().apply {
12-
if (localPropertiesFile.exists()) {
13-
load(localPropertiesFile.inputStream())
14-
}
153
}
164

175
android {
@@ -20,61 +8,25 @@ android {
208
buildFeatures {
219
buildConfig = true
2210
}
23-
24-
defaultConfig {
25-
buildConfigField("String", "NAVER_MAP_CLIENT_ID", properties["NAVER_MAP_CLIENT_ID"].toString())
26-
manifestPlaceholders["KAKAO_NATIVE_APP_KEY"] = buildConfigField(
27-
"String",
28-
"KAKAO_NATIVE_APP_KEY",
29-
properties["KAKAO_NATIVE_APP_KEY"].toString()
30-
)
31-
}
32-
33-
signingConfigs {
34-
create("release") {
35-
storeFile = rootProject.file("neki_key_store.jks")
36-
storePassword = properties["STORE_PASSWORD"].toString()
37-
keyAlias = properties["KEY_ALIAS"].toString()
38-
keyPassword = properties["KEY_PASSWORD"].toString()
39-
}
40-
}
41-
buildTypes {
42-
getByName("release") {
43-
isMinifyEnabled = true
44-
signingConfig = signingConfigs.getByName("release")
45-
proguardFiles(
46-
getDefaultProguardFile("proguard-android-optimize.txt"),
47-
"proguard-rules.pro",
48-
)
49-
}
50-
}
51-
5211
}
5312

5413
dependencies {
5514
implementation(projects.core.common)
5615
implementation(projects.core.dataApi)
5716
implementation(projects.core.data)
17+
implementation(projects.core.domain)
18+
implementation(projects.core.model)
19+
implementation(projects.core.designsystem)
20+
implementation(projects.feature.sample.impl)
21+
implementation(projects.feature.sample.api)
22+
23+
implementation(projects.core.common)
24+
implementation(projects.core.data)
25+
implementation(projects.core.dataApi)
5826
implementation(projects.core.designsystem)
5927
implementation(projects.core.domain)
6028
implementation(projects.core.model)
61-
implementation(projects.core.navigation)
62-
implementation(projects.core.ui)
63-
implementation(projects.feature.auth.api)
64-
implementation(projects.feature.auth.impl)
65-
implementation(projects.feature.pose.api)
66-
implementation(projects.feature.pose.impl)
67-
implementation(projects.feature.archive.api)
68-
implementation(projects.feature.archive.impl)
69-
implementation(projects.feature.map.api)
70-
implementation(projects.feature.map.impl)
71-
implementation(projects.feature.mypage.api)
72-
implementation(projects.feature.mypage.impl)
73-
implementation(projects.feature.photoUpload.api)
74-
implementation(projects.feature.photoUpload.impl)
7529

7630
implementation(libs.timber)
7731

78-
implementation(libs.androidx.activity.compose)
79-
implementation(libs.androidx.navigation3.ui)
80-
}
32+
}

0 commit comments

Comments
 (0)