From be471b29c40e48225dd0cadc76b1cdef3de8f819 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 11 Apr 2019 19:47:31 +0300 Subject: [PATCH] Use bunch-specific version of gson in kotlin-gradle-plugin While kotlin-gradle-plugin is not built for different bunches, bad version still fails Gradle synchronize action in IDE. --- libraries/tools/kotlin-gradle-plugin/build.gradle.kts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts index 30db242b00b..ae6c5cbb03c 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts @@ -46,8 +46,8 @@ dependencies { compileOnly(project(":kotlin-annotation-processing-gradle")) compileOnly(project(":kotlin-scripting-compiler-impl")) - compile("com.google.code.gson:gson:2.8.5") - + compile("com.google.code.gson:gson:${rootProject.extra["versions.jar.gson"]}") + 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") @@ -66,8 +66,7 @@ dependencies { runtime(project(":kotlin-reflect")) jarContents(compileOnly(intellijDep()) { - includeJars("serviceMessages", "gson-2.8.5") - includeJars("asm-all", rootProject = rootProject) + includeJars("asm-all", "serviceMessages", "gson", rootProject = rootProject) }) // com.android.tools.build:gradle has ~50 unneeded transitive dependencies