From 2173bd89425b8d8b55cc91c21f8f2d6b86058d91 Mon Sep 17 00:00:00 2001 From: plgafhd Date: Sun, 29 Sep 2024 18:36:38 +0900 Subject: [PATCH 01/14] release snutt 3.7.5-rc.1 --- version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.properties b/version.properties index 2fc17866f..c272d7c5b 100644 --- a/version.properties +++ b/version.properties @@ -1 +1 @@ -snuttVersionName=3.7.3 +snuttVersionName=3.7.5-rc.1 From aa23c1cfcb92f410c855506fc1c70c1329b023d1 Mon Sep 17 00:00:00 2001 From: eastshine2741 Date: Mon, 30 Sep 2024 00:26:24 +0900 Subject: [PATCH 02/14] =?UTF-8?q?ImportantNotice=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/wafflestudio/snutt2/model/ImportantNotice.kt | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 app/src/main/java/com/wafflestudio/snutt2/model/ImportantNotice.kt diff --git a/app/src/main/java/com/wafflestudio/snutt2/model/ImportantNotice.kt b/app/src/main/java/com/wafflestudio/snutt2/model/ImportantNotice.kt deleted file mode 100644 index c141426ff..000000000 --- a/app/src/main/java/com/wafflestudio/snutt2/model/ImportantNotice.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.wafflestudio.snutt2.model - -data class ImportantNotice( - val title: String?, - val content: String?, -) From fba9cc6280818f907a15166aea5ad0a50bc5906d Mon Sep 17 00:00:00 2001 From: eastshine2741 Date: Mon, 30 Sep 2024 01:03:44 +0900 Subject: [PATCH 03/14] =?UTF-8?q?access=20token=20=EC=9C=A0=EB=AC=B4?= =?UTF-8?q?=EC=97=90=20=EB=AC=B4=EA=B4=80=ED=95=98=EA=B2=8C=20GET=20/v1/co?= =?UTF-8?q?nfigs=20=ED=98=B8=EC=B6=9C=ED=95=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/wafflestudio/snutt2/RemoteConfig.kt | 31 +++++++++---------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/wafflestudio/snutt2/RemoteConfig.kt b/app/src/main/java/com/wafflestudio/snutt2/RemoteConfig.kt index 3982a2dbb..12bf4a4bc 100644 --- a/app/src/main/java/com/wafflestudio/snutt2/RemoteConfig.kt +++ b/app/src/main/java/com/wafflestudio/snutt2/RemoteConfig.kt @@ -2,7 +2,6 @@ package com.wafflestudio.snutt2 import com.wafflestudio.snutt2.core.network.NetworkConnectivityManager import com.wafflestudio.snutt2.core.network.SNUTTNetworkDataSource -import com.wafflestudio.snutt2.data.user.UserRepository import com.wafflestudio.snutt2.lib.network.dto.core.RemoteConfigDto import com.wafflestudio.snutt2.lib.network.dto.core.toExternalModel import kotlinx.coroutines.CoroutineScope @@ -10,7 +9,6 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.collect -import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.map @@ -22,29 +20,28 @@ import javax.inject.Singleton @Singleton class RemoteConfig @Inject constructor( api: SNUTTNetworkDataSource, - userRepository: UserRepository, networkConnectivityManager: NetworkConnectivityManager, ) { private val config = MutableStateFlow(RemoteConfigDto()) init { CoroutineScope(Dispatchers.Main).launch { - combine( - userRepository.accessToken.filter { it.isNotEmpty() }, - networkConnectivityManager.networkConnectivity.filter { it }, - ) { _, _ -> - withContext(Dispatchers.IO) { - runCatching { - api._getRemoteConfig() - }.onSuccess { - config.emit(it.toExternalModel()) - }.onFailure { - // NOTE: 서버 장애나 네트워크 오프라인 등의 이유로 config를 받아오지 못한 경우 지도를 숨긴다. - // https://wafflestudio.slack.com/archives/C0PAVPS5T/p1706504661308259?thread_ts=1706451688.745159&cid=C0PAVPS5T - config.emit(RemoteConfigDto(disableMapFeature = true)) + networkConnectivityManager.networkConnectivity + .filter { it } + .map { + withContext(Dispatchers.IO) { + runCatching { + api._getRemoteConfig() + }.onSuccess { + config.emit(it.toExternalModel()) + }.onFailure { + // NOTE: 서버 장애나 네트워크 오프라인 등의 이유로 config를 받아오지 못한 경우 지도를 숨긴다. + // https://wafflestudio.slack.com/archives/C0PAVPS5T/p1706504661308259?thread_ts=1706451688.745159&cid=C0PAVPS5T + config.emit(RemoteConfigDto(disableMapFeature = true)) + } } } - }.collect() + .collect() } } From f24a563f2701f97b135a4d31fbc7586d1d0581b0 Mon Sep 17 00:00:00 2001 From: eastshine2741 Date: Mon, 30 Sep 2024 01:04:05 +0900 Subject: [PATCH 04/14] release SNUTT 3.7.5-rc.2 --- version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.properties b/version.properties index c272d7c5b..17da6667c 100644 --- a/version.properties +++ b/version.properties @@ -1 +1 @@ -snuttVersionName=3.7.5-rc.1 +snuttVersionName=3.7.5-rc.2 From 2df035acf56c918a71f22161fd2b15cf6df38c2a Mon Sep 17 00:00:00 2001 From: eastshine2741 Date: Mon, 30 Sep 2024 01:35:55 +0900 Subject: [PATCH 05/14] =?UTF-8?q?visible=20=3D=20true=20=ED=95=98=EB=93=9C?= =?UTF-8?q?=EC=BD=94=EB=94=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/wafflestudio/snutt2/RemoteConfig.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/wafflestudio/snutt2/RemoteConfig.kt b/app/src/main/java/com/wafflestudio/snutt2/RemoteConfig.kt index 12bf4a4bc..8d9e47000 100644 --- a/app/src/main/java/com/wafflestudio/snutt2/RemoteConfig.kt +++ b/app/src/main/java/com/wafflestudio/snutt2/RemoteConfig.kt @@ -33,7 +33,8 @@ class RemoteConfig @Inject constructor( runCatching { api._getRemoteConfig() }.onSuccess { - config.emit(it.toExternalModel()) + val a = it.copy(noticeConfig = it.noticeConfig?.copy(visible = true) ?: com.wafflestudio.snutt2.core.network.model.RemoteConfigDto.NoticeConfig(visible = true)) + config.emit(a.toExternalModel()) }.onFailure { // NOTE: 서버 장애나 네트워크 오프라인 등의 이유로 config를 받아오지 못한 경우 지도를 숨긴다. // https://wafflestudio.slack.com/archives/C0PAVPS5T/p1706504661308259?thread_ts=1706451688.745159&cid=C0PAVPS5T From 58ceb28f065d4e0ad12e6cc5068aae3a57a9c760 Mon Sep 17 00:00:00 2001 From: eastshine2741 Date: Mon, 30 Sep 2024 01:36:13 +0900 Subject: [PATCH 06/14] release SNUTT 3.7.5-rc.3 --- version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.properties b/version.properties index 17da6667c..03fa11801 100644 --- a/version.properties +++ b/version.properties @@ -1 +1 @@ -snuttVersionName=3.7.5-rc.2 +snuttVersionName=3.7.5-rc.3 From 6d01d9d94c8eacfed0a0ad2bb6216274bdcbb982 Mon Sep 17 00:00:00 2001 From: eastshine2741 Date: Mon, 30 Sep 2024 01:51:31 +0900 Subject: [PATCH 07/14] =?UTF-8?q?core:network=EC=97=90=20proguard=20-keep?= =?UTF-8?q?=20rule=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/proguard-rules.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index be42a8e56..52ce6abc1 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -6,6 +6,7 @@ -keep public enum com.wafflestudio.snutt2.** { *; } -keep class com.wafflestudio.snutt2.lib.** { *; } -keep class com.wafflestudio.snutt2.model.** { *; } +-keep class com.wafflestudio.snutt2.core.network.** { *; } # https://github.com/square/retrofit/issues/3751#issuecomment-1192043644 # Keep generic signature of Call, Response (R8 full mode strips signatures from non-kept items). From d04d8813d15b5c47c52bfc33d123b4887587e36d Mon Sep 17 00:00:00 2001 From: eastshine2741 Date: Mon, 30 Sep 2024 01:51:56 +0900 Subject: [PATCH 08/14] release SNUTT 3.7.5-rc.4 --- version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.properties b/version.properties index 03fa11801..52b271f9b 100644 --- a/version.properties +++ b/version.properties @@ -1 +1 @@ -snuttVersionName=3.7.5-rc.3 +snuttVersionName=3.7.5-rc.4 From 1b8c05142529493119d5a0fe93b3144d2dcb5903 Mon Sep 17 00:00:00 2001 From: eastshine2741 Date: Mon, 30 Sep 2024 02:05:54 +0900 Subject: [PATCH 09/14] =?UTF-8?q?visible=20=3D=20true=20=ED=95=98=EB=93=9C?= =?UTF-8?q?=EC=BD=94=EB=94=A9=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/wafflestudio/snutt2/RemoteConfig.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/com/wafflestudio/snutt2/RemoteConfig.kt b/app/src/main/java/com/wafflestudio/snutt2/RemoteConfig.kt index 8d9e47000..12bf4a4bc 100644 --- a/app/src/main/java/com/wafflestudio/snutt2/RemoteConfig.kt +++ b/app/src/main/java/com/wafflestudio/snutt2/RemoteConfig.kt @@ -33,8 +33,7 @@ class RemoteConfig @Inject constructor( runCatching { api._getRemoteConfig() }.onSuccess { - val a = it.copy(noticeConfig = it.noticeConfig?.copy(visible = true) ?: com.wafflestudio.snutt2.core.network.model.RemoteConfigDto.NoticeConfig(visible = true)) - config.emit(a.toExternalModel()) + config.emit(it.toExternalModel()) }.onFailure { // NOTE: 서버 장애나 네트워크 오프라인 등의 이유로 config를 받아오지 못한 경우 지도를 숨긴다. // https://wafflestudio.slack.com/archives/C0PAVPS5T/p1706504661308259?thread_ts=1706451688.745159&cid=C0PAVPS5T From 5269c546955f48a32ebb512e55532eab924deb76 Mon Sep 17 00:00:00 2001 From: eastshine2741 Date: Mon, 30 Sep 2024 02:06:09 +0900 Subject: [PATCH 10/14] release SNUTT 3.7.5-rc.5 --- version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.properties b/version.properties index 52b271f9b..f3ac7a72c 100644 --- a/version.properties +++ b/version.properties @@ -1 +1 @@ -snuttVersionName=3.7.5-rc.4 +snuttVersionName=3.7.5-rc.5 From 2de294d53156b7910206c407092228ef7ed29bbf Mon Sep 17 00:00:00 2001 From: eastshine2741 Date: Mon, 30 Sep 2024 02:19:32 +0900 Subject: [PATCH 11/14] release SNUTT 3.7.5 --- version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.properties b/version.properties index f3ac7a72c..fb7f44abc 100644 --- a/version.properties +++ b/version.properties @@ -1 +1 @@ -snuttVersionName=3.7.5-rc.5 +snuttVersionName=3.7.5 From a243026e2e469d642826985a9346f6627b9cfd1a Mon Sep 17 00:00:00 2001 From: eastshine2741 Date: Mon, 30 Sep 2024 02:41:04 +0900 Subject: [PATCH 12/14] =?UTF-8?q?AndroidApplicationConventionPlugin?= =?UTF-8?q?=EC=97=90=EC=84=9C=20targetSdk=20=3D=2034=EB=A1=9C=20=EC=98=AC?= =?UTF-8?q?=EB=A6=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/kotlin/AndroidApplicationConventionPlugin.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt index 694be19dc..c47b74cdd 100644 --- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt @@ -14,7 +14,7 @@ class AndroidApplicationConventionPlugin : Plugin { extensions.configure { configureKotlinAndroid(this) - defaultConfig.targetSdk = 33 + defaultConfig.targetSdk = 34 } } } From 6929fad250ba9b74b6a0ee5833ac4090661f4ab5 Mon Sep 17 00:00:00 2001 From: eastshine2741 Date: Mon, 30 Sep 2024 02:41:30 +0900 Subject: [PATCH 13/14] release SNUTT 3.7.5-rc.6 --- version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.properties b/version.properties index fb7f44abc..a00270dca 100644 --- a/version.properties +++ b/version.properties @@ -1 +1 @@ -snuttVersionName=3.7.5 +snuttVersionName=3.7.5-rc.6 From ba9f28ad5f49821e8418ca7008f122f1132a0278 Mon Sep 17 00:00:00 2001 From: eastshine2741 Date: Mon, 30 Sep 2024 02:43:27 +0900 Subject: [PATCH 14/14] release SNUTT 3.7.5 --- version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.properties b/version.properties index a00270dca..fb7f44abc 100644 --- a/version.properties +++ b/version.properties @@ -1 +1 @@ -snuttVersionName=3.7.5-rc.6 +snuttVersionName=3.7.5