Skip to content

Commit 88d7e57

Browse files
authored
Merge pull request #1285 from Kotlin/bump-gradle
Bump gradle to 8.14.2
2 parents 62b4894 + 3d767e6 commit 88d7e57

36 files changed

+118
-114
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 {

dataframe-arrow/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
with(libs.plugins) {
33
alias(kotlin.jvm)
44
alias(publisher)
5-
alias(kover)
5+
// alias(kover)
66
alias(ktlint)
77
alias(binary.compatibility.validator)
88
}

dataframe-csv/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
alias(kotlin.jvm)
77
alias(publisher)
88
alias(serialization)
9-
alias(kover)
9+
// alias(kover)
1010
alias(ktlint)
1111
alias(kodex)
1212
alias(binary.compatibility.validator)
@@ -106,7 +106,7 @@ tasks.named("runKtlintCheckOverGeneratedSourcesSourceSet") {
106106
// If `changeJarTask` is run, modify all Jar tasks such that before running the Kotlin sources are set to
107107
// the target of `processKdocMain`, and they are returned to normal afterward.
108108
// This is usually only done when publishing
109-
val changeJarTask by tasks.creating {
109+
val changeJarTask by tasks.registering {
110110
outputs.upToDateWhen { false }
111111
doFirst {
112112
tasks.withType<Jar> {

dataframe-excel/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
with(libs.plugins) {
33
alias(kotlin.jvm)
44
alias(publisher)
5-
alias(kover)
5+
// alias(kover)
66
alias(ktlint)
77
alias(binary.compatibility.validator)
88
}

dataframe-jdbc/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
with(libs.plugins) {
33
alias(kotlin.jvm)
44
alias(publisher)
5-
alias(kover)
5+
// alias(kover)
66
alias(ktlint)
77
alias(binary.compatibility.validator)
88
}

dataframe-json/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
alias(kotlin.jvm)
66
alias(publisher)
77
alias(serialization)
8-
alias(kover)
8+
// alias(kover)
99
alias(ktlint)
1010
alias(binary.compatibility.validator)
1111
}

dataframe-jupyter/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
with(libs.plugins) {
55
alias(kotlin.jvm)
66
alias(publisher)
7-
alias(kover)
7+
// alias(kover)
88
alias(ktlint)
99
alias(jupyter.api)
1010
alias(binary.compatibility.validator)

dataframe-openapi-generator/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
alias(kotlin.jvm)
66
alias(publisher)
77
alias(serialization)
8-
alias(kover)
8+
// alias(kover)
99
alias(ktlint)
1010
alias(binary.compatibility.validator)
1111
}
@@ -18,7 +18,7 @@ val jupyterApiTCRepo: String by project
1818
repositories {
1919
mavenLocal()
2020
mavenCentral()
21-
maven(jupyterApiTCRepo)
21+
if (jupyterApiTCRepo.isNotBlank()) maven(jupyterApiTCRepo)
2222
}
2323

2424
dependencies {

docs/StardustDocs/resources/api/generate_docs/notebook_test_generate_docs_1.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
</style>
178178
</head>
179179
<body>
180-
<table class="dataframe" id="df_-637534208"></table>
180+
<table class="dataframe" id="df_234881024"></table>
181181

182182
<p class="dataframe_description"></p>
183183
</body>
@@ -458,23 +458,23 @@
458458

459459
/*<!--*/
460460
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"user: String\">user</span>", children: [], rightAlign: false, values: ["Alice","Bob"] },
461-
{ name: "<span title=\"orders: DataFrame<*>\">orders</span>", children: [], rightAlign: false, values: [{ frameId: -637534207, value: "<b>DataFrame 2 x 2</b>" },{ frameId: -637534206, value: "<b>DataFrame 3 x 2</b>" }] },
462-
], id: -637534208, rootId: -637534208, totalRows: 2 } ) });
461+
{ name: "<span title=\"orders: DataFrame<*>\">orders</span>", children: [], rightAlign: false, values: [{ frameId: 234881025, value: "<b>DataFrame 2 x 2</b>" },{ frameId: 234881026, value: "<b>DataFrame 3 x 2</b>" }] },
462+
], id: 234881024, rootId: 234881024, totalRows: 2 } ) });
463463
/*-->*/
464464

465465
/*<!--*/
466466
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"orderId: Int\">orderId</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">101</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">102</span></span>"] },
467467
{ name: "<span title=\"amount: Double\">amount</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">50.0</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">75.5</span></span>"] },
468-
], id: -637534207, rootId: -637534208, totalRows: 2 } ) });
468+
], id: 234881025, rootId: 234881024, totalRows: 2 } ) });
469469
/*-->*/
470470

471471
/*<!--*/
472472
call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "<span title=\"orderId: Int\">orderId</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">103</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">104</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">105</span></span>"] },
473473
{ name: "<span title=\"amount: Double\">amount</span>", children: [], rightAlign: true, values: ["<span class=\"formatted\" title=\"\"><span class=\"numbers\">20.0</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">30.0</span></span>","<span class=\"formatted\" title=\"\"><span class=\"numbers\">25.0</span></span>"] },
474-
], id: -637534206, rootId: -637534208, totalRows: 3 } ) });
474+
], id: 234881026, rootId: 234881024, totalRows: 3 } ) });
475475
/*-->*/
476476

477-
call_DataFrame(function() { DataFrame.renderTable(-637534208) });
477+
call_DataFrame(function() { DataFrame.renderTable(234881024) });
478478

479479
function sendHeight() {
480480
const table = document.querySelector('table.dataframe');

0 commit comments

Comments
 (0)