Merge pull request #976 from Kotlin/csv-no-such-method-fix

Jolanrensen · web-flow · commit 7dd9a684b851 · 2024-11-28T14:31:15.000+01:00
small fix for file clash at impl/io/readDelim.kt
diff --git a/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/io/readDelim.kt b/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/io/readDelim.kt
@@ -1,3 +1,5 @@
+@file:JvmName("ReadDelimDeephavenKt")
+
 package org.jetbrains.kotlinx.dataframe.impl.io
 
 import io.deephaven.csv.CsvSpecs
diff --git a/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/io/writeDelim.kt b/dataframe-csv/src/main/kotlin/org/jetbrains/kotlinx/dataframe/impl/io/writeDelim.kt
@@ -1,3 +1,5 @@
+@file:JvmName("WriteDelimDeephavenKt")
+
 package org.jetbrains.kotlinx.dataframe.impl.io
 
 import org.apache.commons.csv.CSVFormat

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+@file:JvmName("ReadDelimDeephavenKt")`
	`2`	`+`
`1`	`3`	`package org.jetbrains.kotlinx.dataframe.impl.io`
`2`	`4`
`3`	`5`	`import io.deephaven.csv.CsvSpecs`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+@file:JvmName("WriteDelimDeephavenKt")`
	`2`	`+`
`1`	`3`	`package org.jetbrains.kotlinx.dataframe.impl.io`
`2`	`4`
`3`	`5`	`import org.apache.commons.csv.CSVFormat`