From 8f64823476ca8bdf963e63cf37695bbb57a14df1 Mon Sep 17 00:00:00 2001
From: Jaehwa Noh <shwoghk14@gmail.com>
Date: Sat, 29 Jun 2024 14:59:26 +0900
Subject: [PATCH] Add explicit extension type.

Change-Id: I78249a206d670941fc15346e4032e760dc8eacee
---
 .../src/main/kotlin/AndroidComposeConventionPlugin.kt     | 5 ++---
 .../src/main/kotlin/AndroidJacocoConventionPlugin.kt      | 8 +++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build-logic/convention/src/main/kotlin/AndroidComposeConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidComposeConventionPlugin.kt
index b68a35c6f..609ddf369 100644
--- a/build-logic/convention/src/main/kotlin/AndroidComposeConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidComposeConventionPlugin.kt
@@ -1,5 +1,5 @@
-
 import com.android.build.api.dsl.ApplicationExtension
+import com.android.build.api.dsl.CommonExtension
 import com.android.build.api.dsl.LibraryExtension
 import com.google.samples.apps.nowinandroid.configureAndroidCompose
 import org.gradle.api.Plugin
@@ -26,8 +26,7 @@ class AndroidComposeConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
             pluginManager.apply("org.jetbrains.kotlin.plugin.compose")
-
-            val extension = when {
+            val extension: CommonExtension<*, *, *, *, *, *> = when {
                 pluginManager.hasPlugin("com.android.application") -> the<ApplicationExtension>()
                 pluginManager.hasPlugin("com.android.library") -> the<LibraryExtension>()
                 else -> TODO("Need to apply nowinandroid.android.application or nowinandroid.android.library firstly.")
diff --git a/build-logic/convention/src/main/kotlin/AndroidJacocoConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidJacocoConventionPlugin.kt
index ab8ff3dd3..27156eb2e 100644
--- a/build-logic/convention/src/main/kotlin/AndroidJacocoConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidJacocoConventionPlugin.kt
@@ -1,4 +1,4 @@
-
+import com.android.build.api.dsl.CommonExtension
 import com.android.build.api.dsl.LibraryExtension
 import com.android.build.api.variant.AndroidComponentsExtension
 import com.android.build.api.variant.ApplicationAndroidComponentsExtension
@@ -31,15 +31,17 @@ class AndroidJacocoConventionPlugin : Plugin<Project> {
             pluginManager.apply("jacoco")
 
             val jacocoExtension: AndroidComponentsExtension<*, *, *>
-            val androidExtension = when {
+            val androidExtension: CommonExtension<*, *, *, *, *, *> = when {
                 pluginManager.hasPlugin("com.android.application") -> {
                     jacocoExtension = the<ApplicationAndroidComponentsExtension>()
                     the<BaseAppModuleExtension>()
                 }
+
                 pluginManager.hasPlugin("com.android.library") -> {
-                    jacocoExtension = the< LibraryAndroidComponentsExtension>()
+                    jacocoExtension = the<LibraryAndroidComponentsExtension>()
                     the<LibraryExtension>()
                 }
+
                 else -> TODO("Need to apply nowinandroid.android.application or nowinandroid.android.library firstly.")
             }