Skip to content

Commit fd1f582

Browse files
AndreiKingsleyAndreiKingsley
authored
Merge pull request #1846 from Kotlin/update_korro
Migrated to Korro 0.2.2
2 parents b6636bf + 563f4d1 commit fd1f582

4 files changed

Lines changed: 86 additions & 71 deletions

File tree

‎core/build.gradle.kts‎

Lines changed: 34 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import io.github.devcrocod.korro.KorroGenerateTask
12
import io.github.devcrocod.korro.KorroTask
23
import org.gradle.jvm.tasks.Jar
34
import org.intellij.lang.annotations.Language
@@ -122,6 +123,10 @@ benchmark {
122123
}
123124
}
124125

126+
// TODO(#898)
127+
// All korro/samples related tasks should be removed
128+
// after migration all test sample to :samples module
129+
125130
val samplesImplementation by configurations.getting {
126131
extendsFrom(configurations.testImplementation.get())
127132
}
@@ -184,23 +189,43 @@ val copySamplesOutputs = tasks.register<JavaExec>("copySamplesOutputs") {
184189
classpath = sourceSets.test.get().runtimeClasspath
185190
}
186191

192+
tasks.withType<KorroGenerateTask> {
193+
dependsOn(copySamplesOutputs)
194+
if (name == "korroGenerate") {
195+
mustRunAfter(":samples:korro")
196+
}
197+
}
198+
187199
tasks.withType<KorroTask> {
188200
dependsOn(copySamplesOutputs)
189201
}
190202

