From 76ce2379193318a104fa58475c5cde68fa498d53 Mon Sep 17 00:00:00 2001 From: easyhooon Date: Thu, 15 Jan 2026 11:38:25 +0900 Subject: [PATCH 1/3] [BOOK-487] chore: targetSdk 35 -> 36 upgrade --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 03a0fc80..17cd48cf 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] ## App Configuration minSdk = "28" -targetSdk = "35" -compileSdk = "35" +targetSdk = "36" +compileSdk = "36" versionName = "1.3.0" versionCode = "9" packageName = "com.ninecraft.booket" From 4b8264e9101956738a2638c2cf7e4c6b3ad3d557 Mon Sep 17 00:00:00 2001 From: easyhooon Date: Thu, 15 Jan 2026 11:40:42 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[BOOK-487]=20refactor:=20circuit=20?= =?UTF-8?q?=EB=B2=84=EC=A0=84=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20?= =?UTF-8?q?=EB=B0=8F=20=EB=B3=80=EA=B2=BD=20=EC=82=AC=ED=95=AD=20=EB=B0=98?= =?UTF-8?q?=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - circuit 라이브러리내에 kotlinx.collections.immutable 라이브러리가 제외되어 featureConventionPlugin내에 immutable 라이브러리 의존성 추가 - navigation stateOptions 방식 적용 --- build-logic/src/main/kotlin/AndroidFeatureConventionPlugin.kt | 1 + .../kotlin/com/ninecraft/booket/feature/home/HomePresenter.kt | 3 +-- .../com/ninecraft/booket/feature/library/LibraryPresenter.kt | 3 +-- gradle/libs.versions.toml | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build-logic/src/main/kotlin/AndroidFeatureConventionPlugin.kt b/build-logic/src/main/kotlin/AndroidFeatureConventionPlugin.kt index 057742e8..6124b57a 100644 --- a/build-logic/src/main/kotlin/AndroidFeatureConventionPlugin.kt +++ b/build-logic/src/main/kotlin/AndroidFeatureConventionPlugin.kt @@ -33,6 +33,7 @@ internal class AndroidFeatureConventionPlugin : Plugin { implementation(project(path = ":core:ui")) implementation(project(path = ":feature:screens")) + implementation(libs.kotlinx.collections.immutable) implementation(libs.compose.effects) implementation(libs.bundles.circuit) diff --git a/feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/HomePresenter.kt b/feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/HomePresenter.kt index 9b65a95f..e014821f 100644 --- a/feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/HomePresenter.kt +++ b/feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/HomePresenter.kt @@ -115,8 +115,7 @@ class HomePresenter( is HomeUiEvent.OnTabSelected -> { navigator.resetRoot( newRoot = event.tab.screen, - saveState = true, - restoreState = true, + options = Navigator.StateOptions.SaveAndRestore, ) } diff --git a/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryPresenter.kt b/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryPresenter.kt index 54aebc08..70e73458 100644 --- a/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryPresenter.kt +++ b/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryPresenter.kt @@ -184,8 +184,7 @@ class LibraryPresenter( is LibraryUiEvent.OnTabSelected -> { navigator.resetRoot( newRoot = event.tab.screen, - saveState = true, - restoreState = true, + options = Navigator.StateOptions.SaveAndRestore, ) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 17cd48cf..64a7e4e7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -43,7 +43,7 @@ okhttp = "5.3.2" retrofit = "3.0.0" ## Circuit -circuit = "0.30.0" +circuit = "0.31.0" ## Logging logger = "2.2.0" From 1dd8263e308ccea549771e5bf3f137b2b49e5ecf Mon Sep 17 00:00:00 2001 From: easyhooon Date: Thu, 15 Jan 2026 14:52:34 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[BOOK-487]=20chore:=20=EB=9D=BC=EC=9D=B4?= =?UTF-8?q?=EB=B8=8C=EB=9F=AC=EB=A6=AC=20=EB=B2=84=EC=A0=84=20=EC=B5=9C?= =?UTF-8?q?=EC=8B=A0=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle/libs.versions.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 64a7e4e7..4c0c9cd9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,18 +8,18 @@ versionCode = "9" packageName = "com.ninecraft.booket" ## Android gradle plugin -android-gradle-plugin = "8.12.0" +android-gradle-plugin = "8.12.3" ## AndroidX -androidx-core = "1.16.0" -androidx-activity-compose = "1.10.1" +androidx-core = "1.17.0" +androidx-activity-compose = "1.12.2" androidx-startup = "1.2.0" androidx-splash = "1.2.0" androidx-datastore = "1.2.0" androidx-camera = "1.5.2" ## Compose -androidx-compose-bom = "2025.12.01" +androidx-compose-bom = "2026.01.00" androidx-compose-material3 = "1.4.0" compose-stable-marker = "1.0.7" compose-effects = "0.1.4" @@ -43,17 +43,17 @@ okhttp = "5.3.2" retrofit = "3.0.0" ## Circuit -circuit = "0.31.0" +circuit = "0.32.0" ## Logging logger = "2.2.0" ## Kakao Login -kakao-core = "2.22.0" +kakao-core = "2.23.2" ## Image Load coil-compose = "2.7.0" -landscapist = "2.5.1" +landscapist = "2.8.2" ## Lottie lottie = "6.7.1"