Skip to content

Commit faf0d91

Browse files
authored
Merge pull request #1163 from Kotlin/jupyter-dependencies
Simplifies some dependencies, especially jupyter
2 parents 9e48295 + a44f749 commit faf0d91

File tree

8 files changed

+6
-31
lines changed

8 files changed

+6
-31
lines changed

build.gradle.kts

+2
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ configurations {
5050

5151
dependencies {
5252
api(projects.core)
53+
54+
// expose all optional IO dependencies by default
5355
api(projects.dataframeArrow)
5456
api(projects.dataframeExcel)
5557
api(projects.dataframeJdbc)

dataframe-arrow/build.gradle.kts

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ dependencies {
2424
implementation(libs.kotlin.reflect)
2525
implementation(libs.kotlin.datetimeJvm)
2626

27-
testApi(projects.core)
2827
testImplementation(libs.junit)
2928
testImplementation(libs.kotestAssertions) {
3029
exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk8")

dataframe-csv/build.gradle.kts

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ dependencies {
3838
implementation(libs.kotlinLogging)
3939
implementation(libs.kotlin.reflect)
4040

41-
testApi(projects.core)
4241
testImplementation(libs.kotlinx.benchmark.runtime)
4342
testImplementation(libs.junit)
4443
testImplementation(libs.sl4jsimple)

dataframe-jupyter/build.gradle.kts

+1-6
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,10 @@ repositories {
1818
}
1919

2020
dependencies {
21-
api(projects.core)
22-
api(projects.dataframeJson)
21+
api(projects.dataframe)
2322

2423
testImplementation(libs.junit)
2524
testImplementation(libs.serialization.json)
26-
testImplementation(projects.dataframeArrow)
27-
testImplementation(projects.dataframeCsv)
28-
testImplementation(projects.dataframeExcel)
29-
testImplementation(projects.dataframeJdbc)
3025
// experimental
3126
testImplementation(projects.dataframeOpenapiGenerator)
3227
testImplementation(projects.dataframeOpenapi)

dataframe-jupyter/src/main/kotlin/org/jetbrains/kotlinx/dataframe/jupyter/Integration.kt

-6
Original file line numberDiff line numberDiff line change
@@ -170,12 +170,6 @@ internal class Integration(private val notebook: Notebook, private val options:
170170
"org.jetbrains.kotlinx:dataframe-openapi-generator:$version",
171171
)
172172
}
173-
dependencies(
174-
"org.jetbrains.kotlinx:dataframe-csv:$version",
175-
"org.jetbrains.kotlinx:dataframe-excel:$version",
176-
"org.jetbrains.kotlinx:dataframe-jdbc:$version",
177-
"org.jetbrains.kotlinx:dataframe-arrow:$version",
178-
)
179173
}
180174

181175
try {

plugins/dataframe-gradle-plugin/build.gradle.kts

+1-6
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,7 @@ group = "org.jetbrains.kotlinx.dataframe"
1616

1717
dependencies {
1818
api(libs.kotlin.reflect)
19-
implementation(projects.core)
20-
implementation(projects.dataframeArrow)
21-
implementation(projects.dataframeExcel)
22-
implementation(projects.dataframeCsv)
23-
implementation(projects.dataframeJdbc)
24-
implementation(projects.dataframeJson)
19+
implementation(projects.dataframe)
2520
// experimental
2621
implementation(projects.dataframeOpenapiGenerator)
2722

plugins/symbol-processor/build.gradle.kts

+1-6
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,7 @@ repositories {
1919
group = "org.jetbrains.kotlinx.dataframe"
2020

2121
dependencies {
22-
implementation(projects.core)
23-
implementation(projects.dataframeArrow)
24-
implementation(projects.dataframeExcel)
25-
implementation(projects.dataframeCsv)
26-
implementation(projects.dataframeJdbc)
27-
implementation(projects.dataframeJson)
22+
implementation(projects.dataframe)
2823
// experimental
2924
implementation(projects.dataframeOpenapiGenerator)
3025

tests/build.gradle.kts

+1-5
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@ repositories {
1919
}
2020

2121
dependencies {
22-
implementation(projects.core)
23-
implementation(projects.dataframeExcel)
24-
implementation(projects.dataframeCsv)
25-
implementation(projects.dataframeJdbc)
26-
implementation(projects.dataframeArrow)
22+
implementation(projects.dataframe)
2723
testImplementation(libs.junit)
2824
testImplementation(libs.kotestAssertions) {
2925
exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk8")

0 commit comments

Comments
 (0)