Skip to content

Commit

Permalink
Merge branch 'refs/heads/compose-1.7'
Browse files Browse the repository at this point in the history
# Conflicts:
#	compose-destinations/src/main/java/com/ramcosta/composedestinations/DefaultNavHostEngine.kt
#	compose-destinations/src/main/java/com/ramcosta/composedestinations/spec/DestinationSpec.kt
#	compose-destinations/src/main/java/com/ramcosta/composedestinations/spec/NavGraphSpec.kt
#	compose-destinations/src/main/java/com/ramcosta/composedestinations/spec/Route.kt
#	sample/src/main/java/com/ramcosta/destinations/sample/ui/composables/BottomBar.kt
  • Loading branch information
raamcosta committed Sep 8, 2024
2 parents a1ef2b0 + 52399eb commit c731ff9
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
8 changes: 8 additions & 0 deletions .idea/deploymentTargetSelector.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@file:OptIn(ExperimentalCompilerApi::class)

package com.ramcosta.composedestinations.ksp

import com.tschuchort.compiletesting.KotlinCompilation
Expand Down

0 comments on commit c731ff9

Please sign in to comment.