Skip to content

Commit 7260934

Browse files
authored
Merge pull request #439 from Kotlin/fix-deprecation
Configure integrationTest using new notation instead of the deprecated one
2 parents f230635 + ff7f1d1 commit 7260934

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

plugins/dataframe-gradle-plugin/build.gradle.kts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
2+
13
plugins {
24
`kotlin-dsl`
35
`java-gradle-plugin`
@@ -104,13 +106,13 @@ tasks.withType<JavaCompile>().all {
104106
}
105107

106108
sourceSets {
109+
val main by getting
110+
val test by getting
111+
val testRuntimeClasspath by configurations
107112
create("integrationTest") {
108-
withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::class) {
109-
kotlin.srcDir("src/integrationTest/kotlin")
110-
resources.srcDir("src/integrationTest/resources")
111-
compileClasspath += sourceSets["main"].output + sourceSets["test"].output + configurations["testRuntimeClasspath"]
112-
runtimeClasspath += output + compileClasspath + sourceSets["test"].runtimeClasspath
113-
}
113+
kotlin.srcDir("src/integrationTest/kotlin")
114+
compileClasspath += main.output + test.output + testRuntimeClasspath
115+
runtimeClasspath += output + compileClasspath + test.runtimeClasspath
114116
}
115117
}
116118

0 commit comments

Comments
 (0)