diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 13d74c18..d645c0be 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -60,6 +60,17 @@ composeCompiler { ) } +// TODO: Remove when Nav3 gets a new release +configurations.configureEach { + resolutionStrategy { + eachDependency { + if (requested.group == "androidx.lifecycle") { + useVersion(libs.versions.lifecycle.get()) + } + } + } +} + licensee { allow("Apache-2.0") allow("MIT") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 938c919c..1507c239 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,8 +15,9 @@ konvert = "4.1.0" kotlin = "2.1.21" kotlinResult = "2.0.1" leakcanary = "3.0-alpha-8" -lifecycle = "2.9.0" -navigation3 = "1.0.0-alpha02" +lifecycle = "2.10.0-SNAPSHOT" +# TODO: Update lifecycle to stable when next update drops +navigation3 = "1.0.0-SNAPSHOT" navigation3-material = "1.0.0-SNAPSHOT" retrofit = "3.0.0" richtext = "1.0.0-alpha02" diff --git a/settings.gradle.kts b/settings.gradle.kts index 171e0de5..061770b7 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -102,10 +102,16 @@ dependencyResolutionManagement { name = "Compose Compiler Snapshots" content { includeGroup("androidx.compose.compiler") } } - maven("https://androidx.dev/snapshots/builds/13546692/artifacts/repository") { + maven("https://androidx.dev/snapshots/builds/13585391/artifacts/repository") { name = "AndroidX Snapshots" - mavenContent { snapshotsOnly() } - content { includeGroup("androidx.compose.material3.adaptive") } + content { + includeGroup("androidx.activity") + includeGroup("androidx.compose.material3.adaptive") + includeGroup("androidx.lifecycle") + includeGroup("androidx.navigationevent") + includeGroup("androidx.navigation3") + includeGroup("androidx.savedstate") + } } maven("https://oss.sonatype.org/content/repositories/snapshots/") { name = "Sonatype Snapshots"