191203
korro {
192-
docs = fileTree(rootProject.rootDir) {
193-
include("docs/StardustDocs/topics/*.md")
194-
include("docs/StardustDocs/topics/concepts/*.md")
204+
behavior {
205+
ignoreMissing = true
195206
}
196-
197-
samples = fileTree(project.projectDir) {
198-
include("src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/*.kt")
199-
include("src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/*.kt")
207+
docs {
208+
from(
209+
fileTree(rootProject.file("docs/StardustDocs")) {
210+
include("topics/*.md")
211+
include("topics/concepts/*.md")
212+
},
213+
)
214+
baseDir = rootProject.file("docs/StardustDocs")
200215
}
201216

202-
outputs = fileTree(project.layout.buildDirectory) {
203-
include("korroOutputLines/*")
217+
samples {
218+
from(
219+
fileTree(project.projectDir) {
220+
include("src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/*.kt")
221+
include("src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/*.kt")
222+
},
223+
)
224+
outputs.from(
225+
fileTree(project.layout.buildDirectory) {
226+
include("korroOutputLines/*")
227+
},
228+
)
204229
}
205230

206231
groupSamples {

‎docs/StardustDocs/topics/dataSources/Parquet.md‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ val df = DataFrame.readParquet("data/sales.parquet")
7474
<!---FUN readParquetFilePath-->
7575

7676
```kotlin
77-
// Read from Path objects
78-
val path = Paths.get("data/sales.parquet")
7977
val df = DataFrame.readParquet(path)
8078
```
8179

@@ -94,7 +92,6 @@ val df = DataFrame.readParquet(url)
9492

9593
```kotlin
9694
// Read from File objects
97-
val file = File("data/sales.parquet")
9895
val df = DataFrame.readParquet(file)
9996
```
10097

@@ -104,13 +101,10 @@ val df = DataFrame.readParquet(file)
104101
<!---FUN readParquetFileWithParameters-->
105102

106103
```kotlin
107-
// Read from File objects
108-
val file = File("data/sales.parquet")
109-
110104
val df = DataFrame.readParquet(
111105
file,
112106
nullability = NullabilityOptions.Infer,
113-
batchSize = 64L * 1024
107+
batchSize = 64L * 1024,
114108
)
115109
```
116110

@@ -127,10 +121,6 @@ It's possible to read multiple Parquet files:
127121
<!---FUN readMultipleParquetFiles-->
128122

129123
```kotlin
130-
val file = File("data/sales.parquet")
131-
val file1 = File("data/sales1.parquet")
132-
val file2 = File("data/sales2.parquet")
133-
134124
val df = DataFrame.readParquet(file, file1, file2)
135125
```
136126

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dataframe = "1.0.0-Beta5"
1919

2020
# Latest version of DataFrame that still has the KSP plugin. To be removed
2121
dataframe-ksp = "1.0.0-Beta4"
22-
korro = "0.1.7"
22+
korro = "0.2.2"
2323

2424
gradlePlugin-gradle-foojayToolchains = "1.0.0"
2525
typesafe-conventions = "0.10.1"

‎samples/build.gradle.kts‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,4 @@
1-
import org.gradle.kotlin.dsl.dependencies
2-
import org.gradle.kotlin.dsl.exclude
3-
import org.gradle.kotlin.dsl.implementation
4-
import org.gradle.kotlin.dsl.invoke
5-
import org.gradle.kotlin.dsl.java
6-
import org.gradle.kotlin.dsl.korro
7-
import org.gradle.kotlin.dsl.kotlin
81
import org.gradle.kotlin.dsl.libs
9-
import org.gradle.kotlin.dsl.main
10-
import org.gradle.kotlin.dsl.projects
11-
import org.gradle.kotlin.dsl.repositories
12-
import org.gradle.kotlin.dsl.runKtlintCheckOverMainSourceSet
13-
import org.gradle.kotlin.dsl.runKtlintCheckOverTestSourceSet
14-
import org.gradle.kotlin.dsl.runKtlintFormatOverMainSourceSet
15-
import org.gradle.kotlin.dsl.runKtlintFormatOverTestSourceSet
16-
import org.gradle.kotlin.dsl.sourceSets
17-
import org.gradle.kotlin.dsl.test
18-
import org.gradle.kotlin.dsl.testImplementation
192
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
203

214
plugins {
@@ -91,41 +74,58 @@ dependencies {
9174
}
9275

9376
korro {
94-
docs = fileTree(rootProject.rootDir) {
95-
include("docs/StardustDocs/topics/DataSchema-Data-Classes-Generation.md")
96-
include("docs/StardustDocs/topics/read.md")
97-
include("docs/StardustDocs/topics/readSqlFromCustomDatabase.md")
98-
include("docs/StardustDocs/topics/write.md")
99-
include("docs/StardustDocs/topics/rename.md")
100-
include("docs/StardustDocs/topics/format.md")
101-
include("docs/StardustDocs/topics/parse.md")
102-
include("docs/StardustDocs/topics/toHTML.md")
103-
include("docs/StardustDocs/topics/guides/*.md")
104-
include("docs/StardustDocs/topics/concepts/*.md")
105-
include("docs/StardustDocs/topics/operations/utils/*.md")
106-
include("docs/StardustDocs/topics/operations/multiple/*.md")
107-
include("docs/StardustDocs/topics/operations/column/*.md")
108-
include("docs/StardustDocs/topics/collectionsInterop/*.md")
109-
include("docs/StardustDocs/topics/dataSources/sql/*.md")
110-
include("docs/StardustDocs/topics/dataSources/OpenAPI.md")
111-
include("docs/StardustDocs/topics/info/*.md")
112-
include("docs/StardustDocs/topics/columnArithmetics.md")
113-
include("docs/StardustDocs/topics/groupBy.md")
114-
include("docs/StardustDocs/topics/pivot.md")
77+
78+
// TODO(#898)
79+
// Should work without "missing" errors
80+
// after migration all test sample to :samples module
81+
behavior {
82+
ignoreMissing = true
83+
}
84+
85+
docs {
86+
from(
87+
fileTree(rootProject.file("docs/StardustDocs/topics")) {
88+
include("DataSchema-Data-Classes-Generation.md")
89+
include("read.md")
90+
include("readSqlFromCustomDatabase.md")
91+
include("write.md")
92+
include("rename.md")
93+
include("format.md")
94+
include("parse.md")
95+
include("toHTML.md")
96+
include("guides/*.md")
97+
include("concepts/*.md")
98+
include("operations/utils/*.md")
99+
include("operations/multiple/*.md")
100+
include("operations/column/*.md")
101+
include("collectionsInterop/*.md")
102+
include("dataSources/*.md")
103+
include("dataSources/sql/*.md")
104+
include("info/*.md")
105+
include("columnArithmetics.md")
106+
include("groupBy.md")
107+
include("pivot.md")
108+
},
109+
)
110+
baseDir = rootProject.file("docs/StardustDocs/topics")
115111
}
116112

117-
samples = fileTree(project.projectDir) {
118-
include("src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/*.kt")
119-
include("src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/*.kt")
120-
include("src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/utils/*.kt")
121-
include("src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/multiple/*.kt")
122-
include("src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/render/*.kt")
123-
include("src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/collectionsInterop/*.kt")
124-
include("src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/column/*.kt")
125-
include("src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/info/*.kt")
126-
include("src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/guides/*.kt")
127-
include("src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/concepts/*.kt")
128-
include("src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/io/*.kt")
113+
samples {
114+
from(
115+
fileTree(project.projectDir) {
116+
include("src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/*.kt")
117+
include("src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/*.kt")
118+
include("src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/utils/*.kt")
119+
include("src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/multiple/*.kt")
120+
include("src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/render/*.kt")
121+
include("src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/collectionsInterop/*.kt")
122+
include("src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/column/*.kt")
123+
include("src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/info/*.kt")
124+
include("src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/guides/*.kt")
125+
include("src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/concepts/*.kt")
126+
include("src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/io/*.kt")
127+
},
128+
)
129129
}
130130

131131
groupSamples {

0 commit comments

Comments
 (0)