Skip to content

Commit 9b896ad

Browse files
JolanrensenJolanrensen
committed
updating gradle version and adding some @ExcludeFromSources
1 parent 5e2140f commit 9b896ad

File tree

15 files changed

+13
-278
lines changed

15 files changed

+13
-278
lines changed

‎build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ kotlinPublications {
166166

167167
localRepositories {
168168
maven {
169-
url = project.file(File(buildDir, "maven")).toURI()
169+
url = project.file(layout.buildDirectory.dir("maven")).toURI()
170170
}
171171
}
172172
}

‎core/build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ val compileSamplesKotlin = tasks.named<KotlinCompile>("compileSamplesKotlin") {
8585
libraries.from(it.libraries)
8686
}
8787
source(sourceSets["test"].kotlin)
88-
destinationDirectory.set(file("$buildDir/classes/testWithOutputs/kotlin"))
88+
destinationDirectory.set(layout.buildDirectory.dir("classes/testWithOutputs/kotlin"))
8989
}
9090

9191
tasks.withType<KspTask> {
@@ -101,8 +101,8 @@ tasks.named("lintKotlinSamples") {
101101
}
102102

103103
val clearTestResults by tasks.creating(Delete::class) {
104-
delete(File(buildDir, "dataframes"))
105-
delete(File(buildDir, "korroOutputLines"))
104+
delete(layout.buildDirectory.dir("dataframes"))
105+
delete(layout.buildDirectory.dir("korroOutputLines"))
106106
}
107107

108108
val samplesTest = tasks.register<Test>("samplesTest") {
@@ -121,8 +121,8 @@ val samplesTest = tasks.register<Test>("samplesTest") {
121121

122122
ignoreFailures = true
123123

124-
testClassesDirs = fileTree("$buildDir/classes/testWithOutputs/kotlin")
125-
classpath = files("$buildDir/classes/testWithOutputs/kotlin") + configurations["samplesRuntimeClasspath"] + sourceSets["main"].runtimeClasspath
124+
testClassesDirs = fileTree("${layout.buildDirectory.get().asFile.path}/classes/testWithOutputs/kotlin")
125+
classpath = files("${layout.buildDirectory.get().asFile.path}/classes/testWithOutputs/kotlin") + configurations["samplesRuntimeClasspath"] + sourceSets["main"].runtimeClasspath
126126
}
127127

128128
val clearSamplesOutputs by tasks.creating {
@@ -267,7 +267,7 @@ korro {
267267
include("src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/*.kt")
268268
}
269269

270-
outputs = fileTree(project.buildDir) {
270+
outputs = fileTree(project.layout.buildDirectory) {
271271
include("korroOutputLines/*")
272272
}
273273

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/Submitting.java

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/submitted.json

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/CommonTakeAndDropDocs.kt

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -13,50 +13,4 @@ import org.jetbrains.kotlinx.dataframe.documentation.CommonTakeAndDropDocs.NounA
1313
import org.jetbrains.kotlinx.dataframe.documentation.CommonTakeAndDropDocs.OperationArg
1414
import org.jetbrains.kotlinx.dataframe.documentation.CommonTakeAndDropDocs.TitleArg
1515

16-
/**
17-
* ## (Cols)
18-
* This s the [n] columns from [this] collecting
19-
* the result into a [ColumnSet].
20-
*
21-
* This function operates solely on columns at the top-level.
22-
*
23-
* Any [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi] can be used as receiver for these functions.
24-
*
25-
* NOTE: To avoid ambiguity, `` is called `Cols` when called on
26-
* a [ColumnGroup].
27-
*
28-
* ### Check out: [Grammar]
29-
*
30-
* #### Examples:
31-
* `df.`[select][DataFrame.select]` { `[cols][ColumnsSelectionDsl.cols]` { "my" `[in][String.contains]` it.`[name][DataColumn.name]` }.`[][ColumnSet.]`(5) }`
32-
*
33-
* `df.`[select][DataFrame.select]` { `[][ColumnsSelectionDsl.]`(1) }`
34-
*
35-
* `df.`[select][DataFrame.select]` { myColumnGroup.`[Cols][SingleColumn.Cols]`(2) }`
36-
*
37-
* `df.`[select][DataFrame.select]` { "myColumnGroup".`[Cols][String.Cols]`(3) }`
38-
*
39-
* #### Examples for this overload:
40-
*
41-
*
42-
*
43-
* @param [n] The number of columns to .
44-
* @return A [ColumnSet] containing the [n] columns.
45-
*/
46-
internal interface CommonTakeAndDropDocs {
4716

48-
/** Title, like "Take Last" */
49-
interface TitleArg
50-
51-
/** Operation, like "takeLast" */
52-
interface OperationArg
53-
54-
/** Operation, like "take" */
55-
interface NounArg
56-
57-
/** like "first" */
58-
interface FirstOrLastArg
59-
60-
/** Example argument to use */
61-
interface ExampleArg
62-
}

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/CommonTakeAndDropWhileDocs.kt

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -18,49 +18,4 @@ import org.jetbrains.kotlinx.dataframe.documentation.CommonTakeAndDropWhileDocs.
1818
import org.jetbrains.kotlinx.dataframe.documentation.CommonTakeAndDropWhileDocs.OperationArg
1919
import org.jetbrains.kotlinx.dataframe.documentation.CommonTakeAndDropWhileDocs.TitleArg
2020

21-
/**
22-
* ## (Cols) While
23-
* This function s the columns from [this] adhering to the
24-
* given [predicate] collecting the result into a [ColumnSet].
25-
*
26-
* This function operates solely on columns at the top-level.
27-
*
28-
* Any [Access API][org.jetbrains.kotlinx.dataframe.documentation.AccessApi] can be used as receiver for these functions.
29-
*
30-
* NOTE: To avoid ambiguity, `While` is called
31-
* `ColsWhile` when called on a [String] or [ColumnPath] resembling
32-
* a [ColumnGroup].
33-
*
34-
* ### Check out: [Usage]
35-
*
36-
* #### Examples:
37-
* `df.`[select][DataFrame.select]` { `[cols][ColumnsSelectionDsl.cols]` { "my" `[in][String.contains]` it.`[name][DataColumn.name]` }.`[While][ColumnSet.While]` { "my" `[in][String.contains]` it.`[name][DataColumn.name]` } }`
38-
*
39-
* `df.`[select][DataFrame.select]` { myColumnGroup.`[While][SingleColumn.ColsWhile]` { it.`[any][ColumnWithPath.any]` { it == "Alice" } } }`
40-
*
41-
* `df.`[select][DataFrame.select]` { "myColumnGroup".`[ColsWhile][String.ColsWhile]` { it.`[kind][ColumnWithPath.kind]`() == `[ColumnKind.Value][ColumnKind.Value]` } }`
42-
*
43-
* #### Examples for this overload:
44-
*
45-
*
46-
*
47-
* @param [predicate] The [ColumnFilter] to control which columns to .
48-
* @return A [ColumnSet] containing the columns adhering to the [predicate].
49-
*/
50-
internal interface CommonTakeAndDropWhileDocs {
5121

52-
/** Title, like "Take Last" */
53-
interface TitleArg
54-
55-
/** Operation, like "takeLast" */
56-
interface OperationArg
57-
58-
/** Operation, like "take" */
59-
interface NounArg
60-
61-
/** like "last" */
62-
interface FirstOrLastArg
63-
64-
/** Example argument to use */
65-
interface ExampleArg
66-
}

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenColumn.kt

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,4 @@ import org.jetbrains.kotlinx.dataframe.api.*
55
import org.jetbrains.kotlinx.dataframe.documentation.ExpressionsGivenColumn.ColumnExpressionLink
66
import org.jetbrains.kotlinx.dataframe.ColumnExpression as DfColumnExpression
77

8-
/**
9-
* ## Expressions Given Column
10-
* Expressing values using a "Column Expression" can occur exclusively in a
11-
* [Column Expression][org.jetbrains.kotlinx.dataframe.documentation.ExpressionsGivenColumn.ColumnExpression].
12-
*/
13-
internal interface ExpressionsGivenColumn {
148

15-
/*
16-
* The key for a @set that will define the operation name for the examples below.
17-
* Make sure to [alias][your examples].
18-
*/
19-
interface OperationArg
20-
21-
interface SetDefaultOperationArg
22-
23-
/** Provide a new value for every selected cell given its column using a [column expression][DfColumnExpression]. */
24-
interface ColumnExpression {
25-
26-
/**
27-
* Provide a new value for every selected cell given its column using a [column expression][org.jetbrains.kotlinx.dataframe.ColumnExpression].
28-
*
29-
* For example:
30-
*
31-
* `df.`operation` { `[mean][DataColumn.mean]`(skipNA = true) }`
32-
*
33-
* `df.`operation` { `[count][DataColumn.count]` { it > 10 } }`
34-
*
35-
*/
36-
interface WithExample
37-
}
38-
39-
/** [Column Expression][ColumnExpression] */
40-
interface ColumnExpressionLink
41-
}

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/ExpressionsGivenDataFrame.kt

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,4 @@ import org.jetbrains.kotlinx.dataframe.api.*
55
import org.jetbrains.kotlinx.dataframe.documentation.ExpressionsGivenDataFrame.DataFrameExpressionLink
66
import org.jetbrains.kotlinx.dataframe.DataFrameExpression as DfDataFrameExpression
77

8-
/**
9-
* ## Expressions Given DataFrame
10-
* Expressing values using a "Data Frame Expression" can occur exclusively in a
11-
* [Data Frame Expression][org.jetbrains.kotlinx.dataframe.documentation.ExpressionsGivenDataFrame.DataFrameExpression].
12-
*/
13-
internal interface ExpressionsGivenDataFrame {
148

15-
interface OperationArg
16-
17-
/** Provide a new value for every selected data frame using a [dataframe expression][DfDataFrameExpression]. */
18-
interface DataFrameExpression {
19-
20-
/**
21-
* Provide a new value for every selected data frame using a [dataframe expression][org.jetbrains.kotlinx.dataframe.DataFrameExpression].
22-
*
23-
* For example:
24-
*
25-
* ` { `[select][DataFrame.select]` { lastName } }`
26-
*/
27-
interface WithExample
28-
}
29-
30-
/** [Data Frame Expression][DataFrameExpression] */
31-
interface DataFrameExpressionLink
32-
}

‎core/generated-sources/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/TakeAndDropColumnsSelectionDslGrammar.kt

Lines changed: 0 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -2,106 +2,4 @@ package org.jetbrains.kotlinx.dataframe.documentation
22

33
import org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate
44

5-
/**
6-
* ## (Last) (Cols) (While) Grammar
7-
*
8-
*
9-
* &nbsp;&nbsp;&nbsp;&nbsp;
10-
*
11-
* [(What is this notation?)][org.jetbrains.kotlinx.dataframe.documentation.DslGrammar]
12-
* &nbsp;&nbsp;&nbsp;&nbsp;
13-
*
14-
* ### Definitions:
15-
* `columnSet: `[ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet]`<*>`
16-
*
17-
* &nbsp;&nbsp;&nbsp;&nbsp;
18-
*
19-
* `columnGroup: `[SingleColumn][org.jetbrains.kotlinx.dataframe.columns.SingleColumn]`<`[DataRow][org.jetbrains.kotlinx.dataframe.DataRow]`<*>> | `[String][String]
20-
*
21-
* &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
22-
* `| `[KProperty][kotlin.reflect.KProperty]`<* | `[DataRow][org.jetbrains.kotlinx.dataframe.DataRow]`<*>>` | `[ColumnPath][org.jetbrains.kotlinx.dataframe.columns.ColumnPath]
23-
*
24-
* &nbsp;&nbsp;&nbsp;&nbsp;
25-
*
26-
* `condition: `[ColumnFilter][org.jetbrains.kotlinx.dataframe.ColumnFilter]
27-
*
28-
* &nbsp;&nbsp;&nbsp;&nbsp;
29-
*
30-
* `number: `[Int][Int]
31-
*
32-
* &nbsp;&nbsp;&nbsp;&nbsp;
33-
*
34-
* ### What can be called directly in the [Columns Selection DSL][org.jetbrains.kotlinx.dataframe.api.ColumnsSelectionDsl]:
35-
*
36-
*
37-
* &nbsp;&nbsp;&nbsp;&nbsp;
38-
*
39-
* [****][ColumnsSelectionDsl.]`(`[**Last**][ColumnsSelectionDsl.Last]`)`**`(`**[number][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.NumberDef]**`)`**
40-
*
41-
* `|` [****][ColumnsSelectionDsl.While]`(`[**Last**][ColumnsSelectionDsl.LastWhile]`)`[**While**][ColumnsSelectionDsl.While]**` { `**[condition][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`**
42-
*
43-
* &nbsp;&nbsp;&nbsp;&nbsp;
44-
*
45-
* ### What can be called on a [ColumnSet][org.jetbrains.kotlinx.dataframe.columns.ColumnSet]:
46-
*
47-
*
48-
* &nbsp;&nbsp;&nbsp;&nbsp;
49-
*
50-
* [columnSet][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnSetDef]
51-
*
52-
* &nbsp;&nbsp;&nbsp;&nbsp;.[****][ColumnsSelectionDsl.]`(`[**Last**][ColumnSet.Last]`)`**`(`**[number][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.NumberDef]**`)`**
53-
*
54-
* &nbsp;&nbsp;&nbsp;&nbsp;`|` .[****][ColumnsSelectionDsl.While]`(`[**Last**][ColumnsSelectionDsl.LastWhile]`)`[**While**][ColumnsSelectionDsl.While]**` { `**[condition][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`**
55-
*
56-
* &nbsp;&nbsp;&nbsp;&nbsp;
57-
*
58-
* ### What can be called on a [Column Group (reference)][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnGroupDef]:
59-
*
60-
*
61-
* &nbsp;&nbsp;&nbsp;&nbsp;
62-
*
63-
* [columnGroup][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ColumnGroupDef]
64-
*
65-
* &nbsp;&nbsp;&nbsp;&nbsp;.[****][ColumnsSelectionDsl.Cols]`(`[**Last**][ColumnsSelectionDsl.LastCols]`)`[**Cols**][ColumnsSelectionDsl.Cols]**`(`**[number][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.NumberDef]**`)`**
66-
*
67-
* &nbsp;&nbsp;&nbsp;&nbsp;`|` .[****][ColumnsSelectionDsl.ColsWhile]`(`[**Last**][ColumnsSelectionDsl.LastColsWhile]`)`[**ColsWhile**][ColumnsSelectionDsl.ColsWhile]**` { `**[condition][org.jetbrains.kotlinx.dataframe.documentation.DslGrammarTemplateColumnsSelectionDsl.DslGrammarTemplate.ConditionDef]**` }`**
68-
*
69-
*
70-
*
71-
*
72-
*
73-
*
74-
*
75-
*
76-
*
77-
*
78-
*
79-
*
80-
*
81-
*/
82-
internal interface TakeAndDropColumnsSelectionDslGrammar {
835

84-
/* Like "Take"/"Drop" */
85-
interface TitleArg
86-
87-
/* Operation, like "take"/"drop" */
88-
interface OperationArg
89-
90-
/** [****][ColumnsSelectionDsl.]`(`[**Last**][ColumnsSelectionDsl.Last]`)` */
91-
interface PlainDslName
92-
93-
/** .[****][ColumnsSelectionDsl.]`(`[**Last**][ColumnSet.Last]`)` */
94-
interface ColumnSetName
95-
96-
/** .[****][ColumnsSelectionDsl.Cols]`(`[**Last**][ColumnsSelectionDsl.LastCols]`)`[**Cols**][ColumnsSelectionDsl.Cols] */
97-
interface ColumnGroupName
98-
99-
/** [****][ColumnsSelectionDsl.While]`(`[**Last**][ColumnsSelectionDsl.LastWhile]`)`[**While**][ColumnsSelectionDsl.While] */
100-
interface PlainDslWhileName
101-
102-
/** .[****][ColumnsSelectionDsl.While]`(`[**Last**][ColumnsSelectionDsl.LastWhile]`)`[**While**][ColumnsSelectionDsl.While] */
103-
interface ColumnSetWhileName
104-
105-
/** .[****][ColumnsSelectionDsl.ColsWhile]`(`[**Last**][ColumnsSelectionDsl.LastColsWhile]`)`[**ColsWhile**][ColumnsSelectionDsl.ColsWhile] */
106-
interface ColumnGroupWhileName
107-
}

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/CommonTakeAndDropDocs.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ import org.jetbrains.kotlinx.dataframe.documentation.CommonTakeAndDropDocs.Title
4343
* @param [n\] The number of columns to {@get [NounArg]}.
4444
* @return A [ColumnSet] containing the {@get [FirstOrLastArg]} [n\] columns.
4545
*/
46+
@ExcludeFromSources
4647
internal interface CommonTakeAndDropDocs {
4748

4849
/** Title, like "Take Last" */

0 commit comments

Comments
 (0)