Skip to content

Commit 4b2aefb

Browse files
AndreiKingsleyAndreiKingsley
committed
Merge branch 'master' into join_docs
2 parents 6c7a875 + afe6991 commit 4b2aefb

File tree

86 files changed

+2455
-502
lines changed

Some content is hidden

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

86 files changed

+2455
-502
lines changed

‎CONTRIBUTING.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,9 @@ This library is built with Gradle.
112112
making local publishing faster: `./gradlew publishToMavenLocal -PskipKodex`.
113113
This, however, publishes the library with "broken" KDocs,
114114
so it's only meant for faster iterations during development.
115+
* The parameter `-PincludeCoreLibrariesJson` makes the build include the `libraries.json` file in the `:core` module.
116+
This file allows loading dataframe-jupyter when dataframe-core is present on its own in a Kotlin Notebook.
117+
Usually only done when publishing.
115118

116119
You can import this project into IDEA, but you have to delegate the build actions
117120
to Gradle (in Preferences -> Build, Execution, Deployment -> Build Tools -> Gradle -> Runner)

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![JetBrains incubator project](https://jb.gg/badges/incubator.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
44
[![Kotlin component beta stability](https://img.shields.io/badge/project-beta-kotlin.svg?colorA=555555&colorB=DB3683&label=&logo=kotlin&logoColor=ffffff&logoWidth=10)](https://kotlinlang.org/docs/components-stability.html)
55
[![Kotlin](https://img.shields.io/badge/kotlin-2.0.20-blue.svg?logo=kotlin)](http://kotlinlang.org)
6-
[![Dynamic XML Badge](https://img.shields.io/badge/dynamic/xml?url=https%3A%2F%2Frepo1.maven.org%2Fmaven2%2Forg%2Fjetbrains%2Fkotlinx%2Fdataframe%2Fmaven-metadata.xml&query=%2F%2Fversion%5Bnot%28contains%28text%28%29%2C%22dev%22%29%29%5D%5Blast%28%29%5D&label=Release%20version)](https://search.maven.org/artifact/org.jetbrains.kotlinx/dataframe)
6+
[![Dynamic XML Badge](https://img.shields.io/badge/dynamic/xml?url=https%3A%2F%2Frepo1.maven.org%2Fmaven2%2Forg%2Fjetbrains%2Fkotlinx%2Fdataframe%2Fmaven-metadata.xml&query=%2F%2Fversion%5Bnot%28contains%28text%28%29%2C%27dev%27%29%29+and+not%28contains%28text%28%29%2C%27n%27%29%29%5D%5Blast%28%29%5D&label=Release%20version)](https://search.maven.org/artifact/org.jetbrains.kotlinx/dataframe)
77
[![Dynamic XML Badge](https://img.shields.io/badge/dynamic/xml?url=https%3A%2F%2Frepo1.maven.org%2Fmaven2%2Forg%2Fjetbrains%2Fkotlinx%2Fdataframe%2Fmaven-metadata.xml&query=%2F%2Fversion%5Bcontains%28text%28%29%2C%22dev%22%29%5D%5Blast%28%29%5D&label=Dev%20version&color=yellow
88
)](https://search.maven.org/artifact/org.jetbrains.kotlinx/dataframe)
99
[![GitHub License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0)

‎build.gradle.kts‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,23 @@ allprojects {
223223
} catch (_: UnknownDomainObjectException) {
224224
logger.warn("Could not set buildConfig on :${this.name}")
225225
}
226+
227+
// Adds the instrumentedJars configuration/artifact to all sub-projects with a `jar` task
228+
// This allows other modules to depend on the output of this task, aka the compiled jar of that module
229+
// Used in :plugins:dataframe-gradle-plugin integration tests and in :samples for compiler plugin support
230+
try {
231+
val instrumentedJars: Configuration by configurations.creating {
232+
isCanBeConsumed = true
233+
isCanBeResolved = false
234+
}
235+
artifacts {
236+
add("instrumentedJars", tasks.jar.get().archiveFile) {
237+
builtBy(tasks.jar)
238+
}
239+
}
240+
} catch (_: Exception) {
241+
logger.warn("Could not set instrumentedJars on :${this.name}")
242+
}
226243
}
227244
}
228245

‎core/api/core.api‎

Lines changed: 42 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,8 @@ public final class org/jetbrains/kotlinx/dataframe/api/AddKt {
358358
public static final fun add (Lorg/jetbrains/kotlinx/dataframe/DataFrame;[Lorg/jetbrains/kotlinx/dataframe/DataFrame;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
359359
public static final fun add (Lorg/jetbrains/kotlinx/dataframe/DataFrame;[Lorg/jetbrains/kotlinx/dataframe/columns/BaseColumn;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
360360
public static final fun addAll (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Ljava/lang/Iterable;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
361+
public static final fun addAll (Lorg/jetbrains/kotlinx/dataframe/DataFrame;[Lorg/jetbrains/kotlinx/dataframe/DataFrame;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
362+
public static final fun addAll (Lorg/jetbrains/kotlinx/dataframe/DataFrame;[Lorg/jetbrains/kotlinx/dataframe/columns/BaseColumn;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
361363
public static final fun addAllFrames (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Ljava/lang/Iterable;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
362364
}
363365

@@ -2230,11 +2232,21 @@ public final class org/jetbrains/kotlinx/dataframe/api/ForEachKt {
22302232
}
22312233

22322234
public final class org/jetbrains/kotlinx/dataframe/api/FormatClause {
2233-
public fun <init> (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function2;)V
2234-
public synthetic fun <init> (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
2235+
public fun <init> (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;)V
2236+
public synthetic fun <init> (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
22352237
public fun toString ()Ljava/lang/String;
22362238
}
22372239

2240+
public final class org/jetbrains/kotlinx/dataframe/api/FormatHeaderKt {
2241+
public static final fun formatHeader (Lorg/jetbrains/kotlinx/dataframe/DataFrame;)Lorg/jetbrains/kotlinx/dataframe/api/HeaderFormatClause;
2242+
public static final fun formatHeader (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/api/HeaderFormatClause;
2243+
public static final fun formatHeader (Lorg/jetbrains/kotlinx/dataframe/DataFrame;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/api/HeaderFormatClause;
2244+
public static final fun formatHeader (Lorg/jetbrains/kotlinx/dataframe/api/FormattedFrame;)Lorg/jetbrains/kotlinx/dataframe/api/HeaderFormatClause;
2245+
public static final fun formatHeader (Lorg/jetbrains/kotlinx/dataframe/api/FormattedFrame;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/api/HeaderFormatClause;
2246+
public static final fun formatHeader (Lorg/jetbrains/kotlinx/dataframe/api/FormattedFrame;[Ljava/lang/String;)Lorg/jetbrains/kotlinx/dataframe/api/HeaderFormatClause;
2247+
public static final fun with (Lorg/jetbrains/kotlinx/dataframe/api/HeaderFormatClause;Lkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/api/FormattedFrame;
2248+
}
2249+
22382250
public final class org/jetbrains/kotlinx/dataframe/api/FormatKt {
22392251
public static final fun and (Lorg/jetbrains/kotlinx/dataframe/api/CellAttributes;Lorg/jetbrains/kotlinx/dataframe/api/CellAttributes;)Lorg/jetbrains/kotlinx/dataframe/api/CellAttributes;
22402252
public static final fun at (Lorg/jetbrains/kotlinx/dataframe/api/FormatClause;Ljava/util/Collection;)Lorg/jetbrains/kotlinx/dataframe/api/FormatClause;
@@ -2257,8 +2269,8 @@ public final class org/jetbrains/kotlinx/dataframe/api/FormatKt {
22572269
}
22582270

22592271
public final class org/jetbrains/kotlinx/dataframe/api/FormattedFrame {
2260-
public fun <init> (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lkotlin/jvm/functions/Function3;)V
2261-
public synthetic fun <init> (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lkotlin/jvm/functions/Function3;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
2272+
public fun <init> (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function2;)V
2273+
public synthetic fun <init> (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
22622274
public final fun getDisplayConfiguration (Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;)Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;
22632275
public final fun toHtml (Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
22642276
public static synthetic fun toHtml$default (Lorg/jetbrains/kotlinx/dataframe/api/FormattedFrame;Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/io/DataFrameHtmlData;
@@ -2543,6 +2555,12 @@ public final class org/jetbrains/kotlinx/dataframe/api/HeadKt {
25432555
public static synthetic fun head$default (Lorg/jetbrains/kotlinx/dataframe/DataFrame;IILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
25442556
}
25452557

2558+
public final class org/jetbrains/kotlinx/dataframe/api/HeaderFormatClause {
2559+
public fun <init> (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;)V
2560+
public synthetic fun <init> (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
2561+
public fun toString ()Ljava/lang/String;
2562+
}
2563+
25462564
public final class org/jetbrains/kotlinx/dataframe/api/ImplodeKt {
25472565
public static final fun implode (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Z)Lorg/jetbrains/kotlinx/dataframe/DataRow;
25482566
public static final fun implode (Lorg/jetbrains/kotlinx/dataframe/DataFrame;ZLkotlin/jvm/functions/Function2;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
@@ -3469,6 +3487,11 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/NoneColumnsS
34693487
public abstract interface class org/jetbrains/kotlinx/dataframe/api/NoneColumnsSelectionDsl$Grammar$PlainDslName {
34703488
}
34713489

3490+
public final class org/jetbrains/kotlinx/dataframe/api/NoneKt {
3491+
public static final fun none (Lorg/jetbrains/kotlinx/dataframe/DataColumn;Lkotlin/jvm/functions/Function1;)Z
3492+
public static final fun none (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Lkotlin/jvm/functions/Function2;)Z
3493+
}
3494+
34723495
public final class org/jetbrains/kotlinx/dataframe/api/NullabilityException : java/lang/Exception {
34733496
public fun <init> ()V
34743497
}
@@ -3547,8 +3570,12 @@ public final class org/jetbrains/kotlinx/dataframe/api/ParseKt {
35473570
public static synthetic fun parse$default (Lorg/jetbrains/kotlinx/dataframe/DataFrame;[Lorg/jetbrains/kotlinx/dataframe/columns/ColumnReference;Lorg/jetbrains/kotlinx/dataframe/api/ParserOptions;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
35483571
public static final fun parseAnyFrameNullable (Lorg/jetbrains/kotlinx/dataframe/DataColumn;Lorg/jetbrains/kotlinx/dataframe/api/ParserOptions;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
35493572
public static synthetic fun parseAnyFrameNullable$default (Lorg/jetbrains/kotlinx/dataframe/DataColumn;Lorg/jetbrains/kotlinx/dataframe/api/ParserOptions;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
3573+
public static final fun parseChar (Lorg/jetbrains/kotlinx/dataframe/DataColumn;Lorg/jetbrains/kotlinx/dataframe/api/ParserOptions;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
3574+
public static synthetic fun parseChar$default (Lorg/jetbrains/kotlinx/dataframe/DataColumn;Lorg/jetbrains/kotlinx/dataframe/api/ParserOptions;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
35503575
public static final fun tryParse (Lorg/jetbrains/kotlinx/dataframe/DataColumn;Lorg/jetbrains/kotlinx/dataframe/api/ParserOptions;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
35513576
public static synthetic fun tryParse$default (Lorg/jetbrains/kotlinx/dataframe/DataColumn;Lorg/jetbrains/kotlinx/dataframe/api/ParserOptions;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
3577+
public static final fun tryParseChar (Lorg/jetbrains/kotlinx/dataframe/DataColumn;Lorg/jetbrains/kotlinx/dataframe/api/ParserOptions;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
3578+
public static synthetic fun tryParseChar$default (Lorg/jetbrains/kotlinx/dataframe/DataColumn;Lorg/jetbrains/kotlinx/dataframe/api/ParserOptions;ILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
35523579
}
35533580

35543581
public final class org/jetbrains/kotlinx/dataframe/api/ParserOptions {
@@ -6194,23 +6221,29 @@ public final class org/jetbrains/kotlinx/dataframe/io/DisplayConfiguration {
61946221
public static final field Companion Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration$Companion;
61956222
public synthetic fun <init> (Ljava/lang/Integer;Ljava/lang/Integer;ILkotlin/jvm/functions/Function3;Ljava/lang/String;ZZZZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
61966223
public synthetic fun <init> (Ljava/lang/Integer;Ljava/lang/Integer;ILkotlin/jvm/functions/Function3;Ljava/lang/String;ZZZZZLkotlin/jvm/internal/DefaultConstructorMarker;)V
6224+
public synthetic fun <init> (Ljava/lang/Integer;Ljava/lang/Integer;ILkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function2;Ljava/lang/String;ZZZZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
6225+
public synthetic fun <init> (Ljava/lang/Integer;Ljava/lang/Integer;ILkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function2;Ljava/lang/String;ZZZZZLkotlin/jvm/internal/DefaultConstructorMarker;)V
61976226
public final fun component1 ()Ljava/lang/Integer;
61986227
public final fun component10 ()Z
6228+
public final fun component11 ()Z
61996229
public final fun component2 ()Ljava/lang/Integer;
62006230
public final fun component3 ()I
62016231
public final fun component4 ()Lkotlin/jvm/functions/Function3;
6202-
public final fun component5-3Sl7FsM ()Ljava/lang/String;
6203-
public final fun component6 ()Z
6204-
public final fun component8 ()Z
6232+
public final fun component5 ()Lkotlin/jvm/functions/Function2;
6233+
public final fun component6-3Sl7FsM ()Ljava/lang/String;
6234+
public final fun component7 ()Z
62056235
public final fun component9 ()Z
6206-
public final fun copy-rqXL5tM (Ljava/lang/Integer;Ljava/lang/Integer;ILkotlin/jvm/functions/Function3;Ljava/lang/String;ZZZZZ)Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;
6236+
public final fun copy-bMNacXk (Ljava/lang/Integer;Ljava/lang/Integer;ILkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function2;Ljava/lang/String;ZZZZZ)Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;
6237+
public static synthetic fun copy-bMNacXk$default (Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;Ljava/lang/Integer;Ljava/lang/Integer;ILkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function2;Ljava/lang/String;ZZZZZILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;
6238+
public final synthetic fun copy-rqXL5tM (Ljava/lang/Integer;Ljava/lang/Integer;ILkotlin/jvm/functions/Function3;Ljava/lang/String;ZZZZZ)Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;
62076239
public static synthetic fun copy-rqXL5tM$default (Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;Ljava/lang/Integer;Ljava/lang/Integer;ILkotlin/jvm/functions/Function3;Ljava/lang/String;ZZZZZILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/io/DisplayConfiguration;
62086240
public fun equals (Ljava/lang/Object;)Z
62096241
public final fun getCellContentLimit ()I
62106242
public final fun getCellFormatter ()Lkotlin/jvm/functions/Function3;
62116243
public final fun getDecimalFormat-3Sl7FsM ()Ljava/lang/String;
62126244
public final fun getDownsizeBufferedImage ()Z
62136245
public final fun getEnableFallbackStaticTables ()Z
6246+
public final fun getHeaderFormatter ()Lkotlin/jvm/functions/Function2;
62146247
public final fun getIsolatedOutputs ()Z
62156248
public final fun getNestedRowsLimit ()Ljava/lang/Integer;
62166249
public final fun getRowsLimit ()Ljava/lang/Integer;
@@ -6222,6 +6255,7 @@ public final class org/jetbrains/kotlinx/dataframe/io/DisplayConfiguration {
62226255
public final fun setDecimalFormat-h5o3lmc (Ljava/lang/String;)V
62236256
public final fun setDownsizeBufferedImage (Z)V
62246257
public final fun setEnableFallbackStaticTables (Z)V
6258+
public final fun setHeaderFormatter (Lkotlin/jvm/functions/Function2;)V
62256259
public final fun setIsolatedOutputs (Z)V
62266260
public final fun setNestedRowsLimit (Ljava/lang/Integer;)V
62276261
public final fun setRowsLimit (Ljava/lang/Integer;)V

‎core/build.gradle.kts‎

Lines changed: 48 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import com.google.devtools.ksp.gradle.KspTaskJvm
33
import io.github.devcrocod.korro.KorroTask
44
import nl.jolanrensen.kodex.gradle.creatingRunKodexTask
55
import org.gradle.jvm.tasks.Jar
6-
import org.gradle.kotlin.dsl.withType
6+
import org.intellij.lang.annotations.Language
77
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
88

99
plugins {
@@ -251,6 +251,53 @@ val changeJarTask by tasks.registering {
251251
}
252252
}
253253

254+
// generateLibrariesJson makes sure a META-INF/kotlin-jupyter-libraries/libraries.json file is generated
255+
// This file allows loading dataframe-jupyter when dataframe-core is present on its own in a Kotlin Notebook.
256+
val generatedJupyterResourcesDir = layout.buildDirectory.dir("generated/jupyter")
257+
val generateLibrariesJson by tasks.registering {
258+
val outDir = generatedJupyterResourcesDir.get().asFile.resolve("META-INF/kotlin-jupyter-libraries")
259+
val outFile = outDir.resolve("libraries.json")
260+
outputs.file(outFile)
261+
inputs.property("version", project.version)
262+
263+
doLast {
264+
outDir.mkdirs()
265+
@Language("json")
266+
val content =
267+
"""
268+
{
269+
"descriptors": [
270+
{
271+
"init": [
272+
"USE { dependencies(\"org.jetbrains.kotlinx:dataframe-jupyter:${project.version}\") }"
273+
]
274+
}
275+
]
276+
}
277+
""".trimIndent()
278+
279+
outFile.delete()
280+
outFile.writeText(content)
281+
logger.lifecycle("generated META-INF/kotlin-jupyter-libraries/libraries.json for :core")
282+
}
283+
}
284+
285+
// If `includeCoreLibrariesJson` is set, modify the processResources task such that it includes
286+
// a META-INF libraries.json file.
287+
// This file allows loading dataframe-jupyter when dataframe-core is present on its own in a Kotlin Notebook.
288+
// This is usually only done when publishing.
289+
tasks.processResources {
290+
if (project.hasProperty("includeCoreLibrariesJson")) {
291+
dependsOn(generateLibrariesJson)
292+
from(generatedJupyterResourcesDir) {
293+
into("") // keep META-INF/... structure as generated
294+
}
295+
doLast {
296+
logger.lifecycle("$this includes generated META-INF/kotlin-jupyter-libraries/libraries.json")
297+
}
298+
}
299+
}
300+
254301
// if `processKDocsMain` runs, the Jar tasks must run after it so the generated-sources are there
255302
tasks.withType<Jar> {
256303
mustRunAfter(changeJarTask, tasks.generateKeywordsSrc, processKDocsMain)
@@ -386,17 +433,6 @@ kotlinPublications {
386433
}
387434
}
388435

389-
val instrumentedJars: Configuration by configurations.creating {
390-
isCanBeConsumed = true
391-
isCanBeResolved = false
392-
}
393-
394-
artifacts {
395-
add("instrumentedJars", tasks.jar.get().archiveFile) {
396-
builtBy(tasks.jar)
397-
}
398-
}
399-
400436
// Disable and enable if updating plugin breaks the build
401437
dataframes {
402438
schema {

0 commit comments

Comments
 (0)