From b6ba2d9868909a36a72cb6a8ea3a2b4cc073b9e1 Mon Sep 17 00:00:00 2001 From: John O'Reilly Date: Tue, 24 Dec 2024 10:24:09 +0000 Subject: [PATCH] some cleanup + dependency updates --- .../PeopleInSpaceSwiftUI/ISSPositionScreen.swift | 2 +- .../com/surrus/common/ui/SharedViewControllers.kt | 11 +++++------ gradle/libs.versions.toml | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/PeopleInSpaceSwiftUI/PeopleInSpaceSwiftUI/ISSPositionScreen.swift b/PeopleInSpaceSwiftUI/PeopleInSpaceSwiftUI/ISSPositionScreen.swift index 7aafd98f..c37420ef 100644 --- a/PeopleInSpaceSwiftUI/PeopleInSpaceSwiftUI/ISSPositionScreen.swift +++ b/PeopleInSpaceSwiftUI/PeopleInSpaceSwiftUI/ISSPositionScreen.swift @@ -22,7 +22,7 @@ struct ISSPositionContentViewController: UIViewControllerRepresentable { let viewModel: ISSPositionViewModel func makeUIViewController(context: Context) -> UIViewController { - SharedViewControllers().ISSPositionContentViewController( + SharedViewControllersKt.ISSPositionContentViewController( viewModel: viewModel, nativeViewFactory: iOSNativeViewFactory.shared ) diff --git a/common/src/iOSMain/kotlin/com/surrus/common/ui/SharedViewControllers.kt b/common/src/iOSMain/kotlin/com/surrus/common/ui/SharedViewControllers.kt index 720f3762..a5c1e570 100644 --- a/common/src/iOSMain/kotlin/com/surrus/common/ui/SharedViewControllers.kt +++ b/common/src/iOSMain/kotlin/com/surrus/common/ui/SharedViewControllers.kt @@ -10,10 +10,9 @@ val LocalNativeViewFactory = staticCompositionLocalOf { error("LocalNativeViewFactory not provided") } -object SharedViewControllers { - fun ISSPositionContentViewController(viewModel: ISSPositionViewModel, nativeViewFactory: NativeViewFactory) = ComposeUIViewController { - CompositionLocalProvider(LocalNativeViewFactory provides nativeViewFactory) { - ISSPositionContent(viewModel) - } + +fun ISSPositionContentViewController(viewModel: ISSPositionViewModel, nativeViewFactory: NativeViewFactory) = ComposeUIViewController { + CompositionLocalProvider(LocalNativeViewFactory provides nativeViewFactory) { + ISSPositionContent(viewModel) } -} \ No newline at end of file +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b9ef69bc..0923581f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] kotlin = "2.1.0" -ksp = "2.1.0-1.0.28" +ksp = "2.1.0-1.0.29" compose-multiplatform = "1.7.3" composeUiTooling = "1.4.0" @@ -37,7 +37,7 @@ kermit = "2.0.5" gradleVersionsPlugin = "0.51.0" shadowPlugin = "7.1.2" -skie = "0.9.5" +skie = "0.10.0" minSdk = "24" compileSdk = "35"