[FIX] #7 - ci cd test

SW-Marastro · Jul 8, 2024 · f17c0a4 · f17c0a4
1 parent d98c335
commit f17c0a4
Show file tree

Hide file tree

Showing 11 changed files with 106 additions and 21 deletions.
diff --git a/.github/workflows/android_ci_cd.yml b/.github/workflows/android_ci_cd.yml
@@ -64,7 +64,7 @@ jobs:
 
     # Build APK Release
     - name: Build Release Apk
-      run: ./gradlew assembleRelease --stacktrace --warning-mode=all
+      run: ./gradlew assembleRelease --warning-mode=all --stacktrace
 
     - name: APK 디렉토리 확인 (디버깅용) / Release
       run: ls -alh app/build/outputs/apk/release/

diff --git a/app/build.gradle b/app/build.gradle
@@ -73,7 +73,9 @@ dependencies {
 
     // domain
     implementation project(path: ":core:domain")
-
+
+    implementation project(path: ":core:common-ui")
+
     // UI - Navigation
     implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
     implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -18,4 +18,17 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+-dontwarn com.swmarastro.mykkumi.common_ui.base.BaseFragment
+-dontwarn com.swmarastro.mykkumi.common_ui.databinding.ItemListLoadingBinding
+-dontwarn com.swmarastro.mykkumi.common_ui.databinding.ItemPostWriterBinding
+-dontwarn com.swmarastro.mykkumi.common_ui.post.PostImageIndicator
+-dontwarn com.swmarastro.mykkumi.data.datasource.BannerDataSource
+-dontwarn com.swmarastro.mykkumi.data.datasource.PostDataSource
+-dontwarn com.swmarastro.mykkumi.data.di.NetworkModule_ProvideBannerDataSourceFactory
+-dontwarn com.swmarastro.mykkumi.data.di.NetworkModule_ProvideOkHttpClientFactory
+-dontwarn com.swmarastro.mykkumi.data.di.NetworkModule_ProvidePostDataSourceFactory
+-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
diff --git a/build.gradle b/build.gradle
@@ -28,7 +28,7 @@ buildscript {
         espresso_core_version = "3.5.1"
 
         // Dependency Injection
-        hilt_version = "2.48.1"
+        hilt_version = "2.46.1"
 
         // Network
         retrofit_version = "2.9.0"
@@ -39,8 +39,8 @@ buildscript {
         coroutines_version = "1.3.9"
 
         // lifecycle
-        lifecycle_viewmodel_version = "2.5.1"
-        lifecycle_runtime_version = "2.5.1"
+        //lifecycle_viewmodel_version = "2.5.1"
+        //lifecycle_runtime_version = "2.5.1"
 
         // activity
         activity_version = "1.6.1"

diff --git a/core/common-ui/proguard-rules.pro b/core/common-ui/proguard-rules.pro
@@ -18,4 +18,9 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+-dontwarn com.swmarastro.mykkumi.common_ui.post.PostImagesAdapter
+-dontwarn com.swmarastro.mykkumi.common_ui.base.BaseFragment
+-dontwarn com.swmarastro.mykkumi.common_ui.databinding.ItemListLoadingBinding
+-dontwarn com.swmarastro.mykkumi.common_ui.databinding.ItemPostWriterBinding
+-dontwarn com.swmarastro.mykkumi.common_ui.post.PostImageIndicator
diff --git a/core/common-ui/src/main/java/com/swmarastro/mykkumi/common_ui/base/BaseFragment.kt b/core/common-ui/src/main/java/com/swmarastro/mykkumi/common_ui/base/BaseFragment.kt
@@ -8,10 +8,7 @@ import androidx.annotation.LayoutRes
 import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import kotlinx.coroutines.launch
 
 abstract class BaseFragment<T: ViewDataBinding>(
     @LayoutRes private val layoutId: Int
@@ -30,15 +27,15 @@ abstract class BaseFragment<T: ViewDataBinding>(
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         binding.lifecycleOwner = this@BaseFragment
-        /*lifecycleScope.launchWhenCreated {
+        lifecycleScope.launchWhenCreated {
             initView()
-        }*/
-
-        lifecycleScope.launch {
-            lifecycle.repeatOnLifecycle(Lifecycle.State.CREATED) {
-                initView()
-            }
         }
+
+//        lifecycleScope.launch {
+//            lifecycle.repeatOnLifecycle(Lifecycle.State.CREATED) {
+//                initView()
+//            }
+//        }
         super.onViewCreated(view, savedInstanceState)
     }
 

diff --git a/feature/around/proguard-rules.pro b/feature/around/proguard-rules.pro
@@ -18,4 +18,17 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+-dontwarn java.lang.invoke.StringConcatFactory
+-dontwarn com.swmarastro.mykkumi.common_ui.post.PostImagesAdapter
+-dontwarn com.swmarastro.mykkumi.common_ui.base.BaseFragment
+-dontwarn com.swmarastro.mykkumi.common_ui.databinding.ItemListLoadingBinding
+-dontwarn com.swmarastro.mykkumi.common_ui.databinding.ItemPostWriterBinding
+-dontwarn com.swmarastro.mykkumi.common_ui.post.PostImageIndicator
+
+# 공통 모듈의 클래스 유지
+-keep class com.swmarastro.mykkumi.common.** { *; }
+
+# 기타 ProGuard 설정
+-keep class !a.a, * { *; }
+-dontwarn a.a
diff --git a/feature/home/proguard-rules.pro b/feature/home/proguard-rules.pro
@@ -19,6 +19,34 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+#-dontwarn com.swmarastro.mykkumi.common_ui.databinding.ItemListLoadingBinding
+#-dontwarn com.swmarastro.mykkumi.common_ui.databinding.ItemPostWriterBinding
+#-dontwarn com.swmarastro.mykkumi.common_ui.post.PostImageIndicator
+
+# 공통 모듈의 클래스 유지
+-keep class com.swmarastro.mykkumi.common.** { *; }
+
+# 기타 ProGuard 설정
+-keep class !a.a, * { *; }
+-dontwarn a.a
+
+#-dontwarn com.swmarastro.mykkumi.common_ui.base.BaseFragment
+#-dontwarn com.swmarastro.mykkumi.common_ui.databinding.ItemListLoadingBinding
+#-dontwarn com.swmarastro.mykkumi.common_ui.databinding.ItemPostWriterBinding
+#-dontwarn com.swmarastro.mykkumi.common_ui.post.PostImageIndicator
+#-dontwarn com.swmarastro.mykkumi.data.datasource.BannerDataSource
+#-dontwarn com.swmarastro.mykkumi.data.datasource.PostDataSource
+#-dontwarn com.swmarastro.mykkumi.data.di.NetworkModule_ProvideBannerDataSourceFactory
+#-dontwarn com.swmarastro.mykkumi.data.di.NetworkModule_ProvideOkHttpClientFactory
+#-dontwarn com.swmarastro.mykkumi.data.di.NetworkModule_ProvidePostDataSourceFactory
+#-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 java.lang.invoke.StringConcatFactory
+-dontwarn com.swmarastro.mykkumi.common_ui.post.PostImagesAdapter
+-dontwarn com.swmarastro.mykkumi.common_ui.base.BaseFragment
 -dontwarn com.swmarastro.mykkumi.common_ui.databinding.ItemListLoadingBinding
 -dontwarn com.swmarastro.mykkumi.common_ui.databinding.ItemPostWriterBinding
 -dontwarn com.swmarastro.mykkumi.common_ui.post.PostImageIndicator
diff --git a/feature/mypage/proguard-rules.pro b/feature/mypage/proguard-rules.pro
@@ -18,4 +18,17 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+-dontwarn java.lang.invoke.StringConcatFactory
+-dontwarn com.swmarastro.mykkumi.common_ui.post.PostImagesAdapter
+-dontwarn com.swmarastro.mykkumi.common_ui.base.BaseFragment
+-dontwarn com.swmarastro.mykkumi.common_ui.databinding.ItemListLoadingBinding
+-dontwarn com.swmarastro.mykkumi.common_ui.databinding.ItemPostWriterBinding
+-dontwarn com.swmarastro.mykkumi.common_ui.post.PostImageIndicator
+
+# 공통 모듈의 클래스 유지
+-keep class com.swmarastro.mykkumi.common.** { *; }
+
+# 기타 ProGuard 설정
+-keep class !a.a, * { *; }
+-dontwarn a.a
diff --git a/feature/shopping/proguard-rules.pro b/feature/shopping/proguard-rules.pro
@@ -18,4 +18,17 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+-dontwarn java.lang.invoke.StringConcatFactory
+-dontwarn com.swmarastro.mykkumi.common_ui.post.PostImagesAdapter
+-dontwarn com.swmarastro.mykkumi.common_ui.base.BaseFragment
+-dontwarn com.swmarastro.mykkumi.common_ui.databinding.ItemListLoadingBinding
+-dontwarn com.swmarastro.mykkumi.common_ui.databinding.ItemPostWriterBinding
+-dontwarn com.swmarastro.mykkumi.common_ui.post.PostImageIndicator
+
+# 공통 모듈의 클래스 유지
+-keep class com.swmarastro.mykkumi.common.** { *; }
+
+# 기타 ProGuard 설정
+-keep class !a.a, * { *; }
+-dontwarn a.a
diff --git a/settings.gradle b/settings.gradle
@@ -21,4 +21,5 @@ include ':core:common-ui'
 include ':feature:home'
 include ':feature:around'
 include ':feature:shopping'
-include ':feature:mypage'
+include ':feature:mypage'
+include ':feature:auth'