[Release] v1.0.0 배포 코드

.github/workflows/dplay_ci.yml

@@ -41,8 +41,17 @@ jobs:
           echo "base.url=$BASE_URL" >> local.properties
           echo "kakao.app.key=$KAKAO_APP_KEY" >> local.properties
 
+      - name: Decode Keystore
+        run : |
+          echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 --decode > ./keystore.jks
+
       - name: Run Ktlint Check
         run: ./gradlew ktlintCheck
 
       - name: Build with Gradle
-        run: ./gradlew build
+        run: ./gradlew build
+        env:
+          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+          STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
+          STORE_FILE: ./keystore.jks

.gitignore

@@ -181,4 +181,7 @@ fabric.properties
 
 !/gradle/wrapper/gradle-wrapper.jar
 
-# End of https://www.toptal.com/developers/gitignore/api/android,androidstudio,kotlin
+# End of https://www.toptal.com/developers/gitignore/api/android,androidstudio,kotlin
+
+output-metadata.json
+app-release.dm

app/build.gradle.kts

@@ -24,10 +24,10 @@ val kakaoNativeKey: String =
         ?: throw GradleException("KAKAO_APP_KEY (or local kakao.app.key) is missing")
 
 android {
-    namespace = "com.dplay"
+    namespace = "com.diggingplay"
 
     defaultConfig {
-        applicationId = "com.dplay"
+        applicationId = "com.diggingplay"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

app/proguard-rules.pro

@@ -1,21 +1,3 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
+# 카카오 sdk 내부에 모델이 이름이 바뀌어 NoSuchFieldException 발생 방지
+-keep class com.kakao.sdk.auth.model.** { *; }
+-keep class com.kakao.sdk.common.model.** { *; }

app/src/androidTest/java/com/dplay/ExampleInstrumentedTest.kt → app/src/androidTest/java/com/diggingplay/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package com.dplay
+package com.diggingplay
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
@@ -17,6 +17,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.dplay", appContext.packageName)
+        assertEquals("com.diggingplay", appContext.packageName)
     }
 }

app/src/main/java/com/dplay/AppModule.kt → app/src/main/java/com/diggingplay/AppModule.kt

@@ -1,4 +1,4 @@
-package com.dplay
+package com.diggingplay
 
 import com.example.navigation.Navigator
 import com.example.navigation.Splash

app/src/main/java/com/dplay/DPlayApplication.kt → app/src/main/java/com/diggingplay/DPlayApplication.kt

@@ -1,10 +1,10 @@
-package com.dplay
+package com.diggingplay
 
 import android.app.Application
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
-import com.dplay.worker.DailyQuestionWorker
+import com.diggingplay.worker.DailyQuestionWorker
 import com.kakao.sdk.common.KakaoSdk
 import dagger.hilt.android.HiltAndroidApp
 import timber.log.Timber

app/src/main/java/com/dplay/worker/DailyQuestionWorker.kt → app/src/main/java/com/diggingplay/worker/DailyQuestionWorker.kt

@@ -1,4 +1,4 @@
-package com.dplay.worker
+package com.diggingplay.worker
 
 import android.app.NotificationChannel
 import android.app.NotificationManager
@@ -9,7 +9,7 @@ import android.os.Build
 import androidx.core.app.NotificationCompat
 import androidx.work.Worker
 import androidx.work.WorkerParameters
