Skip to content

Windows build fix #329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 30, 2023
Merged

Windows build fix #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
726ca01
it's now possible to build the project on windows again. New: errors …
Jolanrensen Mar 29, 2023
69f5022
fixed NoSuchMethodError IncrementalCompilationOptions from doc plugin…
Jolanrensen Mar 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,12 @@ val addGeneratedSourcesToGit by tasks.creating(GitTask::class) {
val kotlinMainSources = kotlin.sourceSets.main.get().kotlin.sourceDirectories
val kotlinTestSources = kotlin.sourceSets.test.get().kotlin.sourceDirectories

fun pathOf(vararg parts: String) = parts.joinToString(File.separator)

// Task to generate the processed documentation
val processKDocsMain by creatingProcessDocTask(
sources = (kotlinMainSources + kotlinTestSources) // Include both test and main sources for cross-referencing
.filterNot { "build/generated" in it.path }, // Exclude generated sources
.filterNot { pathOf("build", "generated") in it.path }, // Exclude generated sources
) {
target = file(generatedSourcesFolderName)
processors = listOf(
Expand Down Expand Up @@ -110,8 +112,13 @@ tasks.withType<Jar> {
kotlin.sourceSets.main {
kotlin.setSrcDirs(
processKDocsMain.targets
.filterNot { "src/test/kotlin" in it.path || "src/test/java" in it.path } // filter out test sources again
.plus(kotlinMainSources.filter { "build/generated" in it.path }) // Include generated sources (which were excluded above)
.filterNot {
pathOf("src", "test", "kotlin") in it.path ||
pathOf("src", "test", "java") in it.path
} // filter out test sources again
.plus(kotlinMainSources.filter {
pathOf("build", "generated") in it.path
}) // Include generated sources (which were excluded above)
)
}
}
Expand Down
42 changes: 21 additions & 21 deletions core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/Nulls.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import kotlin.reflect.KProperty
*/
internal interface FillNulls {

/** ## [fillNulls][org.jetbrains.kotlinx.dataframe.api.fillNulls] Operation Usage
/** ## [fillNulls][fillNulls] Operation Usage
*
* [fillNulls][org.jetbrains.kotlinx.dataframe.api.fillNulls] `{ `[columns][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns]` }`
* [fillNulls][fillNulls] `{ `[columns][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns]` }`
*
* - `[.`[where][org.jetbrains.kotlinx.dataframe.api.Update.where]` { `[rowValueCondition][org.jetbrains.kotlinx.dataframe.documentation.SelectingRows.RowValueCondition.WithExample]` } ]`
*
Expand Down Expand Up @@ -227,9 +227,9 @@ internal inline val Float?.isNA: Boolean get() = this == null || this.isNaN()
*/
internal interface FillNaNs {

/** ## [fillNaNs][org.jetbrains.kotlinx.dataframe.api.fillNaNs] Operation Usage
/** ## [fillNaNs][fillNaNs] Operation Usage
*
* [fillNaNs][org.jetbrains.kotlinx.dataframe.api.fillNaNs] `{ `[columns][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns]` }`
* [fillNaNs][fillNaNs] `{ `[columns][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns]` }`
*
* - `[.`[where][org.jetbrains.kotlinx.dataframe.api.Update.where]` { `[rowValueCondition][org.jetbrains.kotlinx.dataframe.documentation.SelectingRows.RowValueCondition.WithExample]` } ]`
*
Expand Down Expand Up @@ -401,9 +401,9 @@ public fun <T, C> DataFrame<T>.fillNaNs(columns: Iterable<ColumnReference<C>>):
*/
internal interface FillNA {

/** ## [fillNA][org.jetbrains.kotlinx.dataframe.api.fillNA] Operation Usage
/** ## [fillNA][fillNA] Operation Usage
*
* [fillNA][org.jetbrains.kotlinx.dataframe.api.fillNA] `{ `[columns][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns]` }`
* [fillNA][fillNA] `{ `[columns][org.jetbrains.kotlinx.dataframe.documentation.SelectingColumns]` }`
*
* - `[.`[where][org.jetbrains.kotlinx.dataframe.api.Update.where]` { `[rowValueCondition][org.jetbrains.kotlinx.dataframe.documentation.SelectingRows.RowValueCondition.WithExample]` } ]`
*
Expand Down Expand Up @@ -639,7 +639,7 @@ private interface CommonDropNullsFunctionDoc
*
* `df.`[dropNulls][org.jetbrains.kotlinx.dataframe.api.dropNulls]` { `[colsOf][org.jetbrains.kotlinx.dataframe.api.colsOf]`<`[Double][Double]`>() }`
*
* `df.`[dropNulls][org.jetbrains.kotlinx.dataframe.api.dropNulls]`(whereAllNull = true) { `[colsOf][org.jetbrains.kotlinx.dataframe.api.colsOf]`<`[Double][Double]`>() }`
* `df.`[dropNulls][dropNulls]`(whereAllNull = true) { `[colsOf][colsOf]`<`[Double][Double]`>() }`
* @param whereAllNull `false` by default.
* If `true`, rows are dropped if all selected cells are `null`.
* If `false`, rows are dropped if any of the selected cells is `null`.
Expand All @@ -662,7 +662,7 @@ public fun <T> DataFrame<T>.dropNulls(whereAllNull: Boolean = false, columns: Co
*
* For more information: [See `dropNulls` on the documentation website.](https://kotlin.github.io/dataframe/drop.html#dropnulls)
* ## This Drop Nulls Overload
* This overload operates on all columns in the [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame].
* This overload operates on all columns in the [DataFrame].
* @param whereAllNull `false` by default.
* If `true`, rows are dropped if all selected cells are `null`.
* If `false`, rows are dropped if any of the selected cells is `null`.
Expand Down Expand Up @@ -690,7 +690,7 @@ public fun <T> DataFrame<T>.dropNulls(whereAllNull: Boolean = false): DataFrame<
*
* `df.`[dropNulls][org.jetbrains.kotlinx.dataframe.api.dropNulls]`(Person::length, Person::age)`
*
* `df.`[dropNulls][org.jetbrains.kotlinx.dataframe.api.dropNulls]`(Person::length, whereAllNull = true)`
* `df.`[dropNulls][dropNulls]`(Person::length, whereAllNull = true)`
* @param whereAllNull `false` by default.
* If `true`, rows are dropped if all selected cells are `null`.
* If `false`, rows are dropped if any of the selected cells is `null`.
Expand All @@ -717,7 +717,7 @@ public fun <T> DataFrame<T>.dropNulls(vararg columns: KProperty<*>, whereAllNull
*
* `df.`[dropNulls][org.jetbrains.kotlinx.dataframe.api.dropNulls]`("length", "age")`
*
* `df.`[dropNulls][org.jetbrains.kotlinx.dataframe.api.dropNulls]`("length", whereAllNull = true)`
* `df.`[dropNulls][dropNulls]`("length", whereAllNull = true)`
* @param whereAllNull `false` by default.
* If `true`, rows are dropped if all selected cells are `null`.
* If `false`, rows are dropped if any of the selected cells is `null`.
Expand Down Expand Up @@ -748,7 +748,7 @@ public fun <T> DataFrame<T>.dropNulls(vararg columns: String, whereAllNull: Bool
*
* `df.`[dropNulls][org.jetbrains.kotlinx.dataframe.api.dropNulls]`(length, age)`
*
* `df.`[dropNulls][org.jetbrains.kotlinx.dataframe.api.dropNulls]`(length, whereAllNull = true)`
* `df.`[dropNulls][dropNulls]`(length, whereAllNull = true)`
* @param whereAllNull `false` by default.
* If `true`, rows are dropped if all selected cells are `null`.
* If `false`, rows are dropped if any of the selected cells is `null`.
Expand Down Expand Up @@ -847,7 +847,7 @@ private interface CommonDropNAFunctionDoc
*
* `df.`[dropNA][org.jetbrains.kotlinx.dataframe.api.dropNA]` { `[colsOf][org.jetbrains.kotlinx.dataframe.api.colsOf]`<`[Double][Double]`>() }`
*
* `df.`[dropNA][org.jetbrains.kotlinx.dataframe.api.dropNA]`(whereAllNA = true) { `[colsOf][org.jetbrains.kotlinx.dataframe.api.colsOf]`<`[Double][Double]`>() }`
* `df.`[dropNA][dropNA]`(whereAllNA = true) { `[colsOf][colsOf]`<`[Double][Double]`>() }`
* @param whereAllNA `false` by default.
* If `true`, rows are dropped if all selected cells are [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA].
* If `false`, rows are dropped if any of the selected cells is [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA].
Expand Down Expand Up @@ -879,7 +879,7 @@ public fun <T> DataFrame<T>.dropNA(whereAllNA: Boolean = false, columns: Columns
*
* `df.`[dropNA][org.jetbrains.kotlinx.dataframe.api.dropNA]`(Person::length, Person::age)`
*
* `df.`[dropNA][org.jetbrains.kotlinx.dataframe.api.dropNA]`(Person::length, whereAllNA = true)`
* `df.`[dropNA][dropNA]`(Person::length, whereAllNA = true)`
* @param whereAllNA `false` by default.
* If `true`, rows are dropped if all selected cells are [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA].
* If `false`, rows are dropped if any of the selected cells is [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA].
Expand All @@ -906,7 +906,7 @@ public fun <T> DataFrame<T>.dropNA(vararg columns: KProperty<*>, whereAllNA: Boo
*
* `df.`[dropNA][org.jetbrains.kotlinx.dataframe.api.dropNA]`("length", "age")`
*
* `df.`[dropNA][org.jetbrains.kotlinx.dataframe.api.dropNA]`("length", whereAllNA = true)`
* `df.`[dropNA][dropNA]`("length", whereAllNA = true)`
* @param whereAllNA `false` by default.
* If `true`, rows are dropped if all selected cells are [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA].
* If `false`, rows are dropped if any of the selected cells is [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA].
Expand Down Expand Up @@ -937,7 +937,7 @@ public fun <T> DataFrame<T>.dropNA(vararg columns: String, whereAllNA: Boolean =
*
* `df.`[dropNA][org.jetbrains.kotlinx.dataframe.api.dropNA]`(length, age)`
*
* `df.`[dropNA][org.jetbrains.kotlinx.dataframe.api.dropNA]`(length, whereAllNA = true)`
* `df.`[dropNA][dropNA]`(length, whereAllNA = true)`
* @param whereAllNA `false` by default.
* If `true`, rows are dropped if all selected cells are [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA].
* If `false`, rows are dropped if any of the selected cells is [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA].
Expand Down Expand Up @@ -969,7 +969,7 @@ public fun <T> DataFrame<T>.dropNA(columns: Iterable<AnyColumnReference>, whereA
*
* For more information: [See `dropNA` on the documentation website.](https://kotlin.github.io/dataframe/drop.html#dropna)
* ## This Drop NA Overload
* This overload operates on all columns in the [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame].
* This overload operates on all columns in the [DataFrame].
* @param whereAllNA `false` by default.
* If `true`, rows are dropped if all selected cells are [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA].
* If `false`, rows are dropped if any of the selected cells is [`NA`][org.jetbrains.kotlinx.dataframe.documentation.NA].
Expand Down Expand Up @@ -1055,7 +1055,7 @@ private interface CommonDropNaNsFunctionDoc
*
* `df.`[dropNaNs][org.jetbrains.kotlinx.dataframe.api.dropNaNs]` { `[colsOf][org.jetbrains.kotlinx.dataframe.api.colsOf]`<`[Double][Double]`>() }`
*
* `df.`[dropNaNs][org.jetbrains.kotlinx.dataframe.api.dropNaNs]`(whereAllNaN = true) { `[colsOf][org.jetbrains.kotlinx.dataframe.api.colsOf]`<`[Double][Double]`>() }`
* `df.`[dropNaNs][dropNaNs]`(whereAllNaN = true) { `[colsOf][colsOf]`<`[Double][Double]`>() }`
* @param whereAllNaN `false` by default.
* If `true`, rows are dropped if all selected cells are [`NaN`][Double.isNaN].
* If `false`, rows are dropped if any of the selected cells is [`NaN`][Double.isNaN].
Expand Down Expand Up @@ -1087,7 +1087,7 @@ public fun <T> DataFrame<T>.dropNaNs(whereAllNaN: Boolean = false, columns: Colu
*
* `df.`[dropNaNs][org.jetbrains.kotlinx.dataframe.api.dropNaNs]`(Person::length, Person::age)`
*
* `df.`[dropNaNs][org.jetbrains.kotlinx.dataframe.api.dropNaNs]`(Person::length, whereAllNaN = true)`
* `df.`[dropNaNs][dropNaNs]`(Person::length, whereAllNaN = true)`
* @param whereAllNaN `false` by default.
* If `true`, rows are dropped if all selected cells are [`NaN`][Double.isNaN].
* If `false`, rows are dropped if any of the selected cells is [`NaN`][Double.isNaN].
Expand All @@ -1114,7 +1114,7 @@ public fun <T> DataFrame<T>.dropNaNs(vararg columns: KProperty<*>, whereAllNaN:
*
* `df.`[dropNaNs][org.jetbrains.kotlinx.dataframe.api.dropNaNs]`("length", "age")`
*
* `df.`[dropNaNs][org.jetbrains.kotlinx.dataframe.api.dropNaNs]`("length", whereAllNaN = true)`
* `df.`[dropNaNs][dropNaNs]`("length", whereAllNaN = true)`
* @param whereAllNaN `false` by default.
* If `true`, rows are dropped if all selected cells are [`NaN`][Double.isNaN].
* If `false`, rows are dropped if any of the selected cells is [`NaN`][Double.isNaN].
Expand Down Expand Up @@ -1145,7 +1145,7 @@ public fun <T> DataFrame<T>.dropNaNs(vararg columns: String, whereAllNaN: Boolea
*
* `df.`[dropNaNs][org.jetbrains.kotlinx.dataframe.api.dropNaNs]`(length, age)`
*
* `df.`[dropNaNs][org.jetbrains.kotlinx.dataframe.api.dropNaNs]`(length, whereAllNaN = true)`
* `df.`[dropNaNs][dropNaNs]`(length, whereAllNaN = true)`
* @param whereAllNaN `false` by default.
* If `true`, rows are dropped if all selected cells are [`NaN`][Double.isNaN].
* If `false`, rows are dropped if any of the selected cells is [`NaN`][Double.isNaN].
Expand Down Expand Up @@ -1180,7 +1180,7 @@ public fun <T> DataFrame<T>.dropNaNs(
*
* For more information: [See `dropNaNs` on the documentation website.](https://kotlin.github.io/dataframe/drop.html#dropnans)
* ## This Drop NaNs Overload
* This overload operates on all columns in the [DataFrame][org.jetbrains.kotlinx.dataframe.DataFrame].
* This overload operates on all columns in the [DataFrame].
* @param whereAllNaN `false` by default.
* If `true`, rows are dropped if all selected cells are [`NaN`][Double.isNaN].
* If `false`, rows are dropped if any of the selected cells is [`NaN`][Double.isNaN].
Expand Down
Loading