Skip to content

Commit

Permalink
Updated dependencies. 0.3.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
AdamKobus committed Aug 12, 2022
1 parent 05bec92 commit de0c0e6
Show file tree
Hide file tree
Showing 11 changed files with 119 additions and 215 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@



### Changes



# 0.3.0

### Changes

- Added `NavDestination.popUpTo` which is equivalent of `NavHostController.popBackStack(route, saveState, inclusive)`
Expand All @@ -22,6 +28,7 @@
- #96 `NavStackEntry` is no longer nullable in `composableDestination` lambda
- Improved error messages when reading NavStackEntry arguments
- Added support for Long, Float, Double and Boolean navigation arguments
- updated AGP to 7.2.2, updated other dependencies

# 0.2.0

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ repositories {
}
dependencies {
implementation "com.adamkobus:compose-navigation:0.2.0"
implementation "com.adamkobus:compose-navigation:0.3.0"
}
```

Expand All @@ -34,7 +34,7 @@ repositories {
}
dependencies {
implementation "com.adamkobus:compose-navigation:0.2.15-SNAPSHOT"
implementation "com.adamkobus:compose-navigation:0.3.0-SNAPSHOT"
}
```

Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ apply plugin: "com.github.ben-manes.versions"
buildscript {
ext {
// https://github.com/JLLeitschuh/ktlint-gradle/releases
ktlintPluginVersion = "10.2.1"
ktlintPluginVersion = "10.3.0"

// https://github.com/detekt/detekt/releases
detektPluginVersion = "1.19.0"
detektPluginVersion = "1.21.0"

// https://github.com/ben-manes/gradle-versions-plugin/releases
versionsPluginVersion = "0.42.0"
Expand All @@ -18,7 +18,7 @@ buildscript {
publishPluginVersion = "1.1.0"

// https://developer.android.com/studio/releases/gradle-plugin
androidBuildtoolsPluginVersion = "7.1.0"
androidBuildtoolsPluginVersion = '7.2.2'
}

repositories {
Expand Down
26 changes: 14 additions & 12 deletions buildSrc/src/main/java/com/adamkobus/compose/navigation/Lib.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ object Lib {
/**
* [Jetpack Compose Releases](https://developer.android.com/jetpack/androidx/versions/all-channel)
*/
const val COMPOSE_VERSION = "1.2.0-alpha03"
const val COMPOSE_VERSION = "1.2.1"

const val COMPOSE_COMPILER_VERSION = "1.3.0"

/**
* [Kotlin Releases](https://kotlinlang.org/docs/releases.html#release-details)
*/
const val KOTLIN_VERSION = "1.6.10"
const val KOTLIN_VERSION = "1.7.10"

/**
* [Dokka Releases](https://github.com/Kotlin/dokka/releases)
Expand All @@ -19,27 +21,27 @@ object Lib {
/**
* [Accompanist Version](https://github.com/google/accompanist/releases)
*/
const val ACCOMPANIST_VERSION = "0.24.2-alpha"
const val ACCOMPANIST_VERSION = "0.25.1"

/**
* [Kotlint Coroutines Releases](https://github.com/Kotlin/kotlinx.coroutines/releases)
*/
const val KOTLIN_COROUTINES_VERSION = "1.6.0"
const val KOTLIN_COROUTINES_VERSION = "1.6.4"

/**
* [Hilt Releases](https://github.com/google/dagger/releases)
*/
const val HILT_VERSION = "2.40.5"
const val HILT_VERSION = "2.43.2"

/**
* [Ktlint Releases](https://github.com/pinterest/ktlint/releases)
*/
const val KTLINT_VERSION = "0.43.2"
const val KTLINT_VERSION = "0.42.1"

/**
* [Appcompat Releases](https://developer.android.com/jetpack/androidx/releases/appcompat#1.4.1)
*/
const val APPCOMPAT_VERSION = "1.4.1"
const val APPCOMPAT_VERSION = "1.5.0"

object Kotlin {
const val Coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$KOTLIN_COROUTINES_VERSION"
Expand All @@ -49,7 +51,7 @@ object Lib {
/**
* [Compose Activity Releases](https://androidx.tech/artifacts/activity/activity-compose/)
*/
const val Activity = "androidx.activity:activity-compose:1.4.0"
const val Activity = "androidx.activity:activity-compose:1.5.1"
const val Ui = "androidx.compose.ui:ui:$COMPOSE_VERSION"
const val Material = "androidx.compose.material:material:$COMPOSE_VERSION"
const val ToolingPreview = "androidx.compose.ui:ui-tooling-preview:$COMPOSE_VERSION"
Expand All @@ -63,7 +65,7 @@ object Lib {
}

object AndroidX {
const val Core = "androidx.core:core-ktx:1.7.0"
const val Core = "androidx.core:core-ktx:1.8.0"
const val Appcompat = "androidx.appcompat:appcompat:$APPCOMPAT_VERSION"
const val LifecycleRuntime = "androidx.lifecycle:lifecycle-runtime-ktx:2.4.0"
const val LifecycleViewModel = "androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0"
Expand All @@ -73,7 +75,7 @@ object Lib {
/**
* [Material Releases](https://github.com/material-components/material-components-android/releases)
*/
const val Material = "com.google.android.material:material:1.5.0"
const val Material = "com.google.android.material:material:1.6.1"
const val Hilt = "com.google.dagger:hilt-android:$HILT_VERSION"
const val HiltCompiler = "com.google.dagger:hilt-android-compiler:$HILT_VERSION"

Expand All @@ -87,7 +89,7 @@ object Lib {
/**
* [Lifecycle Aware ViewModel Releases](https://github.com/AdamKobus/lifecycle-aware-viewmodel/releases)
*/
const val LifecycleAwareViewModel = "com.adamkobus:lifecycle-observer-viewmodel-ktx:1.0.1"
const val LifecycleAwareViewModel = "com.adamkobus:lifecycle-observer-viewmodel-ktx:1.0.2"
}

object Square {
Expand All @@ -106,7 +108,7 @@ object Lib {
/**
* [Mockk Releases](https://github.com/mockk/mockk/releases)
*/
const val Mockk = "io.mockk:mockk:1.12.2"
const val Mockk = "io.mockk:mockk:1.12.5"

const val CoroutinesTest = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$KOTLIN_COROUTINES_VERSION"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ data class NavRoute constructor(
}

private fun ensureGraphNameAdded() {
if (parts.isEmpty() || parts[0] !is NavRoutePart.GraphName) {
throw IllegalStateException("Must add graphName as first part of the path")
check(parts.firstOrNull() is NavRoutePart.GraphName) {
"Must add graphName as first part of the path"
}
}

Expand Down
8 changes: 0 additions & 8 deletions detekt/config/custom.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@ naming:
ignoreAnnotated:
- Composable

formatting:
ArgumentListWrapping:
maxLineLength: 140
MaximumLineLength:
maxLineLength: 140
ParameterListWrapping:
maxLineLength: 140

style:
MaxLineLength:
maxLineLength: 140
Expand Down
Loading

0 comments on commit de0c0e6

Please sign in to comment.