Skip to content

Commit 579dd14

Browse files
Merge branch 'master' into corr_kdocs
# Conflicts: # core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/documentation/DocumentationUrls.kt
2 parents 0ad2463 + d75d723 commit 579dd14

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+728
-153
lines changed

build.gradle.kts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ plugins {
2020
alias(publisher)
2121
alias(serialization) apply false
2222
alias(dokka)
23-
alias(kover)
23+
// alias(kover)
2424
alias(ktlint)
2525
alias(korro) apply false
2626
alias(kodex) apply false
@@ -41,7 +41,7 @@ repositories {
4141
mavenLocal()
4242
mavenCentral()
4343
maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven")
44-
maven(jupyterApiTCRepo)
44+
if (jupyterApiTCRepo.isNotBlank()) maven(jupyterApiTCRepo)
4545
}
4646

4747
configurations {
@@ -61,15 +61,15 @@ dependencies {
6161
// experimental, so not included by default:
6262
// api(projects.dataframeOpenapi)
6363

64-
kover(projects.core)
65-
kover(projects.dataframeArrow)
66-
kover(projects.dataframeExcel)
67-
kover(projects.dataframeOpenapi)
68-
kover(projects.dataframeJdbc)
69-
kover(projects.dataframeCsv)
70-
kover(projects.dataframeJson)
71-
kover(projects.plugins.kotlinDataframe)
72-
kover(projects.dataframeJupyter)
64+
// kover(projects.core)
65+
// kover(projects.dataframeArrow)
66+
// kover(projects.dataframeExcel)
67+
// kover(projects.dataframeOpenapi)
68+
// kover(projects.dataframeJdbc)
69+
// kover(projects.dataframeCsv)
70+
// kover(projects.dataframeJson)
71+
// kover(projects.plugins.kotlinDataframe)
72+
// kover(projects.dataframeJupyter)
7373
}
7474

7575
enum class Version : Comparable<Version> {

core/build.gradle.kts

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ plugins {
1313
alias(publisher)
1414
alias(serialization)
1515
alias(korro)
16-
alias(kover)
16+
// alias(kover)
1717
alias(ktlint)
1818
alias(kodex)
1919
alias(simpleGit)
@@ -112,10 +112,10 @@ tasks.withType<KspTask> {
112112
}
113113
}
114114

115-
val clearTestResults by tasks.creating(Delete::class) {
115+
val clearTestResults by tasks.registering(Delete::class, fun Delete.() {
116116
delete(layout.buildDirectory.dir("dataframes"))
117117
delete(layout.buildDirectory.dir("korroOutputLines"))
118-
}
118+
})
119119

120120
val samplesTest = tasks.register<Test>("samplesTest") {
121121
group = "Verification"
@@ -140,7 +140,7 @@ val samplesTest = tasks.register<Test>("samplesTest") {
140140
sourceSets["main"].runtimeClasspath
141141
}
142142

143-
val clearSamplesOutputs by tasks.creating {
143+
val clearSamplesOutputs by tasks.registering {
144144
group = "documentation"
145145

146146
doFirst {
@@ -152,11 +152,11 @@ val clearSamplesOutputs by tasks.creating {
152152
}
153153
}
154154

155-
val addSamplesToGit by tasks.creating(GitTask::class) {
155+
val addSamplesToGit by tasks.registering(GitTask::class, fun GitTask.() {
156156
directory = file(".")
157157
command = "add"
158158
args = listOf("-A", "../docs/StardustDocs/resources/snippets")
159-
}
159+
})
160160

161161
val copySamplesOutputs = tasks.register<JavaExec>("copySamplesOutputs") {
162162
group = "documentation"
@@ -167,7 +167,7 @@ val copySamplesOutputs = tasks.register<JavaExec>("copySamplesOutputs") {
167167
classpath = sourceSets.test.get().runtimeClasspath
168168

169169
doLast {
170-
addSamplesToGit.executeCommand()
170+
addSamplesToGit.get().executeCommand()
171171
}
172172
}
173173

@@ -240,7 +240,7 @@ idea {
240240
// If `changeJarTask` is run, modify all Jar tasks such that before running the Kotlin sources are set to
241241
// the target of `processKdocMain`, and they are returned to normal afterward.
242242
// This is usually only done when publishing
243-
val changeJarTask by tasks.creating {
243+
val changeJarTask by tasks.registering {
244244
outputs.upToDateWhen { project.hasProperty("skipKodex") }
245245
doFirst {
246246
tasks.withType<Jar> {
@@ -372,21 +372,21 @@ tasks.withType<KotlinCompile> {
372372

373373
tasks.test {
374374
maxHeapSize = "2048m"
375-
kover {
376-
currentProject {
377-
instrumentation { disabledForTestTasks.addAll("samplesTest") }
378-
}
379-
reports {
380-
total {
381-
filters {
382-
excludes {
383-
classes("org.jetbrains.kotlinx.dataframe.jupyter.*")
384-
classes("org.jetbrains.kotlinx.dataframe.jupyter.SampleNotebooksTests")
385-
}
386-
}
387-
}
388-
}
389-
}
375+
// kover {
376+
// currentProject {
377+
// instrumentation { disabledForTestTasks.addAll("samplesTest") }
378+
// }
379+
// reports {
380+
// total {
381+
// filters {
382+
// excludes {
383+
// classes("org.jetbrains.kotlinx.dataframe.jupyter.*")
384+
// classes("org.jetbrains.kotlinx.dataframe.jupyter.SampleNotebooksTests")
385+
// }
386+
// }
387+
// }
388+
// }
389+
// }
390390
}
391391

392392
kotlinPublications {

0 commit comments

Comments
 (0)