diff --git a/build.gradle.kts b/build.gradle.kts index 1220748e6b..aba40c6a4a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,7 +20,7 @@ plugins { alias(publisher) alias(serialization) apply false alias(dokka) - alias(kover) +// alias(kover) alias(ktlint) alias(korro) apply false alias(kodex) apply false @@ -41,7 +41,7 @@ repositories { mavenLocal() mavenCentral() maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") - maven(jupyterApiTCRepo) + if (jupyterApiTCRepo.isNotBlank()) maven(jupyterApiTCRepo) } configurations { @@ -61,15 +61,15 @@ dependencies { // experimental, so not included by default: // api(projects.dataframeOpenapi) - kover(projects.core) - kover(projects.dataframeArrow) - kover(projects.dataframeExcel) - kover(projects.dataframeOpenapi) - kover(projects.dataframeJdbc) - kover(projects.dataframeCsv) - kover(projects.dataframeJson) - kover(projects.plugins.kotlinDataframe) - kover(projects.dataframeJupyter) +// kover(projects.core) +// kover(projects.dataframeArrow) +// kover(projects.dataframeExcel) +// kover(projects.dataframeOpenapi) +// kover(projects.dataframeJdbc) +// kover(projects.dataframeCsv) +// kover(projects.dataframeJson) +// kover(projects.plugins.kotlinDataframe) +// kover(projects.dataframeJupyter) } enum class Version : Comparable { diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 0ce27ed919..f3de79f226 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -13,7 +13,7 @@ plugins { alias(publisher) alias(serialization) alias(korro) - alias(kover) +// alias(kover) alias(ktlint) alias(kodex) alias(simpleGit) @@ -112,10 +112,10 @@ tasks.withType { } } -val clearTestResults by tasks.creating(Delete::class) { +val clearTestResults by tasks.registering(Delete::class, fun Delete.() { delete(layout.buildDirectory.dir("dataframes")) delete(layout.buildDirectory.dir("korroOutputLines")) -} +}) val samplesTest = tasks.register("samplesTest") { group = "Verification" @@ -140,7 +140,7 @@ val samplesTest = tasks.register("samplesTest") { sourceSets["main"].runtimeClasspath } -val clearSamplesOutputs by tasks.creating { +val clearSamplesOutputs by tasks.registering { group = "documentation" doFirst { @@ -152,11 +152,11 @@ val clearSamplesOutputs by tasks.creating { } } -val addSamplesToGit by tasks.creating(GitTask::class) { +val addSamplesToGit by tasks.registering(GitTask::class, fun GitTask.() { directory = file(".") command = "add" args = listOf("-A", "../docs/StardustDocs/resources/snippets") -} +}) val copySamplesOutputs = tasks.register("copySamplesOutputs") { group = "documentation" @@ -167,7 +167,7 @@ val copySamplesOutputs = tasks.register("copySamplesOutputs") { classpath = sourceSets.test.get().runtimeClasspath doLast { - addSamplesToGit.executeCommand() + addSamplesToGit.get().executeCommand() } } @@ -240,7 +240,7 @@ idea { // If `changeJarTask` is run, modify all Jar tasks such that before running the Kotlin sources are set to // the target of `processKdocMain`, and they are returned to normal afterward. // This is usually only done when publishing -val changeJarTask by tasks.creating { +val changeJarTask by tasks.registering { outputs.upToDateWhen { project.hasProperty("skipKodex") } doFirst { tasks.withType { @@ -372,21 +372,21 @@ tasks.withType { tasks.test { maxHeapSize = "2048m" - kover { - currentProject { - instrumentation { disabledForTestTasks.addAll("samplesTest") } - } - reports { - total { - filters { - excludes { - classes("org.jetbrains.kotlinx.dataframe.jupyter.*") - classes("org.jetbrains.kotlinx.dataframe.jupyter.SampleNotebooksTests") - } - } - } - } - } +// kover { +// currentProject { +// instrumentation { disabledForTestTasks.addAll("samplesTest") } +// } +// reports { +// total { +// filters { +// excludes { +// classes("org.jetbrains.kotlinx.dataframe.jupyter.*") +// classes("org.jetbrains.kotlinx.dataframe.jupyter.SampleNotebooksTests") +// } +// } +// } +// } +// } } kotlinPublications { diff --git a/dataframe-arrow/build.gradle.kts b/dataframe-arrow/build.gradle.kts index 7d9c8dc3c6..20d918ee09 100644 --- a/dataframe-arrow/build.gradle.kts +++ b/dataframe-arrow/build.gradle.kts @@ -2,7 +2,7 @@ plugins { with(libs.plugins) { alias(kotlin.jvm) alias(publisher) - alias(kover) +// alias(kover) alias(ktlint) alias(binary.compatibility.validator) } diff --git a/dataframe-csv/build.gradle.kts b/dataframe-csv/build.gradle.kts index b38f4bcb3c..2b040ba464 100644 --- a/dataframe-csv/build.gradle.kts +++ b/dataframe-csv/build.gradle.kts @@ -6,7 +6,7 @@ plugins { alias(kotlin.jvm) alias(publisher) alias(serialization) - alias(kover) +// alias(kover) alias(ktlint) alias(kodex) alias(binary.compatibility.validator) @@ -106,7 +106,7 @@ tasks.named("runKtlintCheckOverGeneratedSourcesSourceSet") { // If `changeJarTask` is run, modify all Jar tasks such that before running the Kotlin sources are set to // the target of `processKdocMain`, and they are returned to normal afterward. // This is usually only done when publishing -val changeJarTask by tasks.creating { +val changeJarTask by tasks.registering { outputs.upToDateWhen { false } doFirst { tasks.withType { diff --git a/dataframe-excel/build.gradle.kts b/dataframe-excel/build.gradle.kts index 3f22df5909..ea4ca0258d 100644 --- a/dataframe-excel/build.gradle.kts +++ b/dataframe-excel/build.gradle.kts @@ -2,7 +2,7 @@ plugins { with(libs.plugins) { alias(kotlin.jvm) alias(publisher) - alias(kover) +// alias(kover) alias(ktlint) alias(binary.compatibility.validator) } diff --git a/dataframe-jdbc/build.gradle.kts b/dataframe-jdbc/build.gradle.kts index 7dd4370f83..f616d61891 100644 --- a/dataframe-jdbc/build.gradle.kts +++ b/dataframe-jdbc/build.gradle.kts @@ -2,7 +2,7 @@ plugins { with(libs.plugins) { alias(kotlin.jvm) alias(publisher) - alias(kover) +// alias(kover) alias(ktlint) alias(binary.compatibility.validator) } diff --git a/dataframe-json/build.gradle.kts b/dataframe-json/build.gradle.kts index 31d333f3a4..a8d9044ef0 100644 --- a/dataframe-json/build.gradle.kts +++ b/dataframe-json/build.gradle.kts @@ -5,7 +5,7 @@ plugins { alias(kotlin.jvm) alias(publisher) alias(serialization) - alias(kover) +// alias(kover) alias(ktlint) alias(binary.compatibility.validator) } diff --git a/dataframe-jupyter/build.gradle.kts b/dataframe-jupyter/build.gradle.kts index 426b8718fb..afeecc3ade 100644 --- a/dataframe-jupyter/build.gradle.kts +++ b/dataframe-jupyter/build.gradle.kts @@ -4,7 +4,7 @@ plugins { with(libs.plugins) { alias(kotlin.jvm) alias(publisher) - alias(kover) +// alias(kover) alias(ktlint) alias(jupyter.api) alias(binary.compatibility.validator) diff --git a/dataframe-openapi-generator/build.gradle.kts b/dataframe-openapi-generator/build.gradle.kts index 37aa3b2a58..b41c73f1d4 100644 --- a/dataframe-openapi-generator/build.gradle.kts +++ b/dataframe-openapi-generator/build.gradle.kts @@ -5,7 +5,7 @@ plugins { alias(kotlin.jvm) alias(publisher) alias(serialization) - alias(kover) +// alias(kover) alias(ktlint) alias(binary.compatibility.validator) } @@ -18,7 +18,7 @@ val jupyterApiTCRepo: String by project repositories { mavenLocal() mavenCentral() - maven(jupyterApiTCRepo) + if (jupyterApiTCRepo.isNotBlank()) maven(jupyterApiTCRepo) } dependencies { diff --git a/docs/StardustDocs/resources/api/generate_docs/notebook_test_generate_docs_1.html b/docs/StardustDocs/resources/api/generate_docs/notebook_test_generate_docs_1.html index 837c2a4463..546f685b5f 100644 --- a/docs/StardustDocs/resources/api/generate_docs/notebook_test_generate_docs_1.html +++ b/docs/StardustDocs/resources/api/generate_docs/notebook_test_generate_docs_1.html @@ -177,7 +177,7 @@ -
+

@@ -458,23 +458,23 @@ /**/ /**/ /**/ -call_DataFrame(function() { DataFrame.renderTable(-637534208) }); +call_DataFrame(function() { DataFrame.renderTable(234881024) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/docs/StardustDocs/resources/api/rename/notebook_test_rename_3.html b/docs/StardustDocs/resources/api/rename/notebook_test_rename_3.html index 93878a0dac..ed310c0195 100644 --- a/docs/StardustDocs/resources/api/rename/notebook_test_rename_3.html +++ b/docs/StardustDocs/resources/api/rename/notebook_test_rename_3.html @@ -177,7 +177,7 @@ -
+

@@ -460,10 +460,10 @@ call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "ColumnA", children: [], rightAlign: true, values: ["1","2"] }, { name: "column_b", children: [], rightAlign: false, values: ["a","b"] }, { name: "COLUMN-C", children: [], rightAlign: false, values: ["true","false"] }, -], id: -637534205, rootId: -637534205, totalRows: 2 } ) }); +], id: 234881027, rootId: 234881027, totalRows: 2 } ) }); /*-->*/ -call_DataFrame(function() { DataFrame.renderTable(-637534205) }); +call_DataFrame(function() { DataFrame.renderTable(234881027) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/docs/StardustDocs/resources/api/rename/notebook_test_rename_4.html b/docs/StardustDocs/resources/api/rename/notebook_test_rename_4.html index fc44637d33..4809525d19 100644 --- a/docs/StardustDocs/resources/api/rename/notebook_test_rename_4.html +++ b/docs/StardustDocs/resources/api/rename/notebook_test_rename_4.html @@ -177,7 +177,7 @@ -
+

@@ -460,10 +460,10 @@ call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "columnA", children: [], rightAlign: true, values: ["1","2"] }, { name: "column_b", children: [], rightAlign: false, values: ["a","b"] }, { name: "columnC", children: [], rightAlign: false, values: ["true","false"] }, -], id: -637534204, rootId: -637534204, totalRows: 2 } ) }); +], id: 234881028, rootId: 234881028, totalRows: 2 } ) }); /*-->*/ -call_DataFrame(function() { DataFrame.renderTable(-637534204) }); +call_DataFrame(function() { DataFrame.renderTable(234881028) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/docs/StardustDocs/resources/api/rename/notebook_test_rename_5.html b/docs/StardustDocs/resources/api/rename/notebook_test_rename_5.html index a4d810538a..7ef5f4995a 100644 --- a/docs/StardustDocs/resources/api/rename/notebook_test_rename_5.html +++ b/docs/StardustDocs/resources/api/rename/notebook_test_rename_5.html @@ -177,7 +177,7 @@ -
+

@@ -460,10 +460,10 @@ call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "columnA", children: [], rightAlign: true, values: ["1","2"] }, { name: "columnB", children: [], rightAlign: false, values: ["a","b"] }, { name: "columnC", children: [], rightAlign: false, values: ["true","false"] }, -], id: -637534203, rootId: -637534203, totalRows: 2 } ) }); +], id: 234881029, rootId: 234881029, totalRows: 2 } ) }); /*-->*/ -call_DataFrame(function() { DataFrame.renderTable(-637534203) }); +call_DataFrame(function() { DataFrame.renderTable(234881029) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_10.html b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_10.html index 94e9292230..e5e5adc85d 100644 --- a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_10.html +++ b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_10.html @@ -177,7 +177,7 @@ -
+

... showing only top 20 of 24 rows

@@ -461,10 +461,10 @@ { name: "starsCount", children: [], rightAlign: true, values: ["6120","1241","12926","1066","39402","1737","5688","1074","1181","1072","1110","1058","1815","1017","7101","2424","2836","2628","6059","1133"] }, { name: "\">topics", children: [], rightAlign: false, values: ["[ideavim, intellij, intellij-pl..., ...]","[domain-specific-language, dsl]","[code-editor, ide, intellij, i..., i...]","[intellij-idea, intellij-plugin, scala]","[compiler, gradle-plugin, intel..., ...]","[]","[dao, kotlin, orm, sql]","[kotlin]","[gitignore, ignore-files, intellij, ...]","[]","[]","[gradle, gradle-intellij-plugin, ...]","[sprite, svg, svg-sprite, svg-s..., ...]","[hacktoberfest, jetbrains, plugin, ...]","[c, compiler, kotlin, llvm, objective-c]","[create-react-app, jetbrains-ui, ...]","[components, jetbrains-ui, react]","[]","[coding-font, font, ligatures, ...]","[intellij, intellij-idea, intel..., ...]"] }, { name: "isIntellij", children: [], rightAlign: false, values: ["true","false","true","true","false","true","false","false","true","false","false","true","false","false","false","false","false","false","false","true"] }, -], id: -637534196, rootId: -637534196, totalRows: 24 } ) }); +], id: 234881036, rootId: 234881036, totalRows: 24 } ) }); /*-->*/ -call_DataFrame(function() { DataFrame.renderTable(-637534196) }); +call_DataFrame(function() { DataFrame.renderTable(234881036) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_11.html b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_11.html index d6a0b1122c..47dffb7b7d 100644 --- a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_11.html +++ b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_11.html @@ -177,7 +177,7 @@ -
+

@@ -458,8 +458,8 @@ /**/ /**/ /**/ -call_DataFrame(function() { DataFrame.renderTable(-637534195) }); +call_DataFrame(function() { DataFrame.renderTable(234881037) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_12.html b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_12.html index 1c16493b23..ee32fc9bb6 100644 --- a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_12.html +++ b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_12.html @@ -177,7 +177,7 @@ -
+

@@ -459,10 +459,10 @@ /**/ -call_DataFrame(function() { DataFrame.renderTable(-637534192) }); +call_DataFrame(function() { DataFrame.renderTable(234881040) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_13.html b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_13.html index bed746e6ea..3b6b3ef24a 100644 --- a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_13.html +++ b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_13.html @@ -177,7 +177,7 @@ -
+

@@ -460,10 +460,10 @@ call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "isIntellij", children: [], rightAlign: false, values: ["true","false"] }, { name: "sumStars", children: [], rightAlign: true, values: ["25221","85392"] }, { name: "maxStars", children: [], rightAlign: true, values: ["12926","39402"] }, -], id: -637534191, rootId: -637534191, totalRows: 2 } ) }); +], id: 234881041, rootId: 234881041, totalRows: 2 } ) }); /*-->*/ -call_DataFrame(function() { DataFrame.renderTable(-637534191) }); +call_DataFrame(function() { DataFrame.renderTable(234881041) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_14.html b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_14.html index b6f078ad1b..7764d69b5a 100644 --- a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_14.html +++ b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_14.html @@ -177,7 +177,7 @@ -
+

@@ -461,10 +461,10 @@ { name: "starsCount", children: [], rightAlign: true, values: ["39402","12926","7101","6805","6120","6059","5688","2836","2628","2424"] }, { name: "\">topics", children: [], rightAlign: false, values: ["[compiler, gradle-plugin, intel..., ...]","[code-editor, ide, intellij, i..., i...]","[c, compiler, kotlin, llvm, objective-c]","[android, awt, compose, declara..., ...]","[ideavim, intellij, intellij-pl..., ...]","[coding-font, font, ligatures, ...]","[dao, kotlin, orm, sql]","[components, jetbrains-ui, react]","[]","[create-react-app, jetbrains-ui, ...]"] }, { name: "isIntellij", children: [], rightAlign: false, values: ["false","true","false","false","true","false","false","false","false","false"] }, -], id: -637534190, rootId: -637534190, totalRows: 10 } ) }); +], id: 234881042, rootId: 234881042, totalRows: 10 } ) }); /*-->*/ -call_DataFrame(function() { DataFrame.renderTable(-637534190) }); +call_DataFrame(function() { DataFrame.renderTable(234881042) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_3.html b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_3.html index f4f1429b4f..cfef33fbf8 100644 --- a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_3.html +++ b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_3.html @@ -177,7 +177,7 @@ -
+

... showing only top 20 of 562 rows

@@ -462,10 +462,10 @@ { name: "stargazers_count", children: [], rightAlign: true, values: ["23","115","290","6120","5","8","47","11","41","534","6","218","1241","12926","39","118","1066","125","27","39402"] }, { name: "topics", children: [], rightAlign: false, values: ["[]","[jetbrains, jetbrains-youtrack, youtr...","[]","[ideavim, intellij, intellij-platform...","[]","[]","[]","[]","[nuget, nuget-feed, teamcity, teamcit...","[]","[]","[]","[domain-specific-language, dsl]","[code-editor, ide, intellij, intellij...","[c-sharp, teamcity, teamcity-service-...","[]","[intellij-idea, intellij-plugin, scala]","[]","[]","[compiler, gradle-plugin, intellij-pl..."] }, { name: "watchers", children: [], rightAlign: true, values: ["23","115","290","6120","5","8","47","11","41","534","6","218","1241","12926","39","118","1066","125","27","39402"] }, -], id: -637534202, rootId: -637534202, totalRows: 562 } ) }); +], id: 234881030, rootId: 234881030, totalRows: 562 } ) }); /*-->*/ -call_DataFrame(function() { DataFrame.renderTable(-637534202) }); +call_DataFrame(function() { DataFrame.renderTable(234881030) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_4.html b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_4.html index d03056111a..f54b98d227 100644 --- a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_4.html +++ b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_4.html @@ -177,7 +177,7 @@ -
+

@@ -471,10 +471,10 @@ { name: "?\">median", children: [], rightAlign: false, values: ["JetBrains/lightbeam","null","8","[]","8"] }, { name: "?\">p75", children: [], rightAlign: false, values: ["JetBrains/teamcity-bazel-plugin","null","48","[awt, swing]","48"] }, { name: "?\">max", children: [], rightAlign: false, values: ["JetBrains/ztools","null","39402","[youtrack, youtrack-workflow]","39402"] }, -], id: -637534201, rootId: -637534201, totalRows: 5 } ) }); +], id: 234881031, rootId: 234881031, totalRows: 5 } ) }); /*-->*/ -call_DataFrame(function() { DataFrame.renderTable(-637534201) }); +call_DataFrame(function() { DataFrame.renderTable(234881031) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_5.html b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_5.html index b2438a387a..1f360953bc 100644 --- a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_5.html +++ b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_5.html @@ -177,7 +177,7 @@ -
+

... showing only top 20 of 562 rows

@@ -460,10 +460,10 @@ call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "full_name", children: [], rightAlign: false, values: ["JetBrains/JPS","JetBrains/YouTrackSharp","JetBrains/colorSchemeTool","JetBrains/ideavim","JetBrains/youtrack-vcs-hooks","JetBrains/youtrack-rest-ruby-library","JetBrains/emacs4ij","JetBrains/codereview4intellij","JetBrains/teamcity-nuget-support","JetBrains/Grammar-Kit","JetBrains/intellij-starteam-plugin","JetBrains/la-clojure","JetBrains/MPS","JetBrains/intellij-community","JetBrains/TeamCity.ServiceMessages","JetBrains/youtrack-rest-python-library","JetBrains/intellij-scala","JetBrains/teamcity-messages","JetBrains/teamcity-cpp","JetBrains/kotlin"] }, { name: "stargazers_count", children: [], rightAlign: true, values: ["23","115","290","6120","5","8","47","11","41","534","6","218","1241","12926","39","118","1066","125","27","39402"] }, { name: "topics", children: [], rightAlign: false, values: ["[]","[jetbrains, jetbrains-youtrack, youtr...","[]","[ideavim, intellij, intellij-platform...","[]","[]","[]","[]","[nuget, nuget-feed, teamcity, teamcit...","[]","[]","[]","[domain-specific-language, dsl]","[code-editor, ide, intellij, intellij...","[c-sharp, teamcity, teamcity-service-...","[]","[intellij-idea, intellij-plugin, scala]","[]","[]","[compiler, gradle-plugin, intellij-pl..."] }, -], id: -637534200, rootId: -637534200, totalRows: 562 } ) }); +], id: 234881032, rootId: 234881032, totalRows: 562 } ) }); /*-->*/ -call_DataFrame(function() { DataFrame.renderTable(-637534200) }); +call_DataFrame(function() { DataFrame.renderTable(234881032) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_6.html b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_6.html index 8ba1fc220b..604d7690d7 100644 --- a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_6.html +++ b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_6.html @@ -177,7 +177,7 @@ -
+

... showing only top 20 of 24 rows

@@ -460,10 +460,10 @@ call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "full_name", children: [], rightAlign: false, values: ["JetBrains/ideavim","JetBrains/MPS","JetBrains/intellij-community","JetBrains/intellij-scala","JetBrains/kotlin","JetBrains/intellij-plugins","JetBrains/Exposed","JetBrains/kotlin-web-site","JetBrains/idea-gitignore","JetBrains/swot","JetBrains/phpstorm-stubs","JetBrains/gradle-intellij-plugin","JetBrains/svg-sprite-loader","JetBrains/resharper-unity","JetBrains/kotlin-native","JetBrains/create-react-kotlin-app","JetBrains/ring-ui","JetBrains/kotlinconf-app","JetBrains/JetBrainsMono","JetBrains/intellij-platform-plugin-te..."] }, { name: "stargazers_count", children: [], rightAlign: true, values: ["6120","1241","12926","1066","39402","1737","5688","1074","1181","1072","1110","1058","1815","1017","7101","2424","2836","2628","6059","1133"] }, { name: "topics", children: [], rightAlign: false, values: ["[ideavim, intellij, intellij-platform...","[domain-specific-language, dsl]","[code-editor, ide, intellij, intellij...","[intellij-idea, intellij-plugin, scala]","[compiler, gradle-plugin, intellij-pl...","[]","[dao, kotlin, orm, sql]","[kotlin]","[gitignore, ignore-files, intellij, i...","[]","[]","[gradle, gradle-intellij-plugin, grad...","[sprite, svg, svg-sprite, svg-stack, ...","[hacktoberfest, jetbrains, plugin, re...","[c, compiler, kotlin, llvm, objective-c]","[create-react-app, jetbrains-ui, kotl...","[components, jetbrains-ui, react]","[]","[coding-font, font, ligatures, monosp...","[intellij, intellij-idea, intellij-id..."] }, -], id: -637534199, rootId: -637534199, totalRows: 24 } ) }); +], id: 234881033, rootId: 234881033, totalRows: 24 } ) }); /*-->*/ -call_DataFrame(function() { DataFrame.renderTable(-637534199) }); +call_DataFrame(function() { DataFrame.renderTable(234881033) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_7.html b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_7.html index 075003d964..20ec730ba5 100644 --- a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_7.html +++ b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_7.html @@ -177,7 +177,7 @@ -
+

... showing only top 20 of 24 rows

@@ -460,10 +460,10 @@ call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "name", children: [], rightAlign: false, values: ["JetBrains/ideavim","JetBrains/MPS","JetBrains/intellij-community","JetBrains/intellij-scala","JetBrains/kotlin","JetBrains/intellij-plugins","JetBrains/Exposed","JetBrains/kotlin-web-site","JetBrains/idea-gitignore","JetBrains/swot","JetBrains/phpstorm-stubs","JetBrains/gradle-intellij-plugin","JetBrains/svg-sprite-loader","JetBrains/resharper-unity","JetBrains/kotlin-native","JetBrains/create-react-kotlin-app","JetBrains/ring-ui","JetBrains/kotlinconf-app","JetBrains/JetBrainsMono","JetBrains/intellij-platform-plugin-te..."] }, { name: "starsCount", children: [], rightAlign: true, values: ["6120","1241","12926","1066","39402","1737","5688","1074","1181","1072","1110","1058","1815","1017","7101","2424","2836","2628","6059","1133"] }, { name: "topics", children: [], rightAlign: false, values: ["[ideavim, intellij, intellij-platform...","[domain-specific-language, dsl]","[code-editor, ide, intellij, intellij...","[intellij-idea, intellij-plugin, scala]","[compiler, gradle-plugin, intellij-pl...","[]","[dao, kotlin, orm, sql]","[kotlin]","[gitignore, ignore-files, intellij, i...","[]","[]","[gradle, gradle-intellij-plugin, grad...","[sprite, svg, svg-sprite, svg-stack, ...","[hacktoberfest, jetbrains, plugin, re...","[c, compiler, kotlin, llvm, objective-c]","[create-react-app, jetbrains-ui, kotl...","[components, jetbrains-ui, react]","[]","[coding-font, font, ligatures, monosp...","[intellij, intellij-idea, intellij-id..."] }, -], id: -637534198, rootId: -637534198, totalRows: 24 } ) }); +], id: 234881034, rootId: 234881034, totalRows: 24 } ) }); /*-->*/ -call_DataFrame(function() { DataFrame.renderTable(-637534198) }); +call_DataFrame(function() { DataFrame.renderTable(234881034) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_8.html b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_8.html index 898b28197a..2fe990b816 100644 --- a/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_8.html +++ b/docs/StardustDocs/resources/guides/quickstart/notebook_test_quickstart_8.html @@ -177,7 +177,7 @@ -
+

... showing only top 20 of 24 rows

@@ -460,10 +460,10 @@ call_DataFrame(function() { DataFrame.addTable({ cols: [{ name: "name", children: [], rightAlign: false, values: ["ideavim","MPS","intellij-community","intellij-scala","kotlin","intellij-plugins","Exposed","kotlin-web-site","idea-gitignore","swot","phpstorm-stubs","gradle-intellij-plugin","svg-sprite-loader","resharper-unity","kotlin-native","create-react-kotlin-app","ring-ui","kotlinconf-app","JetBrainsMono","intellij-platform-plugin-template"] }, { name: "starsCount", children: [], rightAlign: true, values: ["6120","1241","12926","1066","39402","1737","5688","1074","1181","1072","1110","1058","1815","1017","7101","2424","2836","2628","6059","1133"] }, { name: "\">topics", children: [], rightAlign: false, values: ["[ideavim, intellij, intellij-pl..., ...]","[domain-specific-language, dsl]","[code-editor, ide, intellij, i..., i...]","[intellij-idea, intellij-plugin, scala]","[compiler, gradle-plugin, intel..., ...]","[]","[dao, kotlin, orm, sql]","[kotlin]","[gitignore, ignore-files, intellij, ...]","[]","[]","[gradle, gradle-intellij-plugin, ...]","[sprite, svg, svg-sprite, svg-s..., ...]","[hacktoberfest, jetbrains, plugin, ...]","[c, compiler, kotlin, llvm, objective-c]","[create-react-app, jetbrains-ui, ...]","[components, jetbrains-ui, react]","[]","[coding-font, font, ligatures, ...]","[intellij, intellij-idea, intel..., ...]"] }, -], id: -637534197, rootId: -637534197, totalRows: 24 } ) }); +], id: 234881035, rootId: 234881035, totalRows: 24 } ) }); /*-->*/ -call_DataFrame(function() { DataFrame.renderTable(-637534197) }); +call_DataFrame(function() { DataFrame.renderTable(234881035) }); function sendHeight() { const table = document.querySelector('table.dataframe'); diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 578d0d75fc..d53a851a46 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,7 +17,7 @@ dataframe = "1.0.0-dev-6538" korro = "0.1.6" binaryCompatibilityValidator = "0.17.0" -kover = "0.8.3" +kover = "0.9.1" deephavenCsv = "0.15.0" fastDoubleParser = "2.0.1" commonsCsv = "1.12.0" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b9530..1b33c55baa 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 94113f200e..ff23a68d70 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6d6b..23d15a9367 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -115,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -206,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. @@ -214,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9b42019c79..5eed7ee845 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/plugins/dataframe-gradle-plugin/src/main/kotlin/org/jetbrains/dataframe/gradle/SchemaGeneratorPlugin.kt b/plugins/dataframe-gradle-plugin/src/main/kotlin/org/jetbrains/dataframe/gradle/SchemaGeneratorPlugin.kt index 4e3f4f01b8..7277f0f301 100644 --- a/plugins/dataframe-gradle-plugin/src/main/kotlin/org/jetbrains/dataframe/gradle/SchemaGeneratorPlugin.kt +++ b/plugins/dataframe-gradle-plugin/src/main/kotlin/org/jetbrains/dataframe/gradle/SchemaGeneratorPlugin.kt @@ -3,9 +3,9 @@ package org.jetbrains.dataframe.gradle import com.google.devtools.ksp.gradle.KspTaskJvm import org.gradle.api.Plugin import org.gradle.api.Project -import org.gradle.api.Task import org.gradle.api.file.FileCollection import org.gradle.api.logging.LogLevel +import org.gradle.api.tasks.TaskProvider import org.gradle.internal.logging.services.DefaultLoggingManager import org.gradle.kotlin.dsl.create import org.gradle.kotlin.dsl.withType @@ -37,9 +37,9 @@ class SchemaGeneratorPlugin : Plugin { } val generationTasks = extension.schemas.map { - createTask(target, extension, appliedPlugin, it) + registerTask(target, extension, appliedPlugin, it) } - val generateAll = target.tasks.create("generateDataFrames") { + val generateAll = target.tasks.register("generateDataFrames") { group = GROUP dependsOn(*generationTasks.toTypedArray()) } @@ -52,12 +52,12 @@ class SchemaGeneratorPlugin : Plugin { } } - private fun createTask( + private fun registerTask( target: Project, extension: SchemaGeneratorExtension, appliedPlugin: AppliedPlugin?, schema: Schema, - ): Task { + ): TaskProvider { val interfaceName = getInterfaceName(schema) fun propertyError(property: String): Nothing { @@ -124,7 +124,7 @@ class SchemaGeneratorPlugin : Plugin { val defaultPath = schema.defaultPath ?: extension.defaultPath ?: true val delimiters = schema.withNormalizationBy ?: extension.withNormalizationBy ?: setOf('\t', ' ', '_') - return target.tasks.create("generateDataFrame$interfaceName", GenerateDataSchemaTask::class.java) { + return target.tasks.register("generateDataFrame$interfaceName", GenerateDataSchemaTask::class.java) { (logging as? DefaultLoggingManager)?.setLevelInternal(LogLevel.QUIET) group = GROUP data.set(schema.data) diff --git a/plugins/dataframe-gradle-plugin/src/test/kotlin/org/jetbrains/dataframe/gradle/makeProject.kt b/plugins/dataframe-gradle-plugin/src/test/kotlin/org/jetbrains/dataframe/gradle/makeProject.kt index 059580b3b0..0ea3b6382d 100644 --- a/plugins/dataframe-gradle-plugin/src/test/kotlin/org/jetbrains/dataframe/gradle/makeProject.kt +++ b/plugins/dataframe-gradle-plugin/src/test/kotlin/org/jetbrains/dataframe/gradle/makeProject.kt @@ -8,6 +8,8 @@ import org.gradle.api.internal.project.ProjectInternal import org.gradle.api.provider.Provider import org.gradle.build.event.BuildEventsListenerRegistry import org.gradle.internal.service.DefaultServiceRegistry +import org.gradle.internal.service.scopes.Scope +import org.gradle.internal.service.scopes.ServiceScope import org.gradle.testfixtures.ProjectBuilder import org.gradle.tooling.events.OperationCompletionListener import java.lang.reflect.Field @@ -34,13 +36,14 @@ internal fun addBuildEventsListenerRegistryMock(project: Project) { stateValue.set(enumClass.enumConstants[0]) // add service and set state so that future mutations are not allowed - projectScopeServices.add(BuildEventsListenerRegistry::class.java, BuildEventsListenerRegistryMock) + projectScopeServices.add(BuildEventsListenerRegistryMock::class.java, BuildEventsListenerRegistryMock) stateValue.set(enumClass.enumConstants[1]) } catch (e: Throwable) { throw RuntimeException(e) } } +@ServiceScope(Scope.Project::class) object BuildEventsListenerRegistryMock : BuildEventsListenerRegistry { override fun onTaskCompletion(listener: Provider?) = Unit } diff --git a/plugins/expressions-converter/build.gradle.kts b/plugins/expressions-converter/build.gradle.kts index 36369bc865..0d2ac92ad8 100644 --- a/plugins/expressions-converter/build.gradle.kts +++ b/plugins/expressions-converter/build.gradle.kts @@ -58,7 +58,7 @@ sourceSets { } } -tasks.create("generateTests") { +tasks.register("generateTests") { classpath = sourceSets.test.get().runtimeClasspath mainClass = "org.jetbrains.kotlinx.dataframe.GenerateTestsKt" } diff --git a/plugins/expressions-converter/src/org/jetbrains/kotlinx/dataframe/ExplainerIrTransformer.kt b/plugins/expressions-converter/src/org/jetbrains/kotlinx/dataframe/ExplainerIrTransformer.kt index 812082b11e..002a4c5bb6 100644 --- a/plugins/expressions-converter/src/org/jetbrains/kotlinx/dataframe/ExplainerIrTransformer.kt +++ b/plugins/expressions-converter/src/org/jetbrains/kotlinx/dataframe/ExplainerIrTransformer.kt @@ -28,6 +28,7 @@ import org.jetbrains.kotlin.ir.expressions.impl.IrConstImpl import org.jetbrains.kotlin.ir.expressions.impl.IrFunctionExpressionImpl import org.jetbrains.kotlin.ir.expressions.impl.IrGetObjectValueImpl import org.jetbrains.kotlin.ir.expressions.impl.IrGetValueImpl +import org.jetbrains.kotlin.ir.symbols.UnsafeDuringIrConstructionAPI import org.jetbrains.kotlin.ir.symbols.impl.IrSimpleFunctionSymbolImpl import org.jetbrains.kotlin.ir.symbols.impl.IrValueParameterSymbolImpl import org.jetbrains.kotlin.ir.types.classFqName @@ -48,6 +49,7 @@ import java.io.File data class ContainingDeclarations(val clazz: IrClass?, val function: IrFunction?, val statementIndex: Int = 0) +@OptIn(UnsafeDuringIrConstructionAPI::class) class ExplainerIrTransformer(val pluginContext: IrPluginContext) : FileLoweringPass, IrElementTransformer { diff --git a/plugins/kotlin-dataframe/build.gradle.kts b/plugins/kotlin-dataframe/build.gradle.kts index 4a78ff10d4..cdab139dc3 100644 --- a/plugins/kotlin-dataframe/build.gradle.kts +++ b/plugins/kotlin-dataframe/build.gradle.kts @@ -98,7 +98,7 @@ tasks.compileTestKotlin { } } -tasks.create("generateTests") { +tasks.register("generateTests") { classpath = sourceSets.test.get().runtimeClasspath mainClass = "org.jetbrains.kotlin.fir.dataframe.GenerateTestsKt" } diff --git a/settings.gradle.kts b/settings.gradle.kts index d21330810d..8476b955c9 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -37,7 +37,7 @@ val jupyterApiTCRepo: String by settings dependencyResolutionManagement { repositories { mavenCentral() - maven(jupyterApiTCRepo) + if (jupyterApiTCRepo.isNotBlank()) maven(jupyterApiTCRepo) } } diff --git a/tests/build.gradle.kts b/tests/build.gradle.kts index 7229065b7b..f39386869b 100644 --- a/tests/build.gradle.kts +++ b/tests/build.gradle.kts @@ -23,7 +23,7 @@ plugins { alias(kotlin.jvm) alias(korro) alias(ktlint) - alias(kover) +// alias(kover) alias(dataframe) // only mandatory if `kotlin.dataframe.add.ksp=false` in gradle.properties