Skip to content

Conversation

@livotov
Copy link

@livotov livotov commented May 15, 2025

No description provided.

@livotov livotov requested a review from ryanmitchener May 15, 2025 13:43
Copy link
Contributor

@ryanmitchener ryanmitchener left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to change the branch this is merging into to release/4.1.0 and merge that branch into this one. Also, please show the outcome under the buttons and you can remove the "pop back to home" button.

Dr Watson and others added 6 commits May 16, 2025 15:09
…o dev/settings_screen_opener_example

# Conflicts:
#	composeApp/src/androidMain/kotlin/PlatformDI.kt
#	composeApp/src/commonMain/kotlin/DI.kt
#	composeApp/src/commonMain/kotlin/coordinator/AppCoordinator.kt
#	composeApp/src/commonMain/kotlin/ui/Route.kt
#	composeApp/src/commonMain/kotlin/ui/app/App.kt
#	composeApp/src/commonMain/kotlin/ui/home/HomeScreen.kt
#	composeApp/src/commonMain/kotlin/ui/home/HomeViewInteractor.kt
#	composeApp/src/desktopMain/kotlin/PlatformDI.kt
#	composeApp/src/iosMain/kotlin/PlatformDI.kt
#	composeApp/src/wasmJsMain/kotlin/PlatformDI.kt
…pener_example

# Conflicts:
#	composeApp/src/commonMain/kotlin/coordinator/AppCoordinator.kt
#	composeApp/src/commonMain/kotlin/ui/Route.kt
#	composeApp/src/commonMain/kotlin/ui/app/App.kt
#	composeApp/src/commonMain/kotlin/ui/home/HomeScreen.kt
#	composeApp/src/commonMain/kotlin/ui/home/HomeViewInteractor.kt
…pener_example

# Conflicts:
#	iosApp/Podfile.lock
#	iosApp/iosApp.xcodeproj/project.pbxproj
@ryanmitchener ryanmitchener changed the base branch from develop to feature/oskit-compose-4.1.0 May 19, 2025 19:29
…pener_example

# Conflicts:
#	composeApp/src/commonMain/kotlin/ui/home/HomeScreen.kt
Dr Watson added 3 commits May 29, 2025 13:51
…le' into dev/settings_screen_opener_example
…pener_example

# Conflicts:
#	composeApp/src/commonMain/kotlin/ui/app/App.kt
#	composeApp/src/commonMain/kotlin/ui/home/HomeScreen.kt
#	composeApp/src/commonMain/kotlin/ui/home/HomeViewInteractor.kt
@livotov livotov requested a review from ryanmitchener May 29, 2025 11:08
…pener_example

# Conflicts:
#	gradle/libs.versions.toml
@livotov livotov requested a review from ryanmitchener June 26, 2025 12:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants