diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 4684cff75066..3f1b59fe4176 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -10,7 +10,7 @@ plugins { id "io.sentry.android.gradle" id "se.bjurr.violations.violation-comments-to-github-gradle-plugin" id "com.google.gms.google-services" - id "com.google.dagger.hilt.android" + alias(libs.plugins.dagger) id "org.jetbrains.kotlinx.kover" id "com.google.devtools.ksp" } @@ -470,10 +470,10 @@ dependencies { implementation ("com.google.android.exoplayer:exoplayer:$googleExoPlayerVersion") { exclude group: 'com.android.support', module: 'support-annotations' } - implementation "com.google.dagger:dagger-android-support:$gradle.ext.daggerVersion" - ksp "com.google.dagger:dagger-android-processor:$gradle.ext.daggerVersion" - implementation "com.google.dagger:hilt-android:$gradle.ext.daggerVersion" - ksp "com.google.dagger:hilt-compiler:$gradle.ext.daggerVersion" + implementation libs.dagger.android.support + ksp libs.dagger.android.processor + implementation libs.dagger.hilt.android + ksp libs.dagger.hilt.compiler testImplementation(libs.androidx.coreTesting, { exclude group: 'com.android.support', module: 'support-compat' @@ -526,8 +526,8 @@ dependencies { } androidTestImplementation (name:'cloudtestingscreenshotter_lib', ext:'aar') // Screenshots on Firebase Cloud Testing androidTestImplementation "androidx.work:work-testing:$androidxWorkManagerVersion" - androidTestImplementation "com.google.dagger:hilt-android-testing:$gradle.ext.daggerVersion" - kspAndroidTest "com.google.dagger:hilt-android-compiler:$gradle.ext.daggerVersion" + androidTestImplementation libs.dagger.hilt.android.testing + kspAndroidTest libs.dagger.hilt.android.compiler // Enables Java 8+ API desugaring support coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$androidDesugarVersion" lintChecks "org.wordpress:lint:$wordPressLintVersion" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ecb7cef19960..2a5b81f899fd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,6 +8,7 @@ androidxFragment = '1.6.2' androidxLifecycle = '2.6.2' androidxWebkit = '1.11.0' automatticRest = '1.0.8' +dagger = '2.50' glide = '4.16.0' googlePlayAppUpdate = '2.1.0' gson = '2.10.1' @@ -55,6 +56,12 @@ androidx-lifecycle-viewmodel-savedstate = { group = "androidx.lifecycle", name = androidx-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxComposeNavigation" } androidx-webkit = {group = "androidx.webkit", name = "webkit", version.ref = "androidxWebkit"} automattic-rest = { group = "com.automattic", name = "rest", version.ref = "automatticRest" } +dagger-android-processor = { group = "com.google.dagger", name = "dagger-android-processor", version.ref = "dagger" } +dagger-android-support = { group = "com.google.dagger", name = "dagger-android-support", version.ref = "dagger" } +dagger-hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "dagger" } +dagger-hilt-android-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "dagger" } +dagger-hilt-android-testing = { group = "com.google.dagger", name = "hilt-android-testing", version.ref = "dagger" } +dagger-hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "dagger" } glide = { group = "com.github.bumptech.glide", name = "glide", version.ref ="glide" } glide-ksp = { group = "com.github.bumptech.glide", name = "ksp", version.ref ="glide" } glide-volley-integration = { group = "com.github.bumptech.glide", name = "volley-integration", version.ref ="glide" } @@ -62,4 +69,4 @@ google-gson = { group = "com.google.code.gson", name = "gson", version.ref = "gs wordPress-persistentEditText = { group = "org.wordpress", name = "persistentedittext", version.ref = "wordPressPersistentEditText" } [plugins] - +dagger = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } diff --git a/settings.gradle b/settings.gradle index ce16fc371913..811982abb2d4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,7 +5,6 @@ pluginManagement { gradle.ext.googleServicesVersion = '4.3.15' gradle.ext.navigationVersion = '2.7.7' gradle.ext.sentryVersion = '4.3.1' - gradle.ext.daggerVersion = "2.50" gradle.ext.detektVersion = '1.23.0' gradle.ext.violationCommentsVersion = '1.70.0' gradle.ext.measureBuildsVersion = '2.1.2' @@ -27,7 +26,6 @@ pluginManagement { id "se.bjurr.violations.violation-comments-to-github-gradle-plugin" version gradle.ext.violationCommentsVersion id 'com.automattic.android.measure-builds' version gradle.ext.measureBuildsVersion id "org.jetbrains.kotlinx.kover" version gradle.ext.koverVersion - id "com.google.dagger.hilt.android" version gradle.ext.daggerVersion id "com.google.devtools.ksp" version gradle.ext.kspVersion id "com.autonomousapps.dependency-analysis" version gradle.ext.dependencyAnalysisVersion }