From 82690fe6b352d1138617ffdfaa3a24373840f7d9 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Mon, 18 Sep 2017 11:51:45 +0200 Subject: [PATCH] Switch to new bootstrap, fix after rebase --- gradle.properties | 2 +- .../android-extensions/android-extensions-idea/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9f2147c07fb..2f267af608c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ org.gradle.configureondemand=false org.gradle.jvmargs=-Xmx1000m -XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled systemProp.bootstrap.kotlin.repo=https://dl.bintray.com/kotlin/kotlin-dev -systemProp.bootstrap.kotlin.version=1.1.50-dev-1182 +systemProp.bootstrap.kotlin.version=1.1.50-dev-1451 #signingRequired=true diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts index f3977071a6d..11e7316c18c 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { compile(project(":idea")) compile(project(":idea:idea-gradle")) compile(project(":plugins:android-extensions-compiler")) - compile(ideaPluginDeps("android", "sdk-tools", "sdk-common", plugin = "android")) + compile(ideaPluginDeps("android", "android-common", "sdk-tools", "sdk-common", plugin = "android")) compile(ideaPluginDeps("Groovy", plugin = "Groovy")) testCompile(project(":compiler.tests-common")) testCompile(project(":compiler:cli"))