Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

Apply used plugins in conventions

sjcqs8878265f96d6
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt
index 234fa6c2a..ea40d8c25 100644
--- a/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt
@@ -23,10 +23,9 @@ import org.gradle.kotlin.dsl.getByType
class AndroidApplicationComposeConventionPlugin : Plugin<Project> {
override fun apply(target: Project) {
with(target) {
- pluginManager.withPlugin("com.android.application") {
- val extension = extensions.getByType<BaseAppModuleExtension>()
- configureAndroidCompose(extension)
- }
+ pluginManager.apply("com.android.application")
+ val extension = extensions.getByType<BaseAppModuleExtension>()
+ configureAndroidCompose(extension)
}
}
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationJacocoConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationJacocoConventionPlugin.kt
index 890754170..4c3acc520 100644
--- a/build-logic/convention/src/main/kotlin/AndroidApplicationJacocoConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationJacocoConventionPlugin.kt
@@ -23,11 +23,12 @@ import org.gradle.kotlin.dsl.getByType
class AndroidApplicationJacocoConventionPlugin : Plugin<Project> {
override fun apply(target: Project) {
with(target) {
- pluginManager.withPlugin("com.android.application") {
- pluginManager.apply("org.gradle.jacoco")
- val extension = extensions.getByType<ApplicationAndroidComponentsExtension>()
- configureJacoco(extension)
+ with(pluginManager) {
+ apply("org.gradle.jacoco")
+ apply("com.android.application")
}
+ val extension = extensions.getByType<ApplicationAndroidComponentsExtension>()
+ configureJacoco(extension)
}
}
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt
index a25becb87..ee6192e05 100644
--- a/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt
@@ -23,10 +23,9 @@ import org.gradle.kotlin.dsl.getByType
class AndroidLibraryComposeConventionPlugin : Plugin<Project> {
override fun apply(target: Project) {
with(target) {
- pluginManager.withPlugin("com.android.library") {
- val extension = extensions.getByType<LibraryExtension>()
- configureAndroidCompose(extension)
- }
+ pluginManager.apply("com.android.library")
+ val extension = extensions.getByType<LibraryExtension>()
+ configureAndroidCompose(extension)
}
}
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryJacocoConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryJacocoConventionPlugin.kt
index d1ea85fc4..86ca091c3 100644
--- a/build-logic/convention/src/main/kotlin/AndroidLibraryJacocoConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryJacocoConventionPlugin.kt
@@ -23,11 +23,12 @@ import org.gradle.kotlin.dsl.getByType
class AndroidLibraryJacocoConventionPlugin : Plugin<Project> {
override fun apply(target: Project) {
with(target) {
- pluginManager.withPlugin("com.android.library") {
- pluginManager.apply("org.gradle.jacoco")
- val extension = extensions.getByType<LibraryAndroidComponentsExtension>()
- configureJacoco(extension)
+ with(pluginManager) {
+ apply("org.gradle.jacoco")
+ apply("com.android.library")
}
+ val extension = extensions.getByType<LibraryAndroidComponentsExtension>()
+ configureJacoco(extension)
}
}