Skip to content

Commit 791696b

Browse files
authored
Merge pull request #78 from YAPP-Github/release/release-1.0.0
Release/release 1.0.0 -> release merge
2 parents 662135d + 18854d4 commit 791696b

654 files changed

Lines changed: 23230 additions & 180 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.

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
*.iml
22
.gradle
33
/local.properties
4+
/keystore.properties
45
/.idea/caches
56
/.idea/libraries
67
/.idea/modules.xml
@@ -13,3 +14,4 @@
1314
.externalNativeBuild
1415
.cxx
1516
local.properties
17+
keystore.properties

.idea/deploymentTargetDropDown.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/discord.xml

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 14 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/migrations.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gemfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
source "https://rubygems.org"
2+
3+
gem "fastlane"

app/.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
/build
1+
/build
2+
app/src/main/res/values/app_secret_key.xml

app/build.gradle.kts

Lines changed: 72 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,111 @@
1+
import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
2+
import java.io.FileInputStream
3+
import java.util.Properties
4+
15
@Suppress("DSL_SCOPE_VIOLATION")
26
plugins {
37
alias(libs.plugins.moneymong.android.application)
48
alias(libs.plugins.moneymong.android.application.compose)
59
alias(libs.plugins.moneymong.android.application.flavors)
6-
// alias(libs.plugins.moneymong.android.hilt) hilt compiler was found error
10+
alias(libs.plugins.moneymong.android.application.firebase)
11+
alias(libs.plugins.moneymong.android.hilt)
12+
alias(libs.plugins.secretsGradlePlugin)
13+
714
}
815

916
android {
17+
signingConfigs {
18+
create("release") {
19+
storeFile =
20+
file(getKeyStore("storeFile"))
21+
storePassword = getKeyStore("storePassword")
22+
keyAlias = getKeyStore("keyAlias")
23+
keyPassword = getKeyStore("keyPassword")
24+
}
25+
}
1026
namespace = "com.moneymong.moneymong"
1127
compileSdk = 34
1228

1329
defaultConfig {
1430
applicationId = "com.moneymong.moneymong"
1531
minSdk = 24
1632
targetSdk = 34
17-
versionCode = 1
18-
versionName = "1.0"
33+
versionCode = 5
34+
versionName = "1.0.0"
1935

2036
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2137
vectorDrawables {
2238
useSupportLibrary = true
2339
}
40+
buildConfigField("String", "NATIVE_APP_KEY", getApiKey("native_app_key"))
41+
}
42+
buildFeatures{
43+
buildConfig = true
2444
}
2545

2646
buildTypes {
2747
release {
28-
isMinifyEnabled = false
48+
isMinifyEnabled = true
2949
proguardFiles(
3050
getDefaultProguardFile("proguard-android-optimize.txt"),
3151
"proguard-rules.pro"
3252
)
53+
signingConfig = signingConfigs.getByName("release")
3354
}
3455
}
35-
compileOptions {
36-
sourceCompatibility = JavaVersion.VERSION_17
37-
targetCompatibility = JavaVersion.VERSION_17
38-
}
39-
buildFeatures {
40-
compose = true
41-
buildConfig = true
42-
}
43-
composeOptions {
44-
kotlinCompilerExtensionVersion = "1.4.3"
45-
}
4656
packaging {
4757
resources {
4858
excludes += "/META-INF/{AL2.0,LGPL2.1}"
4959
}
5060
}
51-
52-
// flavorDimensions += "deploy"
53-
// productFlavors {
54-
// create("tb") {
55-
// dimension = "deploy"
56-
// applicationIdSuffix = ".tb"
57-
//
58-
// manifestPlaceholders["appLabel"] = "머니몽 TB"
59-
// buildConfigField("Boolean", "IS_TB", "true")
60-
// }
61-
// create("live") {
62-
// dimension = "deploy"
63-
// applicationIdSuffix = ".live"
64-
//
65-
// manifestPlaceholders["appLable"] = "머니몽"
66-
// buildConfigField("Boolean", "IS_TB", "false")
67-
// }
68-
// }
6961
}
7062

