[FIX] #41 - Solve Merge Conflict

- app/proguard-rules.pro 내용 합치기 - setting.gradle에서 include 내용 동기화
SW-Marastro · Jul 17, 2024 · 9b980fd · 9b980fd
1 parent 6e9f8da
commit 9b980fd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -31,4 +31,14 @@
 -dontwarn com.swmarastro.mykkumi.data.di.NetworkModule_ProvideRequestHttpLoggingInterceptorFactory
 -dontwarn com.swmarastro.mykkumi.data.di.NetworkModule_ProvideRetrofitFactory
 -dontwarn com.swmarastro.mykkumi.data.repository.BannerRepositoryImpl
--dontwarn com.swmarastro.mykkumi.data.repository.PostRepositoryImpl
+-dontwarn com.swmarastro.mykkumi.data.repository.PostRepositoryImpl
+
+
+# 카카오 로그인을 위한 카카오 SDK를 코드 축소, 난독화, 최적화에서 제외
+-keep class com.kakao.sdk.**.model.* { <fields>; }
+-keep class * extends com.google.gson.TypeAdapter
+
+# https://github.com/square/okhttp/pull/6792
+-dontwarn org.bouncycastle.jsse.**
+-dontwarn org.conscrypt.*
+-dontwarn org.openjsse.**
diff --git a/settings.gradle b/settings.gradle
@@ -22,4 +22,4 @@ include ':feature:home'
 include ':feature:around'
 include ':feature:shopping'
 include ':feature:mypage'
-//include ':feature:auth'
+include ':feature:auth'