Skip to content

Commit

Permalink
SparkIntegration now uses spark connect :)
Browse files Browse the repository at this point in the history
  • Loading branch information
Jolanrensen committed Jun 20, 2024
1 parent 71f115a commit 03a54eb
Show file tree
Hide file tree
Showing 20 changed files with 1,099 additions and 961 deletions.
32 changes: 32 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
root = true

[*]
charset=utf-8
end_of_line=lf
insert_final_newline=true
indent_style=space
indent_size=4
max_line_length=120

[*.json]
indent_size=2

[*.yaml]
indent_size=2

[*.ipynb]
insert_final_newline=false

[*.{kt,kts}]
ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL

ktlint_code_style = ktlint_official
ktlint_experimental = enabled
ktlint_standard_filename = disabled
ktlint_standard_no-empty-first-line-in-class-body = disabled
ktlint_class_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = 4
ktlint_ignore_back_ticked_identifier = true
ktlint_standard_multiline-expression-wrapping = disabled

[*/build/**/*]
ktlint = disabled
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -377,3 +377,4 @@ orcpath/
**/.allure/
**/allure-results/
/generated_*
/.kotlin/
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ object Versions : Dsl<Versions> {
const val project = "2.0.0-SNAPSHOT"
const val kotlinSparkApiGradlePlugin = "2.0.0-SNAPSHOT"
const val groupID = "org.jetbrains.kotlinx.spark"
const val kotlin = "2.0.0-RC3"
const val kotlin = "2.0.0"
const val jvmTarget = "1.8"
val jvmLanguageVersion = JavaLanguageVersion.of(8)
const val jupyterJvmTarget = "8"
Expand Down
Binary file modified gradle/bootstraps/compiler-plugin.jar
Binary file not shown.
Binary file modified gradle/bootstraps/gradle-plugin.jar
Binary file not shown.
16 changes: 12 additions & 4 deletions jupyter/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,22 @@ dependencies {
// https://github.com/FasterXML/jackson-bom/issues/52
if (Versions.spark == "3.3.1") implementation(jacksonDatabind)

if (Versions.sparkConnect) {
// IMPORTANT!
compileOnly(sparkSqlApi)
implementation(sparkConnectClient)
} else {
implementation(sparkSql)
}

api(
kotlinxHtml,
sparkSql,
sparkRepl,
sparkStreaming,
hadoopClient,
)

implementation(
kotlinStdLib,
hadoopClient,
reflect
)

testImplementation(
Expand All @@ -65,6 +71,8 @@ dependencies {
kotlinScriptingJvm,
)

compileOnly(scalaLibrary)
testCompileOnly(scalaLibrary)
}
}

Expand Down

This file was deleted.

Loading

0 comments on commit 03a54eb

Please sign in to comment.