Skip to content

Commit 6055995

Browse files
committed
fixed dependency on dataframe-csv from gradle plugin integration test
1 parent 252aaa3 commit 6055995

File tree

3 files changed

+19
-6
lines changed

3 files changed

+19
-6
lines changed

dataframe-csv/build.gradle.kts

+11
Original file line numberDiff line numberDiff line change
@@ -161,3 +161,14 @@ kotlinPublications {
161161
kotlin {
162162
explicitApi()
163163
}
164+
165+
val instrumentedJars: Configuration by configurations.creating {
166+
isCanBeConsumed = true
167+
isCanBeResolved = false
168+
}
169+
170+
artifacts {
171+
add("instrumentedJars", tasks.jar.get().archiveFile) {
172+
builtBy(tasks.jar)
173+
}
174+
}

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

+7-5
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,13 @@ tasks.withType<ProcessResources> {
5454
filter {
5555
it.replace(
5656
"%DATAFRAME_JAR%",
57-
project(":core").configurations
58-
.getByName("instrumentedJars")
59-
.artifacts.single()
60-
.file.absolutePath
61-
.replace(File.separatorChar, '/'),
57+
listOf(":core", ":dataframe-csv").joinToString("\", \"") {
58+
project(it).configurations
59+
.getByName("instrumentedJars")
60+
.artifacts.single()
61+
.file.absolutePath
62+
.replace(File.separatorChar, '/')
63+
},
6264
)
6365
}
6466
}

plugins/dataframe-gradle-plugin/src/integrationTest/kotlin/org/jetbrains/dataframe/gradle/SchemaGeneratorPluginIntegrationTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ class SchemaGeneratorPluginIntegrationTest : AbstractDataFramePluginIntegrationT
358358
import org.jetbrains.kotlinx.dataframe.api.filter
359359
360360
fun main() {
361-
val df = MySchema.readCSV()
361+
val df = MySchema.readCsv()
362362
val df1 = df.filter { age != null }
363363
}
364364
""".trimIndent(),

0 commit comments

Comments
 (0)