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
plugins/allopen/allopen-ide/build.gradle.kts
+2 -2
View File
@@ -15,8 +15,8 @@ dependencies {
compile(project(":idea:idea-jps-common"))
compile(project(":plugins:annotation-based-compiler-plugins-ide-support"))
compileOnly(intellijDep()) { includeJars("openapi", "idea") }
compileOnly(intellijPluginDep("maven")) { includeJars("maven") }
compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-tooling-api-3.5", "gradle") }
excludeInAndroidStudio(rootProject) { compileOnly(intellijPluginDep("maven")) { includeJars("maven") } }
compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-tooling-api", "gradle", rootProject = rootProject) }
}
sourceSets {
plugins/android-extensions/android-extensions-idea/build.gradle.kts
+1 -1
View File
@@ -22,7 +22,7 @@ dependencies {
compileOnly(project(":kotlin-android-extensions-runtime"))
compileOnly(intellijPluginDep("android")) { includeJars("android.jar", "android-common.jar", "sdk-common.jar", "sdk-tools.jar") }
compileOnly(intellijPluginDep("Groovy")) { includeJars("Groovy.jar") }
compileOnly(intellijDep()) { includeJars("extensions.jar", "openapi.jar", "util.jar", "idea.jar") }
compileOnly(intellijDep()) { includeJars("extensions.jar", "openapi.jar", "util.jar", "idea.jar", "android-base-common.jar", rootProject = rootProject) }
testCompile(project(":compiler:tests-common"))
testCompile(project(":compiler:cli"))
plugins/annotation-based-compiler-plugins-ide-support/build.gradle.kts
+4 -4
View File
@@ -12,10 +12,10 @@ dependencies {
compile(project(":idea:idea-jps-common"))
compile(project(":idea:idea-gradle"))
compile(project(":idea:idea-maven"))
compileOnly(intellijPluginDep("maven")) { includeJars("maven.jar", "maven-server-api.jar") }
compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-tooling-api-3.5.jar", "gradle.jar") }
compileOnly(intellijDep()) { includeJars("openapi.jar", "idea.jar", "extensions.jar", "jdom.jar", "util.jar") }
}
excludeInAndroidStudio(rootProject) { compileOnly(intellijPluginDep("maven")) { includeJars("maven.jar", "maven-server-api.jar") } }
compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-tooling-api", "gradle", rootProject = rootProject) }
compileOnly(intellijDep()) { includeJars("openapi.jar", "idea.jar", "extensions.jar", "jdom.jar", "util.jar") }
}
sourceSets {
"main" { projectDefault() }
plugins/kapt3/kapt3-idea/build.gradle.kts
+1 -1
View File
@@ -10,7 +10,7 @@ dependencies {
compile(project(":idea:kotlin-gradle-tooling"))
compile(project(":kotlin-annotation-processing"))
compileOnly(intellijDep()) { includeJars("openapi", "external-system-rt", "util") }
compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-core-3.5", "gradle-tooling-api-3.5", "gradle") }
compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-core", "gradle-tooling-api", "gradle", rootProject = rootProject) }
compileOnly(intellijPluginDep("android")) { includeJars("android", "android-common", "sdklib", "sdk-common", "sdk-tools") }
}
plugins/noarg/noarg-ide/build.gradle.kts
+3 -3
View File
@@ -16,9 +16,9 @@ dependencies {
compile(project(":idea:idea-jps-common"))
compile(project(":plugins:annotation-based-compiler-plugins-ide-support"))
compileOnly(intellijDep()) { includeJars("openapi.jar", "idea.jar") }
compileOnly(intellijPluginDep("maven")) { includeJars("maven.jar") }
compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-tooling-api-3.5.jar", "gradle.jar") }
}
excludeInAndroidStudio(rootProject) { compileOnly(intellijPluginDep("maven")) { includeJars("maven.jar") } }
compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-tooling-api", "gradle", rootProject = rootProject) }
}
sourceSets {
"main" { projectDefault() }