Skip to content

Commit 0dec15a

Browse files
authored
Merge pull request #113 from YAPP-Github/develop
[Release] v1.0.7
2 parents 5f1bd8b + a9a8433 commit 0dec15a

File tree

62 files changed

+635
-608
lines changed

Some content is hidden

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

62 files changed

+635
-608
lines changed

.github/workflows/android_cd.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,12 @@ jobs:
7474
name: app-release.aab
7575
path: app/build/outputs/bundle/release/app-release.aab
7676

77+
- name: Upload ProGuard Mapping
78+
uses: actions/upload-artifact@v4
79+
with:
80+
name: mapping
81+
path: app/build/outputs/mapping/release/mapping.txt
82+
7783
- name: Install Firebase CLI
7884
run: curl -sL firebase.tools | bash
7985

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ keystore.properties
1212
/.kotlin/
1313
/app/upload-keystore.jks
1414
/keystore.properties
15-
*/.DS_Store
15+
*/.DS_Store
16+
obfuscated-stacktrace.txt

AiLoading

Whitespace-only changes.

app/build.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ android {
1212
namespace = "com.puzzle.piece"
1313

1414
defaultConfig {
15-
versionCode = 7
16-
versionName = "1.0.6"
15+
versionCode = 8
16+
versionName = "1.0.7"
1717
targetSdk = 35
1818

1919
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -47,6 +47,8 @@ android {
4747
debug { manifestPlaceholders["appName"] = "@string/app_name_debug" }
4848
release {
4949
signingConfig = signingConfigs.getByName("release")
50+
isMinifyEnabled = true
51+
isShrinkResources = true
5052
manifestPlaceholders["appName"] = "@string/app_name"
5153
}
5254
}

app/proguard-rules.pro

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
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.
4-
#
5-
# For more details, see
6-
# http://developer.android.com/guide/developing/tools/proguard.html
1+
-keepattributes SourceFile,LineNumberTable
2+
-keepattributes Signature, InnerClasses, EnclosingMethod, KotlinMetadata
3+
-keepattributes AnnotationDefault, *Annotation*
74

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-
#}
5+
-keepclassmembers class android.content.Intent {
6+
public java.lang.String getStringExtra(java.lang.String);
7+
}
148

15-
# Uncomment this to preserve the line number information for
16-
# debugging stack traces.
17-
#-keepattributes SourceFile,LineNumberTable
9+
## 파이어베이스
10+
-keep class com.google.android.gms.** { *; }
11+
-keep class com.google.firebase.** { *; }
1812

19-
# If you keep the line number information, uncomment this to
20-
# hide the original source file name.
21-
#-renamesourcefileattribute SourceFile
13+
## 카카오
14+
-keep class com.kakao.sdk.**.model.* { <fields>; }
15+
16+
## DTO를 이용해서 Enum 매핑되는 클래스 난독화 방지
17+
-keep enum com.puzzle.domain.model.auth.OAuthProvider { *; }
18+
-keep enum com.puzzle.domain.model.error.HttpResponseStatus { *; }
19+
-keep enum com.puzzle.domain.model.match.MatchStatus { *; }
20+
-keep enum com.puzzle.domain.model.notification.NotificationType { *; }
21+
-keep enum com.puzzle.domain.model.profile.ContactType { *; }
22+
-keep enum com.puzzle.domain.model.user.ProfileStatus { *; }
23+
-keep enum com.puzzle.domain.model.user.UserRole { *; }
24+
-keep class com.puzzle.domain.model.profile.MyProfileBasic { *; }
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<resources>
2-
<string name="app_name">Piece</string>
3-
<string name="app_name_debug">Piece_Debug</string>
2+
<string name="app_name">피스</string>
3+
<string name="app_name_debug">피스_개발</string>
44
</resources>

build-logic/src/main/java/com/puzzle/build/logic/KotlinAndroid.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ internal fun Project.configureKotlinAndroid() {
2323
isMinifyEnabled = false
2424
proguardFiles(
2525
getDefaultProguardFile("proguard-android-optimize.txt"),
26-
"proguard-rules.pro"
26+
"proguard-rules.pro",
2727
)
2828
}
2929
}

coderabbit.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
language: "ko-KR"
2+
early_access: false
3+
reviews:
4+
profile: "chill"
5+
request_changes_workflow: false
6+
high_level_summary: true
7+
poem: false
8+
review_status: true
9+
collapse_walkthrough: false
10+
auto_review:
11+
enabled: true
12+
drafts: false
13+
chat:
14+
auto_reply: true

core/analytics/proguard-rules.pro

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +0,0 @@
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.
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

core/common-ui/proguard-rules.pro

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +0,0 @@
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.
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

0 commit comments

Comments
 (0)