Skip to content

Commit d75c947

Browse files
authored
Merge branch 'main' into mlykotom/export-viewmodel
2 parents b48265b + c87c03d commit d75c947

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Fruitties/androidApp/src/main/java/com/example/fruitties/android/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ data class FruittieScreenKey(
5353

5454
class MainActivity : ComponentActivity() {
5555
override fun onCreate(savedInstanceState: Bundle?) {
56-
super.onCreate(savedInstanceState)
5756
enableEdgeToEdge()
57+
super.onCreate(savedInstanceState)
5858
setContent {
5959
CompositionLocalProvider(
6060
LocalAppContainer provides (this.applicationContext as FruittiesAndroidApp).container,

Fruitties/gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ composeBom = "2025.07.00"
2626
dataStore = "1.1.7"
2727
kotlin = "2.2.0"
2828
kotlinx-coroutines = "1.10.2"
29-
kotlinxDatetime = "0.7.1"
29+
kotlinxDatetime = "0.7.1-0.6.x-compat"
3030
ksp = "2.2.0-2.0.2"
3131
ktorVersion = "3.2.2"
3232
pagingComposeAndroid = "3.3.6"
3333
skie = "0.10.4"
3434
sqlite = "2.5.2"
35-
spotless = "7.2.0"
35+
spotless = "7.2.1"
3636
okio = "3.15.0"
3737
kermit = "2.0.6"
3838
runner = "1.6.2"

0 commit comments

Comments
 (0)