Skip to content

1.2.2 release #188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Dec 1, 2022
Merged

1.2.2 release #188

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c52eefe
updating version to 1.2.2-SNAPSHOT
Jolanrensen Aug 2, 2022
6d932ec
Added BigInteger support
Jolanrensen Sep 22, 2022
bb2fdac
Merge pull request #182 from Kotlin/biginteger
Jolanrensen Sep 22, 2022
a536cd6
including spark 3.2.3, 3.3.1, 3.2.2, scala bumps, small fix in Encoding
Jolanrensen Dec 1, 2022
58f665e
added version for jackson-databind to fix spark relying on unavailabl…
Jolanrensen Dec 1, 2022
2d84869
forgot a scala version
Jolanrensen Dec 1, 2022
76e3ea2
updating gradle, fix scala plugin for 2.12 versions, jackson fix now …
Jolanrensen Dec 1, 2022
406ff8d
updating kotlin version, updating release behavior
Jolanrensen Dec 1, 2022
047551b
updating docs with 3.3.1 and 1.2.2
Jolanrensen Dec 1, 2022
f309ed9
Merge pull request #187 from Kotlin/version-bumps
Jolanrensen Dec 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
updating gradle, fix scala plugin for 2.12 versions, jackson fix now … 
…only for spark 3.3.1
  • Loading branch information
@Jolanrensen
Jolanrensen committed Dec 1, 2022
commit 76e3ea264bf02aa8d4bf561e2c9a843e4cdb0160
16 changes: 11 additions & 5 deletions core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@ dependencies {
reflect,
)

// https://github.com/FasterXML/jackson-bom/issues/52
if (Versions.spark == "3.3.1") implementation(jacksonDatabind)

implementation(
jacksonDatabind, // Spark 3.3.1 https://github.com/FasterXML/jackson-bom/issues/52
sparkSql,
)
}
Expand All @@ -36,14 +38,18 @@ dependencies {

java {
toolchain {
languageVersion.set(
JavaLanguageVersion.of(Versions.jvmTarget)
)
if (Versions.scalaCompat.toDouble() > 2.12) { // scala 2.12 will always target java 8
languageVersion.set(
JavaLanguageVersion.of(Versions.jvmTarget)
)
}
}
}

tasks.withType<ScalaCompile> {
targetCompatibility = Versions.jvmTarget
if (Versions.scalaCompat.toDouble() > 2.12) { // scala 2.12 will always target java 8
targetCompatibility = Versions.jvmTarget
}
}

val scalaMainSources = sourceSets.main.get().scala.sourceDirectories
Expand Down
5 changes: 4 additions & 1 deletion examples/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,12 @@ dependencies {
}

with(Dependencies) {

// https://github.com/FasterXML/jackson-bom/issues/52
if (Versions.spark == "3.3.1") implementation(jacksonDatabind)

implementation(
sparkSql,
jacksonDatabind, // Spark 3.3.1 https://github.com/FasterXML/jackson-bom/issues/52
sparkMl,
sparkStreaming,
sparkStreamingKafka,
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
5 changes: 4 additions & 1 deletion jupyter/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ dependencies {
}

with(Dependencies) {

// https://github.com/FasterXML/jackson-bom/issues/52
if (Versions.spark == "3.3.1") implementation(jacksonDatabind)

api(
kotlinxHtml,
sparkSql,
Expand All @@ -52,7 +56,6 @@ dependencies {
)

implementation(
jacksonDatabind, // Spark 3.3.1 https://github.com/FasterXML/jackson-bom/issues/52
kotlinStdLib,
)

Expand Down
5 changes: 4 additions & 1 deletion kotlin-spark-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,13 @@ dependencies {
}

with(Dependencies) {

// https://github.com/FasterXML/jackson-bom/issues/52
if (Versions.spark == "3.3.1") implementation(jacksonDatabind)

implementation(
kotlinStdLib,
reflect,
jacksonDatabind, // Spark 3.3.1 https://github.com/FasterXML/jackson-bom/issues/52
sparkSql,
sparkStreaming,
hadoopClient,
Expand Down