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

Make all dependencies to idea sdk intransitive

Browse Source
This commit is contained in:
Ilya Chernikov
2017-11-24 17:42:06 +01:00
committed by Vyacheslav Gerasimov
parent e76cd802d8
commit a4f28cd94f
65 changed files with 341 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/allopen/allopen-ide/build.gradle.kts
+3 -3
View File
@@ -21,9 +21,9 @@ dependencies {
afterEvaluate {
dependencies {
compile(intellij { include("openapi.jar", "idea.jar") })
compile(intellijPlugin("maven") { include("maven.jar") })
compile(intellijPlugin("gradle") { include("gradle-tooling-api-*.jar", "gradle.jar") })
compileOnly(intellij { include("openapi.jar", "idea.jar") })
compileOnly(intellijPlugin("maven") { include("maven.jar") })
compileOnly(intellijPlugin("gradle") { include("gradle-tooling-api-*.jar", "gradle.jar") })
}
}
plugins/android-extensions/android-extensions-compiler/build.gradle.kts
+2 -1
View File
@@ -28,7 +28,8 @@ dependencies {
afterEvaluate {
dependencies {
compile(intellijCoreJar())
compileOnly(intellijCoreJar())
compileOnly(intellij { include("asm-all.jar") })
}
}
plugins/android-extensions/android-extensions-idea/build.gradle.kts
+6 -2
View File
@@ -40,8 +40,12 @@ dependencies {
afterEvaluate {
dependencies {
compile(intellijPlugin("android") { include("android.jar", "android-common.jar", "sdk-common.jar", "sdk-tools.jar") })
compile(intellijPlugin("Groovy") { include("Groovy.jar") })
compileOnly(intellijPlugin("android") { include("android.jar", "android-common.jar", "sdk-common.jar", "sdk-tools.jar") })
compileOnly(intellijPlugin("Groovy") { include("Groovy.jar") })
compileOnly(intellij { include("extensions.jar", "openapi.jar", "util.jar", "idea.jar")} )
testCompile(intellijPlugin("android") { include("android.jar", "android-common.jar", "sdk-common.jar", "sdk-tools.jar") })
testCompile(intellijPlugin("Groovy") { include("Groovy.jar") })
testCompile(intellij { include("extensions.jar")} )
testRuntime(intellij())
testRuntime(intellijPlugins("junit", "IntelliLang", "testng", "copyright", "properties", "java-i18n",
"gradle", "Groovy", "coverage", "java-decompiler", "maven", "android"))
plugins/android-extensions/android-extensions-jps/build.gradle.kts
+1
View File
@@ -20,6 +20,7 @@ dependencies {
afterEvaluate {
dependencies {
compileOnly(intellij { include("openapi.jar", "jps-builders.jar") })
compile(intellijPlugin("android") { include("**/android-jps-plugin.jar") })
testCompileOnly(intellijExtra("jps-build-test") { include("jps-build-test.jar") } )
testRuntime(intellijPlugin("android"))
plugins/annotation-based-compiler-plugins-ide-support/build.gradle.kts
+1 -1
View File
@@ -21,7 +21,7 @@ afterEvaluate {
dependencies {
compileOnly(intellijPlugin("maven") { include("maven.jar", "maven-server-api.jar") })
compileOnly(intellijPlugin("gradle") { include("gradle-tooling-api-*.jar", "gradle.jar") })
compileOnly(intellij { include("openapi.jar", "idea.jar") })
compileOnly(intellij { include("openapi.jar", "idea.jar", "extensions.jar", "jdom.jar", "util.jar") })
}
}
plugins/kapt3/kapt3-compiler/build.gradle.kts
+6 -1
View File
@@ -3,7 +3,9 @@ description = "Annotation Processor for Kotlin"
apply { plugin("kotlin") }
configureIntellijPlugin()
configureIntellijPlugin {
setExtraDependencies("intellij-core")
}
dependencies {
compile(project(":compiler:util"))
@@ -24,6 +26,9 @@ dependencies {
afterEvaluate {
dependencies {
compileOnly(intellijCoreJar())
compileOnly(intellij { include("asm-all.jar") })
testCompile(intellijCoreJar())
testCompile(intellij { include("idea.jar", "idea_rt.jar", "openapi.jar") })
}
}
plugins/kapt3/kapt3-idea/build.gradle.kts
+3 -3
View File
@@ -17,9 +17,9 @@ dependencies {
afterEvaluate {
dependencies {
compile(intellij { include("openapi.jar", "external-system-rt.jar") })
compile(intellijPlugin("gradle") { include("gradle-core-*.jar", "gradle-tooling-api-*.jar", "gradle.jar") })
compile(intellijPlugin("android") { include("android.jar", "android-common.jar", "sdklib.jar", "sdk-common.jar", "sdk-tools.jar") })
compileOnly(intellij { include("openapi.jar", "external-system-rt.jar", "util.jar") })
compileOnly(intellijPlugin("gradle") { include("gradle-core-*.jar", "gradle-tooling-api-*.jar", "gradle.jar") })
compileOnly(intellijPlugin("android") { include("android.jar", "android-common.jar", "sdklib.jar", "sdk-common.jar", "sdk-tools.jar") })
}
}
plugins/lint/build.gradle.kts
+4 -4
View File
@@ -19,11 +19,11 @@ dependencies {
afterEvaluate {
dependencies {
compile(intellijCoreJar())
compile(intellij { include("util.jar", "guava-*.jar") })
compile(intellijPlugin("android") {
compileOnly(intellijCoreJar())
compileOnly(intellij { include("util.jar", "guava-*.jar", "openapi.jar", "idea.jar", "asm-all.jar") })
compileOnly(intellijPlugin("android") {
include("android.jar", "android-common.jar", "sdklib.jar", "sdk-common.jar", "sdk-tools.jar",
"repository.jar", "lombok-ast-*.jar")
"repository.jar", "lombok-ast-*.jar", "layoutlib-api.jar", "kxml2-*.jar")
})
}
}
plugins/noarg/noarg-cli/build.gradle.kts
+11
View File
@@ -3,6 +3,10 @@ description = "Kotlin NoArg Compiler Plugin"
apply { plugin("kotlin") }
configureIntellijPlugin {
setExtraDependencies("intellij-core")
}
dependencies {
compileOnly(project(":compiler:frontend"))
compileOnly(project(":compiler:frontend.java"))
@@ -21,6 +25,13 @@ dependencies {
testRuntime(ideaSdkDeps("*.jar"))
}
afterEvaluate {
dependencies {
compileOnly(intellijCoreJar())
compileOnly(intellij { include("asm-all.jar") })
}
}
sourceSets {
"main" { projectDefault() }
"test" { projectDefault() }
plugins/noarg/noarg-ide/build.gradle.kts
+3 -3
View File
@@ -23,9 +23,9 @@ dependencies {
afterEvaluate {
dependencies {
compile(intellij { include("openapi.jar", "idea.jar") })
compile(intellijPlugin("maven") { include("maven.jar") })
compile(intellijPlugin("gradle") { include("gradle-tooling-api-*.jar", "gradle.jar") })
compileOnly(intellij { include("openapi.jar", "idea.jar") })
compileOnly(intellijPlugin("maven") { include("maven.jar") })
compileOnly(intellijPlugin("gradle") { include("gradle-tooling-api-*.jar", "gradle.jar") })
}
}
plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts
+10
View File
@@ -3,6 +3,10 @@ description = "Kotlin SamWithReceiver Compiler Plugin"
apply { plugin("kotlin") }
configureIntellijPlugin {
setExtraDependencies("intellij-core")
}
dependencies {
compileOnly(project(":compiler:frontend"))
compileOnly(project(":compiler:frontend.java"))
@@ -19,6 +23,12 @@ dependencies {
testRuntime(ideaSdkDeps("*.jar"))
}
afterEvaluate {
dependencies {
compileOnly(intellijCoreJar())
}
}
sourceSets {
"main" { projectDefault() }
"test" { projectDefault() }
plugins/source-sections/source-sections-compiler/build.gradle.kts
+6 -1
View File
@@ -3,7 +3,10 @@ description = "Kotlin SourceSections Compiler Plugin"
apply { plugin("kotlin") }
configureIntellijPlugin()
configureIntellijPlugin {
setExtraDependencies("intellij-core")
}
dependencies {
compileOnly(project(":compiler:frontend"))
@@ -25,6 +28,8 @@ dependencies {
afterEvaluate {
dependencies {
compileOnly(intellijCoreJar())
testCompile(intellijCoreJar())
testCompile(intellij { include("idea.jar", "idea_rt.jar", "openapi.jar") })
}
}
plugins/uast-kotlin-idea/build.gradle.kts
+8
View File
@@ -1,6 +1,8 @@
apply { plugin("kotlin") }
configureIntellijPlugin()
dependencies {
compile(projectDist(":kotlin-stdlib"))
compile(project(":core:util.runtime"))
@@ -10,6 +12,12 @@ dependencies {
compile(project(":plugins:uast-kotlin"))
}
afterEvaluate {
dependencies {
compileOnly(intellij { include("openapi.jar", "util.jar") })
}
}
sourceSets {
"main" { projectDefault() }
"test" {}
plugins/uast-kotlin/build.gradle.kts
+5 -4
View File
@@ -32,12 +32,13 @@ dependencies {
afterEvaluate {
dependencies {
compileOnly(intellij { include("openapi.jar", "idea.jar") })
compileOnly(intellij { include("openapi.jar", "idea.jar", "util.jar", "extensions.jar", "asm-all.jar") })
compileOnly(intellijPlugins("junit", "gradle", "Groovy", "android",
"maven", // TODO: check whether it works in AS (it was marked optional before
"properties"))
testCompileOnly(intellij { include("idea_rt.jar") })
testCompile(intellijPlugins("junit", "gradle", "Groovy", "android", "maven", "properties"))
testRuntime(intellij())
compile(intellijPlugins("junit", "gradle", "Groovy", "android",
"maven", // TODO: check whether it works in AS (it was marked optional before
"properties"))
}
}