azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set Android Gradle Plugin dependency version to 3.4.0.

Browse Source 
This is required to get method deprecations and new proposed methods.
This commit is contained in:
Yahor Berdnikau
2021-04-12 11:28:53 +02:00
committed by TeamCityServer
parent f59b49db68
commit 9100be4566
6 changed files with 262 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts
+1 -1
View File
@@ -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 {
libraries/tools/kotlin-gradle-plugin/build.gradle.kts
+4 -4
View File
@@ -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())
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+3 -3
View File
@@ -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<out AbstractCompile>,
@@ -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 ->
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/Android25ProjectHandler.kt
+1 -1
View File
@@ -40,7 +40,7 @@ class Android25ProjectHandler(
override fun wireKotlinTasks(
project: Project,
compilation: KotlinJvmAndroidCompilation,
androidPlugin: BasePlugin,
androidPlugin: BasePlugin<*>,
androidExt: BaseExtension,
variantData: BaseVariant,
javaTask: TaskProvider<out AbstractCompile>,
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/AndroidGradleWrapper.kt
+1 -1
View File
@@ -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")
}
}