diff --git a/app/build.gradle.kts b/app/build.gradle.kts index dd5bfe935..363590732 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -3,7 +3,6 @@ import plugin.KiwixConfigurationPlugin plugins { android id("com.github.triplet.play") version Versions.com_github_triplet_play_gradle_plugin - id("androidx.navigation.safeargs") } plugins.apply(KiwixConfigurationPlugin::class) @@ -84,8 +83,5 @@ dependencies { implementation(Libs.squidb) implementation(Libs.squidb_annotations) implementation(Libs.ink_page_indicator) - implementation(Libs.navigation_kotlin_fragment) - implementation(Libs.navigation_kotlin_ui) - androidTestImplementation(Libs.navigation_kotlin_testing) add("kapt", Libs.squidb_processor) } diff --git a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt index e637ed03f..c1e23e2e8 100644 --- a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt +++ b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt @@ -42,6 +42,7 @@ class AllProjectConfigurer { target.plugins.apply("com.hiya.jacoco-android") target.plugins.apply("org.jlleitschuh.gradle.ktlint") target.plugins.apply("io.gitlab.arturbosch.detekt") + target.plugins.apply("androidx.navigation.safeargs") } fun configureBaseExtension(target: Project, path: String) { @@ -159,6 +160,10 @@ class AllProjectConfigurer { implementation(Libs.material) implementation(Libs.constraintlayout) implementation(Libs.multidex) + // navigation + implementation(Libs.navigation_kotlin_fragment) + implementation(Libs.navigation_kotlin_ui) + androidTestImplementation(Libs.navigation_kotlin_testing) implementation(Libs.okhttp) implementation(Libs.logging_interceptor) implementation(Libs.retrofit) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 87e770539..11d59e9bb 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -14,7 +14,6 @@ buildscript { } plugins { `android-library` - id("androidx.navigation.safeargs") } plugins.apply(KiwixConfigurationPlugin::class) apply(plugin = "io.objectbox") @@ -62,8 +61,4 @@ dependencies { implementation(Libs.objectbox_kotlin) implementation(Libs.objectbox_rxjava) implementation(Libs.webkit) - // navigation - implementation(Libs.navigation_kotlin_fragment) - implementation(Libs.navigation_kotlin_ui) - androidTestImplementation(Libs.navigation_kotlin_testing) } diff --git a/custom/build.gradle.kts b/custom/build.gradle.kts index 5990cb014..d30e8f6ae 100644 --- a/custom/build.gradle.kts +++ b/custom/build.gradle.kts @@ -35,11 +35,6 @@ android { } } } -dependencies { - implementation(Libs.navigation_kotlin_fragment) - implementation(Libs.navigation_kotlin_ui) - androidTestImplementation(Libs.navigation_kotlin_testing) -} fun ProductFlavor.createDownloadTask(file: File): Task { return tasks.create("download${name.capitalize()}Zim") {