Skip to content

Commit c70b2e3

Browse files
authored
Merge pull request #252 from YAPP-Github/BOOK-487-chore/#248
chore: Android Target SDK 36 대응
2 parents 56e75fd + f234163 commit c70b2e3

4 files changed

Lines changed: 12 additions & 13 deletions

File tree

build-logic/src/main/kotlin/AndroidFeatureConventionPlugin.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ internal class AndroidFeatureConventionPlugin : Plugin<Project> {
3333
implementation(project(path = ":core:ui"))
3434
implementation(project(path = ":feature:screens"))
3535

36+
implementation(libs.kotlinx.collections.immutable)
3637
implementation(libs.compose.effects)
3738

3839
implementation(libs.bundles.circuit)

feature/home/src/main/kotlin/com/ninecraft/booket/feature/home/HomePresenter.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,7 @@ class HomePresenter(
115115
is HomeUiEvent.OnTabSelected -> {
116116
navigator.resetRoot(
117117
newRoot = event.tab.screen,
118-
saveState = true,
119-
restoreState = true,
118+
options = Navigator.StateOptions.SaveAndRestore,
120119
)
121120
}
122121

feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryPresenter.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,7 @@ class LibraryPresenter(
184184
is LibraryUiEvent.OnTabSelected -> {
185185
navigator.resetRoot(
186186
newRoot = event.tab.screen,
187-
saveState = true,
188-
restoreState = true,
187+
options = Navigator.StateOptions.SaveAndRestore,
189188
)
190189
}
191190

gradle/libs.versions.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
[versions]
22
## App Configuration
33
minSdk = "28"
4-
targetSdk = "35"
5-
compileSdk = "35"
4+
targetSdk = "36"
5+
compileSdk = "36"
66
versionName = "1.3.0"
77
versionCode = "9"
88
packageName = "com.ninecraft.booket"
99

1010
## Android gradle plugin
11-
android-gradle-plugin = "8.12.0"
11+
android-gradle-plugin = "8.12.3"
1212

1313
## AndroidX
14-
androidx-core = "1.16.0"
15-
androidx-activity-compose = "1.10.1"
14+
androidx-core = "1.17.0"
15+
androidx-activity-compose = "1.12.2"
1616
androidx-startup = "1.2.0"
1717
androidx-splash = "1.2.0"
1818
androidx-datastore = "1.2.0"
1919
androidx-camera = "1.5.2"
2020

2121
## Compose
22-
androidx-compose-bom = "2025.08.00"
22+
androidx-compose-bom = "2026.01.00"
2323
androidx-compose-material3 = "1.4.0"
2424
compose-stable-marker = "1.0.7"
2525
compose-effects = "0.1.4"
@@ -42,17 +42,17 @@ okhttp = "5.3.2"
4242
retrofit = "3.0.0"
4343

4444
## Circuit
45-
circuit = "0.30.0"
45+
circuit = "0.32.0"
4646

4747
## Logging
4848
logger = "2.2.0"
4949

5050
## Kakao Login
51-
kakao-core = "2.22.0"
51+
kakao-core = "2.23.2"
5252

5353
## Image Load
5454
coil-compose = "2.7.0"
55-
landscapist = "2.5.1"
55+
landscapist = "2.8.2"
5656

5757
## Lottie
5858
lottie = "6.7.1"

0 commit comments

Comments
 (0)