diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 26885c2e4b2..4a3e869134d 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -59,6 +59,12 @@
+
+
+
+
+
+
@@ -69,6 +75,12 @@
+
+
+
+
+
+
@@ -195,6 +207,12 @@
+
+
+
+
+
+
@@ -225,6 +243,12 @@
+
+
+
+
+
+
@@ -255,6 +279,12 @@
+
+
+
+
+
+
@@ -285,6 +315,12 @@
+
+
+
+
+
+
@@ -311,6 +347,12 @@
+
+
+
+
+
+
@@ -341,6 +383,12 @@
+
+
+
+
+
+
@@ -371,6 +419,12 @@
+
+
+
+
+
+
@@ -381,6 +435,12 @@
+
+
+
+
+
+
@@ -401,6 +461,12 @@
+
+
+
+
+
+
@@ -421,6 +487,12 @@
+
+
+
+
+
+
@@ -441,6 +513,12 @@
+
+
+
+
+
+
@@ -481,6 +559,12 @@
+
+
+
+
+
+
@@ -491,6 +575,12 @@
+
+
+
+
+
+
@@ -527,6 +617,12 @@
+
+
+
+
+
+
@@ -557,6 +653,12 @@
+
+
+
+
+
+
@@ -587,6 +689,12 @@
+
+
+
+
+
+
@@ -607,6 +715,12 @@
+
+
+
+
+
+
@@ -627,6 +741,12 @@
+
+
+
+
+
+
@@ -647,6 +767,12 @@
+
+
+
+
+
+
@@ -697,6 +823,12 @@
+
+
+
+
+
+
@@ -717,6 +849,12 @@
+
+
+
+
+
+
@@ -727,6 +865,12 @@
+
+
+
+
+
+
@@ -757,6 +901,12 @@
+
+
+
+
+
+
@@ -817,6 +967,12 @@
+
+
+
+
+
+
@@ -857,6 +1013,12 @@
+
+
+
+
+
+
@@ -1253,6 +1415,12 @@
+
+
+
+
+
+
@@ -1461,6 +1629,12 @@
+
+
+
+
+
+
@@ -1665,6 +1839,12 @@
+
+
+
+
+
+
@@ -1675,6 +1855,12 @@
+
+
+
+
+
+
@@ -2007,6 +2193,12 @@
+
+
+
+
+
+
@@ -2055,6 +2247,12 @@
+
+
+
+
+
+
@@ -2089,6 +2287,12 @@
+
+
+
+
+
+
@@ -2935,6 +3139,12 @@
+
+
+
+
+
+
@@ -8895,6 +9105,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -8905,6 +9127,12 @@
+
+
+
+
+
+
@@ -9898,8 +10126,12 @@
-
-
+
+
+
+
+
+
@@ -10322,6 +10554,12 @@
+
+
+
+
+
+
@@ -10610,6 +10848,12 @@
+
+
+
+
+
+
@@ -10738,6 +10982,12 @@
+
+
+
+
+
+
diff --git a/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts
index c7ffbcbf555..45108aae871 100644
--- a/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts
@@ -15,7 +15,7 @@ dependencies {
implementation(project(":native:kotlin-native-utils"))
compileOnly(gradleApi())
- compileOnly("com.android.tools.build:gradle:0.4.2")
+ compileOnly("com.android.tools.build:gradle:3.4.0")
}
pill {
diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
index ba9e92f08b9..eb9b8ac6eb3 100644
--- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts
@@ -63,10 +63,10 @@ dependencies {
exclude(group = "*")
}
- compileOnly("com.android.tools.build:gradle:2.0.0")
- compileOnly("com.android.tools.build:gradle-core:2.0.0")
- compileOnly("com.android.tools.build:builder:2.0.0")
- compileOnly("com.android.tools.build:builder-model:2.0.0")
+ compileOnly("com.android.tools.build:gradle:3.4.0")
+ compileOnly("com.android.tools.build:gradle-api:3.4.0")
+ compileOnly("com.android.tools.build:builder:3.4.0")
+ compileOnly("com.android.tools.build:builder-model:3.4.0")
compileOnly("org.codehaus.groovy:groovy-all:2.4.12")
compileOnly(gradleApi())
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
index 89e7fe99d44..d7d6e7c8680 100755
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
@@ -766,7 +766,7 @@ abstract class AbstractAndroidProjectHandler(private val kotlinConfigurationTool
protected abstract fun wireKotlinTasks(
project: Project,
compilation: KotlinJvmAndroidCompilation,
- androidPlugin: BasePlugin,
+ androidPlugin: BasePlugin<*>,
androidExt: BaseExtension,
variantData: BaseVariant,
javaTask: TaskProvider,
@@ -795,7 +795,7 @@ abstract class AbstractAndroidProjectHandler(private val kotlinConfigurationTool
val plugin by lazy {
androidPluginIds.asSequence()
- .mapNotNull { project.plugins.findPlugin(it) as? BasePlugin }
+ .mapNotNull { project.plugins.findPlugin(it) as? BasePlugin<*> }
.firstOrNull()
?: throw InvalidPluginException("'kotlin-android' expects one of the Android Gradle " +
"plugins to be applied to the project:\n\t" +
@@ -971,7 +971,7 @@ abstract class AbstractAndroidProjectHandler(private val kotlinConfigurationTool
compilation: KotlinJvmAndroidCompilation,
project: Project,
androidExt: BaseExtension,
- androidPlugin: BasePlugin
+ androidPlugin: BasePlugin<*>
) {
getTestedVariantData(variantData)?.let { testedVariant ->
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/Android25ProjectHandler.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/Android25ProjectHandler.kt
index db83e01f39a..a6497c6081a 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/Android25ProjectHandler.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/Android25ProjectHandler.kt
@@ -40,7 +40,7 @@ class Android25ProjectHandler(
override fun wireKotlinTasks(
project: Project,
compilation: KotlinJvmAndroidCompilation,
- androidPlugin: BasePlugin,
+ androidPlugin: BasePlugin<*>,
androidExt: BaseExtension,
variantData: BaseVariant,
javaTask: TaskProvider,
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/AndroidGradleWrapper.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/AndroidGradleWrapper.kt
index de23f28a3b6..904ea8db2ea 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/AndroidGradleWrapper.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/AndroidGradleWrapper.kt
@@ -13,7 +13,7 @@ import java.lang.reflect.Method
import java.lang.reflect.Modifier
object AndroidGradleWrapper {
- fun getRuntimeJars(basePlugin: BasePlugin, baseExtension: BaseExtension): Any? {
+ fun getRuntimeJars(basePlugin: BasePlugin<*>, baseExtension: BaseExtension): Any? {
return basePlugin("getRuntimeJarList") ?: baseExtension("getBootClasspath") ?: basePlugin("getBootClasspath")
}
}