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

Build changes to support Android Studio

Browse Source
This commit is contained in:
Dmitry Jemerov
2017-12-28 19:41:36 +01:00
committed by Vyacheslav Gerasimov
parent b2ca302bf7
commit e83845ea72
17 changed files with 118 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-android/build.gradle.kts
+2 -1
View File
@@ -1,3 +1,4 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
apply { plugin("kotlin") }
@@ -21,7 +22,7 @@ dependencies {
compile(androidDxJar())
compileOnly(intellijDep()) { includeJars("openapi", "idea", "extensions", "util", "guava-21.0") }
compileOnly(intellijDep()) { includeJars("openapi", "idea", "extensions", "util", "guava-21.0", "android-base-common", rootProject = rootProject) }
compileOnly(intellijPluginDep("android")) {
includeJars("android", "android-common", "sdk-common", "sdklib", "sdk-tools", "layoutlib-api")
}
idea/idea-android/idea-android-output-parser/build.gradle.kts
+2 -2
View File
@@ -4,8 +4,8 @@ apply { plugin("kotlin") }
dependencies {
compile(project(":compiler:util"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("guava-21.0") }
compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-tooling-api-3.5") }
compileOnly(intellijDep()) { includeJars("guava-21.0", "android-base-common", rootProject = rootProject) }
compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-tooling-api", rootProject = rootProject) }
compileOnly(intellijPluginDep("android")) { includeJars("android", "android-common", "sdk-common") }
}