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

Continue switching projects to improved dsl: sourceSets and test running

Browse Source
This commit is contained in:
Ilya Chernikov
2017-08-21 20:53:48 +02:00
parent 336e24b837
commit deda50dbbb
76 changed files with 372 additions and 614 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/allopen/allopen-cli/build.gradle.kts
+1 -1
View File
@@ -15,7 +15,7 @@ dependencies {
sourceSets {
"main" { projectDefault() }
"test" { none() }
"test" {}
}
val jar = runtimeJar {
plugins/allopen/allopen-ide/build.gradle.kts
+4 -2
View File
@@ -17,8 +17,10 @@ dependencies {
}
configureKotlinProjectSourcesDefault()
configureKotlinProjectNoTests()
sourceSets {
"main" { projectDefault() }
"test" {}
}
val jar: Jar by tasks
plugins/android-extensions/android-extensions-compiler/build.gradle.kts
+1 -6
View File
@@ -4,7 +4,6 @@ description = "Kotlin Android Extensions Compiler"
apply { plugin("kotlin") }
dependencies {
val compile by configurations
compile(ideaSdkCoreDeps("intellij-core"))
compile(project(":compiler:util"))
compile(project(":compiler:plugin-api"))
@@ -14,16 +13,12 @@ dependencies {
compile(ideaPluginDeps("layoutlib", plugin = "android"))
}
configureKotlinProjectSources("android-extensions-compiler/src", "android-extensions-runtime/src", sourcesBaseDir = File(rootDir, "plugins", "android-extensions"))
configureKotlinProjectResourcesDefault(sourcesBaseDir = File(rootDir, "plugins", "android-extensions", "android-extensions-compiler", "src"))
configureKotlinProjectNoTests()
sourceSets {
"main" {
projectDefault()
java.srcDir("../android-extensions-runtime/src")
}
"test" { none() }
"test" {}
}
runtimeJar ()
plugins/android-extensions/android-extensions-idea/build.gradle.kts
+5 -7
View File
@@ -43,17 +43,15 @@ dependencies {
testRuntime(ideaPluginDeps("*.jar", plugin = "android"))
}
configureKotlinProjectSourcesDefault()
configureKotlinProjectTestsDefault()
sourceSets {
"main" { projectDefault() }
"test" { projectDefault() }
}
testsJar {}
tasks.withType<Test> {
projectTest {
workingDir = rootDir
systemProperty("idea.is.unit.test", "true")
environment("NO_FS_ROOTS_ACCESS_CHECK", "true")
ignoreFailures = true
}
val jar: Jar by tasks
plugins/android-extensions/android-extensions-jps/build.gradle.kts
+4 -3
View File
@@ -2,13 +2,14 @@
apply { plugin("kotlin") }
dependencies {
val compile by configurations
compile(project(":compiler:util"))
compile(project(":jps-plugin"))
compile(project(":android-extensions-compiler"))
compile(ideaPluginDeps("android-jps-plugin", plugin = "android", subdir = "lib/jps"))
}
configureKotlinProjectSourcesDefault()
configureKotlinProjectNoTests()
sourceSets {
"main" { projectDefault() }
"test" {}
}
plugins/annotation-based-compiler-plugins-ide-support/build.gradle.kts
+4 -7
View File
@@ -2,11 +2,6 @@
apply { plugin("kotlin") }
dependencies {
val compile by configurations
val compileOnly by configurations
val testCompile by configurations
val testCompileOnly by configurations
val testRuntime by configurations
compile(project(":compiler:util"))
compile(project(":compiler:frontend"))
compile(project(":compiler:cli-common"))
@@ -17,6 +12,8 @@ dependencies {
compileOnly(ideaSdkDeps("openapi", "idea"))
}
configureKotlinProjectSourcesDefault()
configureKotlinProjectNoTests()
sourceSets {
"main" { projectDefault() }
"test" {}
}
plugins/kapt3/build.gradle.kts
+5 -11
View File
@@ -2,11 +2,6 @@
apply { plugin("kotlin") }
dependencies {
val compile by configurations
val compileOnly by configurations
val testCompile by configurations
val testCompileOnly by configurations
val testRuntime by configurations
compile(project(":compiler:util"))
compile(project(":compiler:cli"))
compile(project(":compiler:backend"))
@@ -17,15 +12,14 @@ dependencies {
testCompile(commonDep("junit:junit"))
}
configureKotlinProjectSourcesDefault()
configureKotlinProjectTestsDefault()
sourceSets {
"main" { projectDefault() }
"test" { projectDefault() }
}
testsJar {}
tasks.withType<Test> {
projectTest {
workingDir = rootDir
systemProperty("idea.is.unit.test", "true")
environment("NO_FS_ROOTS_ACCESS_CHECK", "true")
ignoreFailures = true
}
plugins/lint/build.gradle.kts
+9 -6
View File
@@ -5,7 +5,6 @@ apply {
}
dependencies {
val compile by configurations
compile(project(":compiler:frontend"))
compile(project(":idea"))
compile(project(":idea:idea-core"))
@@ -16,9 +15,13 @@ dependencies {
compile(ideaSdkDeps("guava"))
}
configureKotlinProjectSources("android-annotations/src",
"lint-api/src",
"lint-checks/src",
"lint-idea/src")
configureKotlinProjectNoTests()
sourceSets {
"main" {
java.srcDirs("android-annotations/src",
"lint-api/src",
"lint-checks/src",
"lint-idea/src")
}
"test" {}
}
plugins/noarg/noarg-cli/build.gradle.kts
+4 -4
View File
@@ -4,8 +4,6 @@ description = "Kotlin NoArg Compiler Plugin"
apply { plugin("kotlin") }
dependencies {
val compileOnly by configurations
val runtime by configurations
compileOnly(project(":compiler:frontend"))
compileOnly(project(":compiler:frontend.java"))
compileOnly(project(":compiler:backend"))
@@ -15,8 +13,10 @@ dependencies {
runtime(project(":kotlin-stdlib"))
}
configureKotlinProjectSourcesDefault()
configureKotlinProjectNoTests()
sourceSets {
"main" { projectDefault() }
"test" {}
}
val jar = runtimeJar {
from(fileTree("$projectDir/src")) { include("META-INF/**") }
plugins/noarg/noarg-ide/build.gradle.kts
+4 -3
View File
@@ -20,9 +20,10 @@ dependencies {
}
configureKotlinProjectSourcesDefault()
configureKotlinProjectNoTests()
sourceSets {
"main" { projectDefault() }
"test" {}
}
val jar: Jar by tasks
plugins/plugins-tests/build.gradle.kts
+4 -7
View File
@@ -2,11 +2,6 @@
apply { plugin("kotlin") }
dependencies {
val compile by configurations
val compileOnly by configurations
val testCompile by configurations
val testCompileOnly by configurations
val testRuntime by configurations
testCompile(project(":compiler:util"))
testCompile(project(":compiler:backend"))
testCompile(project(":compiler:cli"))
@@ -35,8 +30,10 @@ dependencies {
testRuntime(ideaPluginDeps("*.jar", plugin = "android"))
}
configureKotlinProjectSources()
configureKotlinProjectTestsDefault()
sourceSets {
"main" {}
"test" { projectDefault() }
}
testsJar {}
plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts
+1 -1
View File
@@ -15,7 +15,7 @@ dependencies {
sourceSets {
"main" { projectDefault() }
"test" { none() }
"test" {}
}
val jar = runtimeJar {
plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts
+4 -2
View File
@@ -14,8 +14,10 @@ dependencies {
compile(project(":idea"))
}
configureKotlinProjectSourcesDefault()
configureKotlinProjectNoTests()
sourceSets {
"main" { projectDefault() }
"test" {}
}
val jar: Jar by tasks
plugins/uast-kotlin-idea/build.gradle.kts
+4 -3
View File
@@ -2,7 +2,6 @@
apply { plugin("kotlin") }
dependencies {
val compile by configurations
compile(project(":kotlin-stdlib"))
compile(project(":core:util.runtime"))
compile(project(":compiler:backend"))
@@ -12,6 +11,8 @@ dependencies {
buildVersion()
}
configureKotlinProjectSourcesDefault()
configureKotlinProjectNoTests()
sourceSets {
"main" { projectDefault() }
"test" {}
}
plugins/uast-kotlin/build.gradle.kts
+5 -13
View File
@@ -2,11 +2,6 @@
apply { plugin("kotlin") }
dependencies {
val compile by configurations
val compileOnly by configurations
val testCompile by configurations
val testCompileOnly by configurations
val testRuntime by configurations
compile(project(":kotlin-stdlib"))
compile(project(":core:util.runtime"))
compile(project(":compiler:backend"))
@@ -14,7 +9,6 @@ dependencies {
compile(project(":compiler:frontend.java"))
compile(project(":compiler:light-classes"))
compileOnly(ideaSdkDeps("openapi", "idea"))
buildVersion()
testCompile(project(":kotlin-test:kotlin-test-jvm"))
testCompile(project(":compiler.tests-common"))
testCompile(commonDep("junit:junit"))
@@ -25,15 +19,13 @@ dependencies {
testRuntime(ideaSdkDeps("*.jar"))
}
configureKotlinProjectSourcesDefault()
configureKotlinProjectTestsDefault()
sourceSets {
"main" { projectDefault() }
"test" { projectDefault() }
}
testsJar {}
tasks.withType<Test> {
projectTest {
workingDir = rootDir
systemProperty("idea.is.unit.test", "true")
environment("NO_FS_ROOTS_ACCESS_CHECK", "true")
ignoreFailures = true
}