-import com.dplay.R
+import com.diggingplay.R
 import com.example.main.MainActivity
 
 class DailyQuestionWorker(
@@ -24,6 +24,8 @@ class DailyQuestionWorker(
     private fun showNotification() {
         val notificationManager =
             context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        val title = context.getString(R.string.notification_title)
+        val content = context.getString(R.string.notification_content)
 
         // 명시적으로 버전 관리
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -55,8 +57,8 @@ class DailyQuestionWorker(
             NotificationCompat
                 .Builder(context, CHANNEL_ID)
                 .setSmallIcon(R.mipmap.ic_launcher)
-                .setContentTitle(NOTIFICATION_CONTENT_TITLE)
-                .setContentText(NOTIFICATION_CONTENT_TEXT)
+                .setContentTitle(title)
+                .setContentText(content)
                 .setPriority(NotificationCompat.PRIORITY_DEFAULT)
                 .setContentIntent(pendingIntent)
                 .setAutoCancel(true)
@@ -70,8 +72,6 @@ class DailyQuestionWorker(
         const val CHANNEL_NAME = "Daily Question"
         const val CHANNEL_DESCRIPTION = "Daily Question Notification"
         const val NOTIFICATION_ID = 1001
-        const val NOTIFICATION_CONTENT_TITLE = "오늘의 질문이 도착했습니다!"
-        const val NOTIFICATION_CONTENT_TEXT = "지금 바로 확인해보세요."
         const val WORK_NAME = "daily_question_work"
         const val TAG = "DailyQuestionWorker"
     }

app/src/main/res/values/strings.xml

@@ -1,3 +1,5 @@
 <resources>
-    <string name="app_name">DPlay</string>
+    <string name="app_name">디플레이</string>
+    <string name="notification_title">디플레이</string>
+    <string name="notification_content">오늘의 질문이 도착했어요</string>
 </resources>

app/src/test/java/com/dplay/ExampleUnitTest.kt → app/src/test/java/com/diggingplay/ExampleUnitTest.kt

@@ -1,4 +1,4 @@
-package com.dplay
+package com.diggingplay
 
 import junit.framework.TestCase.assertEquals
 import org.junit.Test

build-logic/convention/src/main/java/com/example/convention/plugin/AndroidApplicationConventionPlugin.kt

@@ -10,6 +10,7 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
+import java.io.FileInputStream
 import java.util.Properties
 
 class AndroidApplicationConventionPlugin: Plugin<Project> {
@@ -21,6 +22,13 @@ class AndroidApplicationConventionPlugin: Plugin<Project> {
                     apply("org.jlleitschuh.gradle.ktlint")
                 }
 
+            val keystoreProperties = Properties()
+            val keystorePropertiesFile = rootProject.file("local.properties")
+            val isLocalPropertiesExists = keystorePropertiesFile.exists()
+            if (isLocalPropertiesExists) {
+                keystoreProperties.load(FileInputStream(keystorePropertiesFile))
+            }
+
             extensions.configure<ApplicationExtension> {
                 configureKotlinAndroid(this)
                 configureComposeAndroid(this)
@@ -31,8 +39,42 @@ class AndroidApplicationConventionPlugin: Plugin<Project> {
                     versionName = libs.getVersion("versionName").requiredVersion
                 }
 
-                dependencies{
-                    add("implementation",libs.getLibrary("timber"))
+                signingConfigs {
+                    create("release") {
+                        keyAlias = (keystoreProperties["keyAlias"] as? String)
+                            ?: System.getenv("KEY_ALIAS")
+
+                        keyPassword = (keystoreProperties["keyPassword"] as? String)
+                            ?: System.getenv("KEY_PASSWORD")
+
+                        storePassword = (keystoreProperties["storePassword"] as? String)
+                            ?: System.getenv("STORE_PASSWORD")
+
+                        val keyStoreFile = (keystoreProperties["storeFile"] as? String)
+                            ?: System.getenv("STORE_FILE")
+
+                        if (keyStoreFile != null) {
+                            storeFile = rootProject.file(keyStoreFile)
+                        }
+                    }
+                }
+
+                buildTypes {
+                    release {
+                        isMinifyEnabled = true
+                        isShrinkResources = true
+                        proguardFiles(
+                            getDefaultProguardFile("proguard-android-optimize.txt"),
+                            "proguard-rules.pro",
+                        )
+                        if (keystoreProperties.getProperty("storeFile") != null || System.getenv("STORE_FILE") != null) {
+                            signingConfig = signingConfigs.getByName("release")
+                        }
+                    }
+                }
+
+                dependencies {
+                    add("implementation", libs.getLibrary("timber"))
                 }
             }
         }

core/data/src/main/java/com/example/data/datasource/remote/AuthRemoteDataSource.kt

@@ -126,7 +126,7 @@ class AuthRemoteDataSource
 
         suspend fun reissue(refreshToken: String): TokenResponse {
             try {
-                val response = authService.reissue(refreshToken = refreshToken)
+                val response = authService.reissue(refreshToken = "Bearer $refreshToken")
                 return response.data ?: throw Exception("Data is null")
             } catch (e: Exception) {
                 throw e

core/data/src/main/java/com/example/data/datasource/remote/QuestionPostsPagingSource.kt

@@ -9,6 +9,7 @@ class QuestionPostsPagingSource(
     private val postService: PostService,
     private val questionId: Long,
     private val onTotalCountFetched: (Int) -> Unit,
+    private val onLockedFetched: (Boolean) -> Unit,
 ) : PagingSource<String, QuestionPostItemResponse>() {
     override fun getRefreshKey(state: PagingState<String, QuestionPostItemResponse>): String? = null
 
@@ -26,6 +27,7 @@ class QuestionPostsPagingSource(
             val data = response.data ?: throw Exception("data is null")
             if (params.key == null) {
                 onTotalCountFetched(data.totalCount)
+                onLockedFetched(data.locked)
             }
             val posts = data.items
             val nextCursor = data.nextCursor

core/data/src/main/java/com/example/data/mapper/todomain/TodayPosteResponseMapper.kt

@@ -3,7 +3,7 @@ package com.example.data.mapper.todomain
 import com.example.data.model.response.TodayPostItemResponse
 import com.example.data.model.response.TodayPostTrackResponse
 import com.example.data.model.response.TodayPostsResponse
-import com.example.domain.model.BADGE
+import com.example.domain.model.Badge
 import com.example.domain.model.DailyQuestion
 import com.example.domain.model.FeedItem
 import com.example.domain.model.HomeScreenData
@@ -28,7 +28,7 @@ fun TodayPostItemResponse.toDomain(): FeedItem =
         postId = postId,
         isScrapped = isScrapped,
         content = content,
-        badge = badge?.let { BADGE.valueOf(it) },
+        badge = badge?.let { Badge.valueOf(it) },
         track = track.toDomain(),
         writer = user.toDomain(),
         like = like.toDomain(),

core/data/src/main/java/com/example/data/mapper/todomain/UserResponseMapper.kt

@@ -8,4 +8,5 @@ fun UserResponse.toDomain(): Writer =
         userId = this.userId,
         nickname = this.nickname,
         profileImg = this.profileImg,
+        isAdmin = this.isAdmin,
     )

core/data/src/main/java/com/example/data/model/response/QuestionPostsResponse.kt

@@ -1,6 +1,6 @@
 package com.example.data.model.response
 
-import com.example.domain.model.BADGE
+import com.example.domain.model.Badge
 import com.example.domain.model.FeedItem
 import com.example.domain.model.Like
 import com.example.domain.model.Track
@@ -52,7 +52,7 @@ data class QuestionPostItemResponse(
             postId = postId,
             isScrapped = isScrapped,
             content = content,
-            badge = if (isEditorPick) BADGE.EDITOR else null,
+            badge = if (isEditorPick) Badge.EDITOR else null,
             track =
                 Track(
                     trackId = track.trackId,
@@ -66,6 +66,7 @@ data class QuestionPostItemResponse(
                     userId = user.userId,
                     nickname = user.nickname,
                     profileImg = user.profileImg.orEmpty(),
+                    isAdmin = user.isAdmin,
                 ),
             like =
                 Like(

core/data/src/main/java/com/example/data/model/response/UserResponse.kt

@@ -23,4 +23,6 @@ data class UserResponse(
     val nickname: String,
     @SerialName("profileImg")
     val profileImg: String?,
+    @SerialName("isAdmin")
+    val isAdmin: Boolean,
 )

core/data/src/main/java/com/example/data/repository/PostRepositoryImpl.kt

@@ -88,6 +88,7 @@ class PostRepositoryImpl
         override fun getPostsByQuestionId(
             questionId: Long,
             onTotalCountFetched: (Int) -> Unit,
+            onLockedFetched: (Boolean) -> Unit,
         ): Flow<PagingData<FeedItem>> =
             Pager(
                 config =
@@ -101,6 +102,7 @@ class PostRepositoryImpl
                         postService = postService,
                         questionId = questionId,
                         onTotalCountFetched = onTotalCountFetched,
+                        onLockedFetched = onLockedFetched,
                     )
                 },
             ).flow.map { pagingData ->