diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/android/AndroidVariantType.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/android/AndroidVariantType.kt
index 6d658f99a28..300c2a5059c 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/android/AndroidVariantType.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/android/AndroidVariantType.kt
@@ -5,13 +5,14 @@
 
 package org.jetbrains.kotlin.gradle.plugin.sources.android
 
-import com.android.build.gradle.api.*
+import org.jetbrains.kotlin.gradle.utils.*
 
-internal val BaseVariant.type: AndroidVariantType
+@Suppress("TYPEALIAS_EXPANSION_DEPRECATION")
+internal val DeprecatedAndroidBaseVariant.type: AndroidVariantType
     get() = when (this) {
-        is UnitTestVariant -> AndroidVariantType.UnitTest
-        is TestVariant -> AndroidVariantType.InstrumentedTest
-        is ApplicationVariant, is LibraryVariant -> AndroidVariantType.Main
+        is DeprecatedAndroidUnitTestVariant -> AndroidVariantType.UnitTest
+        is DeprecatedAndroidTestVariant -> AndroidVariantType.InstrumentedTest
+        is DeprecatedAndroidApplicationVariant, is DeprecatedAndroidLibraryVariant -> AndroidVariantType.Main
         else -> AndroidVariantType.Unknown
     }
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/androidCompat.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/androidCompat.kt
index 7b429fd17bf..e92f80cb144 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/androidCompat.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/androidCompat.kt
@@ -9,6 +9,7 @@ package org.jetbrains.kotlin.gradle.utils
 
 internal typealias DeprecatedAndroidSourceSet = com.android.build.gradle.api.AndroidSourceSet
 internal typealias DeprecatedAndroidBaseVariant = com.android.build.gradle.api.BaseVariant
+internal typealias DeprecatedAndroidApplicationVariant = com.android.build.gradle.api.ApplicationVariant
 internal typealias DeprecatedAndroidLibraryVariant = com.android.build.gradle.api.LibraryVariant
 internal typealias DeprecatedAndroidTestVariant = com.android.build.gradle.api.TestVariant
 internal typealias DeprecatedAndroidUnitTestVariant = com.android.build.gradle.api.UnitTestVariant