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

Convert the rest of the project to intellij repo prepared in buildSrc

Browse Source
This commit is contained in:
Ilya Chernikov
2017-12-08 23:19:21 +01:00
committed by Vyacheslav Gerasimov
parent e23b1529b3
commit 7e21573cf4
55 changed files with 451 additions and 997 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/allopen/allopen-cli/build.gradle.kts
+3 -11
View File
@@ -3,13 +3,11 @@ description = "Kotlin AllOpen Compiler Plugin"
apply { plugin("kotlin") }
configureIntellijPlugin {
setExtraDependencies("intellij-core")
}
dependencies {
compileOnly(project(":compiler:plugin-api"))
compileOnly(project(":compiler:frontend"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
runtime(projectRuntimeJar(":kotlin-compiler"))
runtime(projectDist(":kotlin-stdlib"))
@@ -19,13 +17,7 @@ dependencies {
testCompile(projectTests(":compiler:tests-common"))
testCompile(commonDep("junit:junit"))
testRuntime(ideaSdkDeps("*.jar"))
}
afterEvaluate {
dependencies {
compileOnly(intellijCoreJar())
}
testRuntime(intellijDep())
}
sourceSets {
plugins/allopen/allopen-ide/build.gradle.kts
+3 -12
View File
@@ -5,10 +5,6 @@ apply { plugin("kotlin") }
jvmTarget = "1.6"
configureIntellijPlugin {
setPlugins("gradle", "maven")
}
dependencies {
compile(project(":kotlin-allopen-compiler-plugin"))
compile(project(":compiler:util"))
@@ -17,14 +13,9 @@ dependencies {
compile(project(":idea"))
compile(project(":idea:idea-jps-common"))
compile(project(":plugins:annotation-based-compiler-plugins-ide-support"))
}
afterEvaluate {
dependencies {
compileOnly(intellij { include("openapi.jar", "idea.jar") })
compileOnly(intellijPlugin("maven") { include("maven.jar") })
compileOnly(intellijPlugin("gradle") { include("gradle-tooling-api-*.jar", "gradle.jar") })
}
compileOnly(intellijDep()) { includeJars("openapi", "idea") }
compileOnly(intellijPluginDep("maven")) { includeJars("maven") }
compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-tooling-api-3.5", "gradle") }
}
sourceSets {
plugins/android-extensions/android-extensions-compiler/build.gradle.kts
+15 -11
View File
@@ -3,9 +3,8 @@ description = "Kotlin Android Extensions Compiler"
apply { plugin("kotlin") }
configureIntellijPlugin {
setExtraDependencies("intellij-core")
}
val robolectricClasspath by configurations.creating
val androidJar by configurations.creating
dependencies {
compile(project(":compiler:util"))
@@ -14,23 +13,22 @@ dependencies {
compile(project(":compiler:frontend.java"))
compile(project(":compiler:backend"))
compileOnly(project(":kotlin-android-extensions-runtime"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("asm-all") }
testCompile(project(":compiler:util"))
testCompile(project(":compiler:backend"))
testCompile(project(":compiler:cli"))
testCompile(project(":compiler:tests-common"))
testCompile(project(":kotlin-android-extensions-runtime"))
testCompile(projectTests(":compiler:tests-common"))
testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
testCompile(commonDep("junit:junit"))
testRuntime(ideaPluginDeps("idea-junit", "resources_en", plugin = "junit"))
testCompile(project(":kotlin-android-extensions-runtime"))
}
afterEvaluate {
dependencies {
compileOnly(intellijCoreJar())
compileOnly(intellij { include("asm-all.jar") })
}
testRuntime(intellijPluginDep("junit")) { includeJars("idea-junit", "resources_en") }
robolectricClasspath(commonDep("org.robolectric", "robolectric"))
androidJar(project(":custom-dependencies:android-sdk", configuration = "androidJar"))
}
sourceSets {
@@ -54,4 +52,10 @@ projectTest {
environment("ANDROID_EXTENSIONS_RUNTIME_CLASSES", getSourceSetsFrom(":kotlin-android-extensions-runtime")["main"].output.classesDirs.asPath)
dependsOnTaskIfExistsRec("dist", project = rootProject)
workingDir = rootDir
doFirst {
val androidPluginPath = File(intellijRootDir(), "plugins/android").canonicalPath
systemProperty("ideaSdk.androidPlugin.path", androidPluginPath)
systemProperty("robolectric.classpath", robolectricClasspath.asPath)
systemProperty("android.jar", androidJar.singleFile.canonicalPath)
}
}
plugins/android-extensions/android-extensions-idea/build.gradle.kts
+24 -19
View File
@@ -5,12 +5,8 @@ apply { plugin("kotlin") }
jvmTarget = "1.6"
configureIntellijPlugin {
setPlugins("android", "copyright", "coverage", "gradle", "Groovy", "IntelliLang",
"java-decompiler", "java-i18n", "junit", "maven", "properties", "testng")
}
val androidSdk by configurations.creating
val androidJar by configurations.creating
dependencies {
compile(project(":compiler:util"))
@@ -20,6 +16,9 @@ dependencies {
compile(project(":idea:idea-gradle"))
compile(project(":plugins:android-extensions-compiler"))
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") }
testCompile(project(":compiler:tests-common"))
testCompile(project(":compiler:cli"))
@@ -32,27 +31,32 @@ dependencies {
testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
testCompile(commonDep("junit:junit"))
testRuntime(projectDist(":kotlin-reflect"))
testCompile(intellijPluginDep("android")) { includeJars("android.jar", "android-common.jar", "sdk-common.jar", "sdk-tools.jar") }
testCompile(intellijPluginDep("Groovy")) { includeJars("Groovy.jar") }
testCompile(intellijDep()) { includeJars("extensions.jar") }
testRuntime(project(":idea:idea-jvm"))
testRuntime(project(":plugins:android-extensions-jps"))
testRuntime(project(":sam-with-receiver-ide-plugin"))
testRuntime(project(":noarg-ide-plugin"))
testRuntime(project(":allopen-ide-plugin"))
testRuntime(project(":plugins:lint"))
androidSdk(project(":custom-dependencies:android-sdk", configuration = "androidSdk"))
}
testRuntime(intellijDep())
testRuntime(intellijPluginDep("junit"))
testRuntime(intellijPluginDep("IntelliLang"))
testRuntime(intellijPluginDep("testng"))
testRuntime(intellijPluginDep("copyright"))
testRuntime(intellijPluginDep("properties"))
testRuntime(intellijPluginDep("java-i18n"))
testRuntime(intellijPluginDep("gradle"))
testRuntime(intellijPluginDep("Groovy"))
testRuntime(intellijPluginDep("coverage"))
testRuntime(intellijPluginDep("java-decompiler"))
testRuntime(intellijPluginDep("maven"))
testRuntime(intellijPluginDep("android"))
afterEvaluate {
dependencies {
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"))
}
androidSdk(project(":custom-dependencies:android-sdk", configuration = "androidSdk"))
androidJar(project(":custom-dependencies:android-sdk", configuration = "androidJar"))
}
sourceSets {
@@ -68,6 +72,7 @@ projectTest {
workingDir = rootDir
doFirst {
systemProperty("android.sdk", androidSdk.singleFile.canonicalPath)
systemProperty("android.jar", androidJar.singleFile.canonicalPath)
}
}
plugins/android-extensions/android-extensions-jps/build.gradle.kts
+16 -16
View File
@@ -1,34 +1,31 @@
apply { plugin("kotlin") }
configureIntellijPlugin {
setPlugins("android")
}
val androidSdk by configurations.creating
dependencies {
compile(project(":compiler:util"))
compile(project(":jps-plugin"))
compile(project(":plugins:android-extensions-compiler"))
compile(ideaPluginDeps("android-jps-plugin", plugin = "android", subdir = "lib/jps"))
compileOnly(intellijDep()) { includeJars("openapi", "jps-builders") }
compileOnly(intellijPluginDep("android")) { includeJars("jps/android-jps-plugin") }
compile(intellijPluginDep("android")) { includeJars("jps/android-jps-plugin") }
testCompile(projectTests(":jps-plugin"))
testCompile(project(":compiler:tests-common"))
testCompile(commonDep("junit:junit"))
testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
testCompile(projectTests(":kotlin-build-common"))
}
testCompileOnly(intellijDep()) { includeJars("openapi", "jps-builders") }
testCompileOnly(intellijDep("jps-build-test")) { includeJars("jps-build-test") }
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"))
testRuntime(intellijCoreJar())
testRuntime(intellij())
testRuntime(intellijExtra("jps-build-test"))
testRuntime(intellijExtra("jps-standalone"))
}
testRuntime(intellijPluginDep("android"))
testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
testRuntime(intellijDep())
testRuntime(intellijDep("jps-build-test"))
testRuntime(intellijDep("jps-standalone"))
androidSdk(project(":custom-dependencies:android-sdk", configuration = "androidSdk"))
}
sourceSets {
@@ -38,6 +35,9 @@ sourceSets {
projectTest {
workingDir = rootDir
doFirst {
systemProperty("android.sdk", androidSdk.singleFile.canonicalPath)
}
}
testsJar {}
plugins/annotation-based-compiler-plugins-ide-support/build.gradle.kts
+3 -12
View File
@@ -3,10 +3,6 @@ apply { plugin("kotlin") }
jvmTarget = "1.6"
configureIntellijPlugin {
setPlugins("gradle", "maven")
}
dependencies {
compile(project(":compiler:util"))
compile(project(":compiler:frontend"))
@@ -15,15 +11,10 @@ dependencies {
compile(project(":idea:idea-jps-common"))
compile(project(":idea:idea-gradle"))
compile(project(":idea:idea-maven"))
}
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", "extensions.jar", "jdom.jar", "util.jar") })
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") }
}
}
sourceSets {
"main" { projectDefault() }
plugins/kapt3/kapt3-compiler/build.gradle.kts
+5 -16
View File
@@ -3,10 +3,6 @@ description = "Annotation Processor for Kotlin"
apply { plugin("kotlin") }
configureIntellijPlugin {
setExtraDependencies("intellij-core")
}
dependencies {
compile(project(":compiler:util"))
compile(project(":compiler:cli"))
@@ -14,25 +10,18 @@ dependencies {
compile(project(":compiler:frontend"))
compile(project(":compiler:frontend.java"))
compile(project(":compiler:plugin-api"))
compileOnly(project(":kotlin-annotation-processing-runtime"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("asm-all") }
testCompile(project(":compiler:tests-common"))
testCompile(projectTests(":compiler:tests-common"))
compileOnly(project(":kotlin-annotation-processing-runtime"))
testCompile(commonDep("junit:junit"))
testCompile(intellijCoreDep()) { includeJars("intellij-core") }
testCompile(intellijDep()) { includeJars("idea", "idea_rt", "openapi") }
testCompile(project(":kotlin-annotation-processing-runtime"))
}
afterEvaluate {
dependencies {
compileOnly(intellijCoreJar())
compileOnly(intellij { include("asm-all.jar") })
testCompile(intellijCoreJar())
testCompile(intellij { include("idea.jar", "idea_rt.jar", "openapi.jar") })
}
}
sourceSets {
"main" { projectDefault() }
"test" { projectDefault() }
plugins/kapt3/kapt3-idea/build.gradle.kts
+3 -12
View File
@@ -3,24 +3,15 @@ apply { plugin("kotlin") }
jvmTarget = "1.6"
configureIntellijPlugin {
setPlugins("android", "gradle")
}
dependencies {
compile(projectDist(":kotlin-stdlib"))
compile(project(":compiler:frontend"))
compile(project(":idea")) { isTransitive = false }
compile(project(":idea:kotlin-gradle-tooling"))
compile(project(":kotlin-annotation-processing"))
}
afterEvaluate {
dependencies {
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") })
}
compileOnly(intellijDep()) { includeJars("openapi", "external-system-rt", "util") }
compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-core-3.5", "gradle-tooling-api-3.5", "gradle") }
compileOnly(intellijPluginDep("android")) { includeJars("android", "android-common", "sdklib", "sdk-common", "sdk-tools") }
}
sourceSets {
plugins/lint/build.gradle.kts
+5 -19
View File
@@ -4,31 +4,17 @@ apply {
plugin("java")
}
repositories {
androidDxJarRepo(project)
}
configureIntellijPlugin {
setExtraDependencies("intellij-core")
setPlugins("android")
}
dependencies {
compile(project(":compiler:frontend"))
compile(project(":idea"))
compile(project(":idea:idea-core"))
compile(project(":idea:idea-android"))
compile(project(":plugins:uast-kotlin"))
}
afterEvaluate {
dependencies {
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", "layoutlib-api.jar", "kxml2-*.jar")
})
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("util", "guava-21.0", "openapi", "idea", "asm-all") }
compileOnly(intellijPluginDep("android")) {
includeJars("android", "android-common", "sdklib", "sdk-common", "sdk-tools",
"repository", "lombok-ast-0.2.3", "layoutlib-api", "kxml2-2.3.0")
}
}
plugins/noarg/noarg-cli/build.gradle.kts
+2 -11
View File
@@ -3,16 +3,14 @@ description = "Kotlin NoArg Compiler Plugin"
apply { plugin("kotlin") }
configureIntellijPlugin {
setExtraDependencies("intellij-core")
}
dependencies {
compileOnly(project(":compiler:frontend"))
compileOnly(project(":compiler:frontend.java"))
compileOnly(project(":compiler:backend"))
compileOnly(project(":compiler:util"))
compileOnly(project(":compiler:plugin-api"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("asm-all") }
runtime(projectRuntimeJar(":kotlin-compiler"))
runtime(projectDist(":kotlin-stdlib"))
@@ -25,13 +23,6 @@ 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 -12
View File
@@ -5,10 +5,6 @@ apply { plugin("kotlin") }
jvmTarget = "1.6"
configureIntellijPlugin {
setPlugins("gradle", "maven")
}
dependencies {
compile(project(":kotlin-noarg-compiler-plugin"))
compile(project(":compiler:util"))
@@ -19,15 +15,10 @@ dependencies {
compile(project(":idea"))
compile(project(":idea:idea-jps-common"))
compile(project(":plugins:annotation-based-compiler-plugins-ide-support"))
}
afterEvaluate {
dependencies {
compileOnly(intellij { include("openapi.jar", "idea.jar") })
compileOnly(intellijPlugin("maven") { include("maven.jar") })
compileOnly(intellijPlugin("gradle") { include("gradle-tooling-api-*.jar", "gradle.jar") })
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") }
}
}
sourceSets {
"main" { projectDefault() }
plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts
+2 -11
View File
@@ -3,14 +3,11 @@ description = "Kotlin SamWithReceiver Compiler Plugin"
apply { plugin("kotlin") }
configureIntellijPlugin {
setExtraDependencies("intellij-core")
}
dependencies {
compileOnly(project(":compiler:frontend"))
compileOnly(project(":compiler:frontend.java"))
compileOnly(project(":compiler:plugin-api"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
runtime(projectRuntimeJar(":kotlin-compiler"))
runtime(projectDist(":kotlin-stdlib"))
runtime(projectDist(":kotlin-reflect"))
@@ -20,13 +17,7 @@ dependencies {
testCompile(project(":compiler:tests-common"))
testCompile(projectTests(":compiler:tests-common"))
testCompile(commonDep("junit:junit"))
testRuntime(ideaSdkDeps("*.jar"))
}
afterEvaluate {
dependencies {
compileOnly(intellijCoreJar())
}
testRuntime(intellijDep())
}
sourceSets {
plugins/source-sections/source-sections-compiler/build.gradle.kts
+4 -12
View File
@@ -3,15 +3,13 @@ description = "Kotlin SourceSections Compiler Plugin"
apply { plugin("kotlin") }
configureIntellijPlugin {
setExtraDependencies("intellij-core")
}
dependencies {
compileOnly(project(":compiler:frontend"))
compileOnly(project(":compiler:frontend.script"))
compileOnly(project(":compiler:plugin-api"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testCompile(project(":compiler:frontend"))
testCompile(project(":compiler:frontend.script"))
testCompile(project(":compiler:plugin-api"))
@@ -23,17 +21,11 @@ dependencies {
testCompile(project(":kotlin-daemon-client"))
testCompile(projectTests(":compiler:tests-common"))
testCompile(commonDep("junit:junit"))
testCompile(intellijCoreDep()) { includeJars("intellij-core") }
testCompile(intellijDep()) { includeJars("idea", "idea_rt", "openapi", "log4j", "jdom", "jps-model") }
testRuntime(projectDist(":kotlin-reflect"))
}
afterEvaluate {
dependencies {
compileOnly(intellijCoreJar())
testCompile(intellijCoreJar())
testCompile(intellij { include("idea.jar", "idea_rt.jar", "openapi.jar", "log4j.jar", "jdom.jar", "jps-model.jar") })
}
}
sourceSets {
"main" { projectDefault() }
"test" { projectDefault() }
plugins/uast-kotlin-idea/build.gradle.kts
+1 -8
View File
@@ -1,8 +1,6 @@
apply { plugin("kotlin") }
configureIntellijPlugin()
dependencies {
compile(projectDist(":kotlin-stdlib"))
compile(project(":core:util.runtime"))
@@ -10,12 +8,7 @@ dependencies {
compile(project(":compiler:frontend.java"))
compile(project(":idea:ide-common"))
compile(project(":plugins:uast-kotlin"))
}
afterEvaluate {
dependencies {
compileOnly(intellij { include("openapi.jar", "util.jar") })
}
compileOnly(intellijDep()) { includeJars("openapi", "util") }
}
sourceSets {
plugins/uast-kotlin/build.gradle.kts
+10 -14
View File
@@ -1,10 +1,6 @@
apply { plugin("kotlin") }
configureIntellijPlugin {
setPlugins("junit", "gradle", "Groovy", "properties")
}
dependencies {
compile(projectDist(":kotlin-stdlib"))
compile(project(":core:util.runtime"))
@@ -12,12 +8,16 @@ dependencies {
compile(project(":compiler:frontend"))
compile(project(":compiler:frontend.java"))
compile(project(":compiler:light-classes"))
compileOnly(intellijDep()) { includeJars("openapi", "idea", "util", "extensions", "asm-all") }
testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
testCompile(projectTests(":compiler:tests-common"))
testCompile(commonDep("junit:junit"))
testCompile(project(":compiler:util"))
testCompile(project(":compiler:cli"))
testCompile(project(":idea:idea-test-framework"))
testCompileOnly(intellijDep()) { includeJars("idea_rt") }
testRuntime(projectDist(":kotlin-reflect"))
testRuntime(project(":idea:idea-android"))
testRuntime(project(":idea:idea-gradle"))
@@ -26,16 +26,12 @@ dependencies {
testRuntime(project(":allopen-ide-plugin"))
testRuntime(project(":noarg-ide-plugin"))
testRuntime(project(":plugins:android-extensions-ide"))
}
afterEvaluate {
dependencies {
compileOnly(intellij { include("openapi.jar", "idea.jar", "util.jar", "extensions.jar", "asm-all.jar") })
testCompileOnly(intellij { include("idea_rt.jar") })
testRuntime(project(":plugins:kapt3-idea"))
testRuntime(intellij())
testRuntime(intellijPlugins("junit", "gradle", "Groovy", "properties"))
}
testRuntime(project(":plugins:kapt3-idea"))
testRuntime(intellijDep())
testRuntime(intellijPluginDep("junit"))
testRuntime(intellijPluginDep("gradle"))
testRuntime(intellijPluginDep("Groovy"))
testRuntime(intellijPluginDep("properties"))
}
sourceSets {