diff --git a/build.gradle b/build.gradle index 13b0ffe323a8..4b10065e39d2 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { id 'com.automattic.android.measure-builds' id "org.jetbrains.kotlinx.kover" id "com.autonomousapps.dependency-analysis" - id "androidx.navigation.safeargs.kotlin" apply false + alias(libs.plugins.navigation.safeargs).apply(false) id "com.android.library" apply false id 'com.google.gms.google-services' apply false id "org.jetbrains.kotlin.plugin.parcelize" apply false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 406d84f7c6a1..3822c18b6443 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -55,6 +55,7 @@ kotlinxCoroutines = '1.7.3' lottie = '6.1.0' mockitoAndroid = '4.5.1' mockitoKotlin = '4.1.0' +navigation = "2.7.7" philjayMpAndroidChart = 'v3.1.0' screengrab = '2.1.1' sentry = "4.3.1" @@ -183,6 +184,8 @@ lottie = { group = "com.airbnb.android", name = "lottie", version.ref ="lottie" lottie-compose = { group = "com.airbnb.android", name = "lottie-compose", version.ref ="lottie" } mockito-android = { group = "org.mockito", name = "mockito-android", version.ref ="mockitoAndroid" } mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref ="mockitoKotlin" } +navigation-fragment = { group = "androidx.navigation", name = "navigation-fragment", version.ref = "navigation" } +navigation-ui = { group = "androidx.navigation", name = "navigation-ui", version.ref = "navigation" } philJay-mpAndroidChart = { group = "com.github.PhilJay", name = "MPAndroidChart", version.ref ="philjayMpAndroidChart" } squareup-kotlinpoet = { group = "com.squareup", name = "kotlinpoet", version.ref ="squareupKotlinPoet" } squareup-kotlinpoet-ksp = { group = "com.squareup", name = "kotlinpoet-ksp", version.ref ="squareupKotlinPoet" } @@ -197,4 +200,5 @@ zendesk = { group = "com.zendesk", name = "support", version.ref ="zendesk" } [plugins] dagger = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } +navigation-safeargs = { id = "androidx.navigation.safeargs.kotlin", version.ref = "navigation" } sentry = { id = "io.sentry.android.gradle", version.ref = "sentry" } diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle index d21bda7f1d02..824616e81b44 100644 --- a/libs/image-editor/build.gradle +++ b/libs/image-editor/build.gradle @@ -2,7 +2,7 @@ plugins { id "com.android.library" id "org.jetbrains.kotlin.android" id "org.jetbrains.kotlin.plugin.parcelize" - id "androidx.navigation.safeargs.kotlin" + alias(libs.plugins.navigation.safeargs) id "org.jetbrains.kotlinx.kover" } @@ -55,8 +55,8 @@ dependencies { implementation libs.androidx.constraintLayout implementation libs.androidx.viewPager2 implementation libs.google.material - implementation "androidx.navigation:navigation-fragment:$gradle.ext.navigationVersion" - implementation "androidx.navigation:navigation-ui:$gradle.ext.navigationVersion" + implementation libs.navigation.fragment + implementation libs.navigation.ui implementation libs.androidx.lifecycle.common implementation libs.androidx.lifecycle.runtime implementation libs.androidx.lifecycle.viewmodel diff --git a/settings.gradle b/settings.gradle index b3c2ce719372..153eb15a8cd4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,7 +3,6 @@ pluginManagement { gradle.ext.kspVersion = '1.9.22-1.0.17' gradle.ext.agpVersion = '8.1.0' gradle.ext.googleServicesVersion = '4.3.15' - gradle.ext.navigationVersion = '2.7.7' gradle.ext.detektVersion = '1.23.0' gradle.ext.violationCommentsVersion = '1.70.0' gradle.ext.measureBuildsVersion = '2.1.2' @@ -19,7 +18,6 @@ pluginManagement { id "com.android.application" version gradle.ext.agpVersion id "com.android.library" version gradle.ext.agpVersion id 'com.google.gms.google-services' version gradle.ext.googleServicesVersion - id "androidx.navigation.safeargs.kotlin" version gradle.ext.navigationVersion id "io.gitlab.arturbosch.detekt" version gradle.ext.detektVersion id "se.bjurr.violations.violation-comments-to-github-gradle-plugin" version gradle.ext.violationCommentsVersion id 'com.automattic.android.measure-builds' version gradle.ext.measureBuildsVersion