Skip to content

Commit 71752ef

Browse files
committed
Update project dependencies
Update project dependencies and deprecated / obsolete code.
1 parent 2fe366e commit 71752ef

File tree

8 files changed

+17
-103
lines changed

8 files changed

+17
-103
lines changed

Diff for: app-desktop/src/jvmMain/kotlin/com/example/myapplication/desktop/Main.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@ import androidx.compose.ui.window.Window
44
import androidx.compose.ui.window.application
55
import androidx.compose.ui.window.rememberWindowState
66
import com.arkivanov.decompose.DefaultComponentContext
7-
import com.arkivanov.decompose.ExperimentalDecomposeApi
8-
import com.arkivanov.decompose.extensions.compose.jetbrains.lifecycle.LifecycleController
7+
import com.arkivanov.decompose.extensions.compose.lifecycle.LifecycleController
98
import com.arkivanov.essenty.lifecycle.LifecycleRegistry
109
import com.example.myapplication.root.RootContent
1110
import com.example.myapplication.shared.root.DefaultRootComponent
1211

13-
@OptIn(ExperimentalDecomposeApi::class)
1412
fun main() {
1513

1614
val lifecycle = LifecycleRegistry()

Diff for: app-ios-swift/app-ios-swift/DecomposeHelpers/ObservableValue.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class ObservableValue<T : AnyObject> : ObservableObject {
1010

1111
init(_ value: Value<T>) {
1212
self.value = value.value
13-
self.cancellation = value.observe { [weak self] value in self?.value = value }
13+
self.cancellation = value.subscribe { [weak self] value in self?.value = value }
1414
}
1515

1616
deinit {

Diff for: build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ plugins {
1111
}
1212

1313
tasks.register("clean", Delete::class) {
14-
delete(rootProject.buildDir)
14+
delete(rootProject.layout.buildDirectory)
1515
}

Diff for: compose-ui/src/commonMain/kotlin/com/example/myapplication/root/RootContent.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import androidx.compose.material.MaterialTheme
88
import androidx.compose.material.Surface
99
import androidx.compose.runtime.Composable
1010
import androidx.compose.ui.Modifier
11-
import com.arkivanov.decompose.extensions.compose.jetbrains.stack.Children
12-
import com.arkivanov.decompose.extensions.compose.jetbrains.stack.animation.fade
13-
import com.arkivanov.decompose.extensions.compose.jetbrains.stack.animation.plus
14-
import com.arkivanov.decompose.extensions.compose.jetbrains.stack.animation.scale
15-
import com.arkivanov.decompose.extensions.compose.jetbrains.stack.animation.stackAnimation
11+
import com.arkivanov.decompose.extensions.compose.stack.Children
12+
import com.arkivanov.decompose.extensions.compose.stack.animation.fade
13+
import com.arkivanov.decompose.extensions.compose.stack.animation.plus
14+
import com.arkivanov.decompose.extensions.compose.stack.animation.scale
15+
import com.arkivanov.decompose.extensions.compose.stack.animation.stackAnimation
1616
import com.example.myapplication.main.MainContent
1717
import com.example.myapplication.shared.root.RootComponent
1818
import com.example.myapplication.shared.root.RootComponent.Child

Diff for: compose-ui/src/commonMain/kotlin/com/example/myapplication/welcome/WelcomeContent.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import androidx.compose.material.Scaffold
1010
import androidx.compose.material.Text
1111
import androidx.compose.material.TopAppBar
1212
import androidx.compose.material.icons.Icons
13-
import androidx.compose.material.icons.filled.ArrowBack
13+
import androidx.compose.material.icons.automirrored.filled.ArrowBack
1414
import androidx.compose.runtime.Composable
1515
import androidx.compose.runtime.getValue
1616
import androidx.compose.ui.Alignment
1717
import androidx.compose.ui.Modifier
18-
import com.arkivanov.decompose.extensions.compose.jetbrains.subscribeAsState
18+
import com.arkivanov.decompose.extensions.compose.subscribeAsState
1919
import com.example.myapplication.shared.welcome.WelcomeComponent
2020

2121
@Composable
@@ -33,7 +33,7 @@ internal fun WelcomeContent(
3333
navigationIcon = {
3434
IconButton(onClick = component::onBackClicked) {
3535
Icon(
36-
imageVector = Icons.Default.ArrowBack,
36+
imageVector = Icons.AutoMirrored.Default.ArrowBack,
3737
contentDescription = "Back button",
3838
)
3939
}

Diff for: compose-ui/src/iosMain/kotlin/com/example/myapplication/root/RootViewController.kt

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package com.example.myapplication.root
33
import androidx.compose.foundation.layout.fillMaxSize
44
import androidx.compose.ui.Modifier
55
import androidx.compose.ui.window.ComposeUIViewController
6-
import com.example.myapplication.root.RootContent
76
import com.example.myapplication.shared.root.RootComponent
87
import platform.UIKit.UIViewController
98

Diff for: gradle/libs.versions.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
[versions]
22

33
project = "1.0.0"
4-
kotlin = "1.9.22"
4+
kotlin = "1.9.23"
55
agp = "8.2.0"
66
jvmTarget = "11"
77

88
android-minSdk = "24"
99
android-compileSdk = "34"
1010
android-targetSdk = "34"
1111

12-
compose-jetbrains = "1.5.12"
12+
compose-jetbrains = "1.6.2"
1313

14-
androidx-activityCompose = "1.8.2"
14+
androidx-activityCompose = "1.9.0"
1515

16-
decompose = "2.2.2-compose-experimental"
17-
essenty = "1.3.0"
16+
decompose = "3.0.0"
17+
essenty = "2.0.0"
1818

1919
[plugins]
2020

@@ -30,6 +30,6 @@ jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "compose-jetbr
3030
androidx-activity-activityCompose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidx-activityCompose" }
3131

3232
decompose-decompose = { group = "com.arkivanov.decompose", name = "decompose", version.ref = "decompose" }
33-
decompose-extensionsComposeJetbrains = { group = "com.arkivanov.decompose", name = "extensions-compose-jetbrains", version.ref = "decompose" }
33+
decompose-extensionsComposeJetbrains = { group = "com.arkivanov.decompose", name = "extensions-compose", version.ref = "decompose" }
3434

3535
essenty-lifecycle = { group = "com.arkivanov.essenty", name = "lifecycle", version.ref = "essenty" }

Diff for: shared/src/iosMain/kotlin/com/example/myapplication/shared/ApplicationLifecycle.kt

-83
This file was deleted.

0 commit comments

Comments
 (0)