Skip to content

Commit

Permalink
remove androidx.navigation (#752)
Browse files Browse the repository at this point in the history
  • Loading branch information
gabrielittner authored Apr 30, 2024
1 parent e82f75f commit 17bcdbe
Show file tree
Hide file tree
Showing 14 changed files with 1 addition and 1,009 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Change Log

- Khonshu's own navigation implementation has been moved from `navigation-experimental`
into the main `navigation` artifact.
- Removed `navigation-compose` artifact that was based on androidx.navigation.

### Codegen

Expand Down
8 changes: 0 additions & 8 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ androidx-activity = "1.9.0"
androidx-annotations = "1.5.0"
androidx-core = "1.13.0"
androidx-lifecycle = "2.7.0"
androidx-navigation = "2.7.7"
androidx-savedstate = "1.2.1"

uri = "0.0.18"

Expand Down Expand Up @@ -58,10 +56,8 @@ collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-im

androidx-compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "androidx-compose-compiler" }
androidx-compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "androidx-compose-runtime" }
androidx-compose-runtime-saveable = { module = "androidx.compose.runtime:runtime-saveable", version.ref = "androidx-compose-runtime" }
androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidx-compose-ui" }
androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidx-compose-ui" }
androidx-compose-animation = { module = "androidx.compose.animation:animation", version.ref = "androidx-compose-animation" }
jetbrains-compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "jetbrains-compose" }
jetbrains-compose-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "jetbrains-compose" }
jetbrains-compose-compiler = { module = "org.jetbrains.compose.compiler:compiler", version.ref = "jetbrains-compose-compiler" }
Expand All @@ -76,10 +72,6 @@ androidx-lifecycle-testing = { module = "androidx.lifecycle:lifecycle-runtime-te
androidx-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
androidx-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
androidx-viewmodel-savedstate = { module = "androidx.lifecycle:lifecycle-viewmodel-savedstate", version.ref = "androidx-lifecycle" }
androidx-navigation-common = { module = "androidx.navigation:navigation-common", version.ref = "androidx-navigation" }
androidx-navigation-runtime = { module = "androidx.navigation:navigation-runtime", version.ref = "androidx-navigation" }
androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-navigation" }
androidx-savedstate = { module = "androidx.savedstate:savedstate", version.ref = "androidx-savedstate" }

uri = { module = "com.eygraber:uri-kmp", version.ref = "uri" }
toml = { module = "net.peanuuutz.tomlkt:tomlkt", version = "0.3.7" }
Expand Down
33 changes: 0 additions & 33 deletions navigation-compose/api/navigation-compose.api

This file was deleted.

3 changes: 0 additions & 3 deletions navigation-compose/gradle.properties

This file was deleted.

29 changes: 0 additions & 29 deletions navigation-compose/navigation-compose.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,35 +1,6 @@
import com.android.build.api.dsl.CommonExtension

plugins {
alias(libs.plugins.fgp.android)
alias(libs.plugins.fgp.publish)
}

freeletics {
optIn("com.freeletics.khonshu.navigation.internal.InternalNavigationApi")

useCompose()
}

extensions.configure(CommonExtension::class.java) {
lint {
disable.add("UnsafeOptInUsageError")
}
}

dependencies {
api(projects.navigation)
api(libs.androidx.compose.runtime)
api(libs.androidx.compose.ui)
api(libs.androidx.navigation.common)
api(libs.androidx.navigation.runtime)
api(libs.androidx.viewmodel.savedstate)
api(libs.collections.immutable)

implementation(libs.coroutines.core)
implementation(libs.androidx.compose.runtime.saveable)
implementation(libs.androidx.compose.animation)
implementation(libs.androidx.lifecycle.common)
implementation(libs.androidx.viewmodel)
implementation(libs.androidx.navigation.compose)
}
Loading

0 comments on commit 17bcdbe

Please sign in to comment.