Minor improvements in build-logic (#185)

AfigAliyev · Oct 3, 2022 · 8200833 · 8200833
1 parent 90b0e09
commit 8200833
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/build-logic/plugins/convention/src/main/kotlin/AndroidBenchmarkConventionPlugin.kt b/build-logic/plugins/convention/src/main/kotlin/AndroidBenchmarkConventionPlugin.kt
@@ -27,8 +27,8 @@ import org.gradle.kotlin.dsl.create
 class AndroidBenchmarkConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) = with(target) {
         with(pluginManager) {
-            apply("com.android.test")
-            apply("org.jetbrains.kotlin.android")
+            apply(libs.plugins.android.test.get().pluginId)
+            apply(libs.plugins.kotlin.android.get().pluginId)
         }
 
         extensions.configure<TestExtension> {

diff --git a/build-logic/plugins/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt b/build-logic/plugins/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt
@@ -29,13 +29,13 @@ class AndroidFeatureConventionPlugin : Plugin<Project> {
         dependencies {
             add("implementation", project(":core:core-ui"))
 
-            add("implementation", libs.androidx.lifecycle.runtime.compose.get())
-            add("implementation", libs.androidx.lifecycle.viewmodel.compose.get())
-            add("implementation", libs.androidx.hilt.navigation.compose.get())
-            add("implementation", libs.kotlinx.coroutines.android.get())
+            add("implementation", libs.androidx.lifecycle.runtime.compose)
+            add("implementation", libs.androidx.lifecycle.viewmodel.compose)
+            add("implementation", libs.androidx.hilt.navigation.compose)
+            add("implementation", libs.kotlinx.coroutines.android)
 
-            add("implementation", libs.dagger.hilt.android.get())
-            add("kapt", libs.dagger.hilt.compiler.get())
+            add("implementation", libs.dagger.hilt.android)
+            add("kapt", libs.dagger.hilt.compiler)
         }
     }
 }
diff --git a/build-logic/plugins/convention/src/main/kotlin/DetektConventionPlugin.kt b/build-logic/plugins/convention/src/main/kotlin/DetektConventionPlugin.kt
@@ -35,8 +35,8 @@ class DetektConventionPlugin : Plugin<Project> {
         }
 
         dependencies {
-            add("detektPlugins", libs.detekt.formatting.get())
-            add("detektPlugins", libs.kode.detekt.rules.compose.get())
+            add("detektPlugins", libs.detekt.formatting)
+            add("detektPlugins", libs.kode.detekt.rules.compose)
         }
 
         tasks.withType<io.gitlab.arturbosch.detekt.Detekt>().configureEach {

diff --git a/...d-logic/plugins/convention/src/main/kotlin/com/maximillianleonov/cinemax/KotlinAndroid.kt b/...d-logic/plugins/convention/src/main/kotlin/com/maximillianleonov/cinemax/KotlinAndroid.kt
@@ -44,7 +44,7 @@ internal fun Project.configureKotlinAndroid(commonExtension: CommonExtension<*,
             jvmTarget = JavaVersion.VERSION_1_8.toString()
         }
 
-        dependencies.add("coreLibraryDesugaring", libs.desugar.jdk.libs.get())
+        dependencies.add("coreLibraryDesugaring", libs.desugar.jdk.libs)
     }
 
 private fun CommonExtension<*, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) =