7163
dependencies {
64+
implementation(projects.core.ui)
65+
implementation(projects.core.designSystem)
66+
implementation(projects.core.common)
67+
implementation(projects.core.network)
68+
69+
implementation(projects.data)
70+
implementation(projects.domain)
71+
72+
implementation(projects.feature.sign)
73+
implementation(projects.feature.ledger)
74+
implementation(projects.feature.ledgerdetail)
75+
implementation(projects.feature.ledgermanual)
76+
implementation(projects.feature.ocr)
77+
implementation(projects.feature.ocrResult)
78+
implementation(projects.feature.ocrDetail)
79+
implementation(projects.feature.member)
80+
implementation(projects.feature.agency)
81+
implementation(projects.feature.home)
82+
implementation(projects.feature.mymong)
83+
84+
implementation(libs.androidx.activity.compose)
85+
implementation(libs.androidx.compose.material3)
86+
implementation(libs.orbit.core)
87+
implementation(libs.orbit.compose)
88+
implementation(libs.orbit.viewModel)
89+
90+
implementation(libs.kakao.v2.user)
91+
92+
testImplementation(libs.junit4)
93+
androidTestImplementation(libs.androidx.junit)
94+
androidTestImplementation(libs.androidx.test.espresso.core)
95+
}
96+
97+
fun keystoreProperties(projectRootDir : File) : Properties {
98+
val keystorePropertiesFile = rootProject.file("keystore.properties")
99+
val keystoreProperties = Properties()
100+
keystoreProperties.load(FileInputStream(keystorePropertiesFile))
101+
102+
return keystoreProperties
103+
}
104+
105+
fun getApiKey(propertyKey : String): String {
106+
return gradleLocalProperties(rootDir).getProperty(propertyKey)
107+
}
108+
109+
fun getKeyStore(keystoreKey : String): String {
110+
return keystoreProperties(rootDir).getProperty(keystoreKey)
72111
}

app/proguard-rules.pro

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,34 @@
1818

1919
# If you keep the line number information, uncomment this to
2020
# hide the original source file name.
21-
#-renamesourcefileattribute SourceFile
21+
#-renamesourcefileattribute SourceFile
22+
23+
-keep class com.kakao.sdk.**.model.* { <fields>; }
24+
-keep class * extends com.google.gson.TypeAdapter
25+
26+
# https://github.com/square/okhttp/pull/6792
27+
-dontwarn org.bouncycastle.jsse.**
28+
-dontwarn org.conscrypt.*
29+
-dontwarn org.openjsse.**
30+
31+
# --- Retrofit ---
32+
# With R8 full mode generic signatures are stripped for classes that are not
33+
# kept. Suspend functions are wrapped in continuations where the type argument
34+
# is used.
35+
-keep,allowobfuscation,allowshrinking interface retrofit2.Call
36+
-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
37+
38+
# Kotlin Result Wrapper 예외
39+
-keep class kotlin.Result { *; }
40+
41+
# R8 full mode strips generic signatures from return types if not kept.
42+
-if interface * { @retrofit2.http.* public *** *(...); }
43+
-keep,allowoptimization,allowshrinking,allowobfuscation class <3>
44+
45+
# With R8 full mode generic signatures are stripped for classes that are not kept.
46+
-keep,allowobfuscation,allowshrinking class retrofit2.Response
47+
48+
-keep class com.moneymong.moneymong.network.request.** { *; }
49+
-keep class com.moneymong.moneymong.network.response.** { *; }
50+
-keep class com.moneymong.moneymong.domain.entity.** { *; }
51+
-keep class com.moneymong.moneymong.domain.param.** { *; }

app/src/live/google-services.json

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"project_info": {
3+
"project_number": "1091533625653",
4+
"project_id": "moneymong-9e794",
5+
"storage_bucket": "moneymong-9e794.appspot.com"
6+
},
7+
"client": [
8+
{
9+
"client_info": {
10+
"mobilesdk_app_id": "1:1091533625653:android:f8c3edecf6f6108fad547c",
11+
"android_client_info": {
12+
"package_name": "com.moneymong.moneymong.live"
13+
}
14+
},
15+
"oauth_client": [],
16+
"api_key": [
17+
{
18+
"current_key": "AIzaSyAb9dOMs-B-u9YynEWdtV9nrq_VbMpAXtg"
19+
}
20+
],
21+
"services": {
22+
"appinvite_service": {
23+
"other_platform_oauth_client": []
24+
}
25+
}
26+
},
27+
{
28+
"client_info": {
29+
"mobilesdk_app_id": "1:1091533625653:android:435637da7f3d4352ad547c",
30+
"android_client_info": {
31+
"package_name": "com.moneymong.moneymong.tb"
32+
}
33+
},
34+
"oauth_client": [],
35+
"api_key": [
36+
{
37+
"current_key": "AIzaSyAb9dOMs-B-u9YynEWdtV9nrq_VbMpAXtg"
38+
}
39+
],
40+
"services": {
41+
"appinvite_service": {
42+
"other_platform_oauth_client": []
43+
}
44+
}
45+
}
46+
],
47+
"configuration_version": "1"
48+
}

0 commit comments

Comments
 (0)