Skip to content

Commit 5efb4c9

Browse files
committed
SparkIntegration now uses spark connect :)
1 parent 71f115a commit 5efb4c9

File tree

20 files changed

+1072
-966
lines changed

20 files changed

+1072
-966
lines changed

.editorconfig

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
root = true
2+
3+
[*]
4+
charset=utf-8
5+
end_of_line=lf
6+
insert_final_newline=true
7+
indent_style=space
8+
indent_size=4
9+
max_line_length=120
10+
11+
[*.json]
12+
indent_size=2
13+
14+
[*.yaml]
15+
indent_size=2
16+
17+
[*.ipynb]
18+
insert_final_newline=false
19+
20+
[*.{kt,kts}]
21+
ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
22+
23+
ktlint_code_style = ktlint_official
24+
ktlint_experimental = enabled
25+
ktlint_standard_filename = disabled
26+
ktlint_standard_no-empty-first-line-in-class-body = disabled
27+
ktlint_class_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 4
28+
ktlint_ignore_back_ticked_identifier = true
29+
ktlint_standard_multiline-expression-wrapping = disabled
30+
31+
[*/build/**/*]
32+
ktlint = disabled

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -377,3 +377,4 @@ orcpath/
377377
**/.allure/
378378
**/allure-results/
379379
/generated_*
380+
/.kotlin/

buildSrc/src/main/kotlin/Versions.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ object Versions : Dsl<Versions> {
44
const val project = "2.0.0-SNAPSHOT"
55
const val kotlinSparkApiGradlePlugin = "2.0.0-SNAPSHOT"
66
const val groupID = "org.jetbrains.kotlinx.spark"
7-
const val kotlin = "2.0.0-RC3"
7+
const val kotlin = "2.0.0"
88
const val jvmTarget = "1.8"
99
val jvmLanguageVersion = JavaLanguageVersion.of(8)
1010
const val jupyterJvmTarget = "8"

gradle/bootstraps/compiler-plugin.jar

0 Bytes
Binary file not shown.

gradle/bootstraps/gradle-plugin.jar

0 Bytes
Binary file not shown.

jupyter/build.gradle.kts

+12-4
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,22 @@ dependencies {
4747
// https://github.com/FasterXML/jackson-bom/issues/52
4848
if (Versions.spark == "3.3.1") implementation(jacksonDatabind)
4949

50+
if (Versions.sparkConnect) {
51+
// IMPORTANT!
52+
compileOnly(sparkSqlApi)
53+
implementation(sparkConnectClient)
54+
} else {
55+
implementation(sparkSql)
56+
}
57+
5058
api(
5159
kotlinxHtml,
52-
sparkSql,
53-
sparkRepl,
54-
sparkStreaming,
55-
hadoopClient,
5660
)
5761

5862
implementation(
5963
kotlinStdLib,
64+
hadoopClient,
65+
reflect
6066
)
6167

6268
testImplementation(
@@ -65,6 +71,8 @@ dependencies {
6571
kotlinScriptingJvm,
6672
)
6773

74+
compileOnly(scalaLibrary)
75+
testCompileOnly(scalaLibrary)
6876
}
6977
}
7078

jupyter/src/main/kotlin/org/jetbrains/kotlinx/spark/api/jupyter/HtmlRendering.kt

-136
This file was deleted.

0 commit comments

Comments
 (0)