Skip to content

Commit 40d1d46

Browse files
authored
Merge pull request #198 from devongleeson/spark-3.3.2
Update spark to 3.3.2
2 parents e52a517 + f7f351e commit 40d1d46

File tree

6 files changed

+20
-18
lines changed

6 files changed

+20
-18
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
matrix:
1414
scala: [ "2.12.17", "2.13.10" ]
15-
spark: [ "3.3.1", "3.3.0", "3.2.3", "3.2.2", "3.2.1", "3.2.0", "3.1.3", "3.1.2", "3.1.1", "3.1.0", "3.0.3", "3.0.2", "3.0.1", "3.0.0" ]
15+
spark: [ "3.3.2", "3.3.1", "3.3.0", "3.2.3", "3.2.2", "3.2.1", "3.2.0", "3.1.3", "3.1.2", "3.1.1", "3.1.0", "3.0.3", "3.0.2", "3.0.1", "3.0.0" ]
1616
exclude:
1717
- scala: "2.13.10"
1818
spark: "3.1.3"

.github/workflows/publish_dev_version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
matrix:
1212
scala: [ "2.12.17", "2.13.10" ]
13-
spark: [ "3.3.1", "3.3.0", "3.2.3", "3.2.2", "3.2.1", "3.2.0", "3.1.3", "3.1.2", "3.1.1", "3.1.0", "3.0.3", "3.0.2", "3.0.1", "3.0.0" ]
13+
spark: [ "3.3.2", "3.3.1", "3.3.0", "3.2.3", "3.2.2", "3.2.1", "3.2.0", "3.1.3", "3.1.2", "3.1.1", "3.1.0", "3.0.3", "3.0.2", "3.0.1", "3.0.0" ]
1414
exclude:
1515
- scala: "2.13.10"
1616
spark: "3.1.3"

.github/workflows/publish_release_version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
strategy:
1010
matrix:
1111
scala: [ "2.12.17", "2.13.10" ]
12-
spark: [ "3.3.1", "3.3.0", "3.2.3", "3.2.2", "3.2.1", "3.2.0", "3.1.3", "3.1.2", "3.1.1", "3.1.0", "3.0.3", "3.0.2", "3.0.1", "3.0.0" ]
12+
spark: [ "3.3.2", "3.3.1", "3.3.0", "3.2.3", "3.2.2", "3.2.1", "3.2.0", "3.1.3", "3.1.2", "3.1.1", "3.1.0", "3.0.3", "3.0.2", "3.0.1", "3.0.0" ]
1313
exclude:
1414
- scala: "2.13.10"
1515
spark: "3.1.3"

README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Kotlin Stable](https://kotl.in/badges/stable.svg)](https://kotlinlang.org/docs/components-stability.html)
44
[![JetBrains official project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
5-
[![Maven Central](https://img.shields.io/maven-central/v/org.jetbrains.kotlinx.spark/kotlin-spark-api_3.3.1_2.13.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:"org.jetbrains.kotlinx.spark"%20AND%20a:"kotlin-spark-api_3.3.1_2.13")
5+
[![Maven Central](https://img.shields.io/maven-central/v/org.jetbrains.kotlinx.spark/kotlin-spark-api_3.3.2_2.13.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:"org.jetbrains.kotlinx.spark"%20AND%20a:"kotlin-spark-api_3.3.2_2.13")
66
[![Join the chat at https://gitter.im/JetBrains/kotlin-spark-api](https://badges.gitter.im/JetBrains/kotlin-spark-api.svg)](https://gitter.im/JetBrains/kotlin-spark-api?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
77

88
Your next API to work with [Apache Spark](https://spark.apache.org/).
@@ -38,6 +38,8 @@ We have opened a Spark Project Improvement Proposal: [Kotlin support for Apache
3838

3939
| Apache Spark | Scala | Kotlin for Apache Spark |
4040
|:------------:|:-----:|:-----------------------------------:|
41+
| 3.3.2 | 2.13 | kotlin-spark-api_3.3.2_2.13:VERSION |
42+
| | 2.12 | kotlin-spark-api_3.3.2_2.12:VERSION |
4143
| 3.3.1 | 2.13 | kotlin-spark-api_3.3.1_2.13:VERSION |
4244
| | 2.12 | kotlin-spark-api_3.3.1_2.12:VERSION |
4345
| 3.3.0 | 2.13 | kotlin-spark-api_3.3.0_2.13:VERSION |
@@ -73,7 +75,7 @@ The Kotlin for Spark artifacts adhere to the following convention:
7375
The only exception to this is `scala-tuples-in-kotlin_[Scala core version]:[Kotlin for Apache Spark API version]`, which is
7476
independent of Spark.
7577

76-
[![Maven Central](https://img.shields.io/maven-central/v/org.jetbrains.kotlinx.spark/kotlin-spark-api_3.3.1_2.13.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:"org.jetbrains.kotlinx.spark"%20AND%20a:"kotlin-spark-api_3.3.1_2.13")
78+
[![Maven Central](https://img.shields.io/maven-central/v/org.jetbrains.kotlinx.spark/kotlin-spark-api_3.3.2_2.13.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:"org.jetbrains.kotlinx.spark"%20AND%20a:"kotlin-spark-api_3.3.2_2.13")
7779

7880
## How to configure Kotlin for Apache Spark in your project
7981

@@ -84,7 +86,7 @@ Here's an example `pom.xml`:
8486
```xml
8587
<dependency>
8688
<groupId>org.jetbrains.kotlinx.spark</groupId>
87-
<artifactId>kotlin-spark-api_3.3.1_2.13</artifactId>
89+
<artifactId>kotlin-spark-api_3.3.2_2.13</artifactId>
8890
<version>${kotlin-spark-api.version}</version>
8991
</dependency>
9092
<dependency>
@@ -117,7 +119,7 @@ To it, simply add
117119
to the top of your notebook. This will get the latest version of the API, together with the latest version of Spark.
118120
To define a certain version of Spark or the API itself, simply add it like this:
119121
```jupyterpython
120-
%use spark(spark=3.3.1, scala=2.13, v=1.2.3)
122+
%use spark(spark=3.3.2, scala=2.13, v=1.2.3)
121123
```
122124

123125
Inside the notebook a Spark session will be initiated automatically. This can be accessed via the `spark` value.

docs/quick-start-guide.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Here's what the `pom.xml` looks like for this example:
6060

6161
<properties>
6262
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
63-
<kotlin.version>1.4.0</kotlin.version>
63+
<kotlin.version>1.8.0</kotlin.version>
6464
<kotlin.code.style>official</kotlin.code.style>
6565
</properties>
6666

@@ -72,13 +72,13 @@ Here's what the `pom.xml` looks like for this example:
7272
</dependency>
7373
<dependency> <!-- Kotlin Spark API dependency -->
7474
<groupId>org.jetbrains.kotlinx.spark</groupId>
75-
<artifactId>kotlin-spark-api_3.3.1_2.13</artifactId>
75+
<artifactId>kotlin-spark-api_3.3.2_2.13</artifactId>
7676
<version>1.2.3</version>
7777
</dependency>
7878
<dependency> <!-- Spark dependency -->
7979
<groupId>org.apache.spark</groupId>
8080
<artifactId>spark-sql_2.12</artifactId>
81-
<version>3.3.1</version>
81+
<version>3.3.2</version>
8282
</dependency>
8383
</dependencies>
8484

@@ -161,10 +161,10 @@ repositories {
161161
162162
dependencies {
163163
// Kotlin stdlib
164-
implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.4.0'
164+
implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.8.0'
165165
// Kotlin Spark API
166-
implementation 'org.jetbrains.kotlinx.spark:kotlin-spark-api_3.3.1_2.13:1.2.3' // Apache Spark
167-
compileOnly 'org.apache.spark:spark-sql_2.12:3.3.1'
166+
implementation 'org.jetbrains.kotlinx.spark:kotlin-spark-api_3.3.2_2.13:1.2.3' // Apache Spark
167+
compileOnly 'org.apache.spark:spark-sql_2.12:3.3.2'
168168
}
169169
170170
compileKotlin {
@@ -186,7 +186,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
186186
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
187187
188188
plugins {
189-
id ("org.jetbrains.kotlin.jvm") version "1.4.0"
189+
id ("org.jetbrains.kotlin.jvm") version "1.8.0"
190190
id ("com.github.johnrengelman.shadow") version "5.2.0"
191191
}
192192
@@ -198,9 +198,9 @@ dependencies {
198198
// Kotlin stdlib
199199
implementation ("org.jetbrains.kotlin:kotlin-stdlib:1.4.0")
200200
// Kotlin Spark API
201-
implementation ("org.jetbrains.kotlinx.spark:kotlin-spark-api_3.3.1_2.13:1.2.3")
201+
implementation ("org.jetbrains.kotlinx.spark:kotlin-spark-api_3.3.2_2.13:1.2.3")
202202
// Apache Spark
203-
compileOnly ("org.apache.spark:spark-sql_2.12:3.3.1")
203+
compileOnly ("org.apache.spark:spark-sql_2.12:3.3.2")
204204
}
205205
206206
compileKotlin.kotlinOptions.jvmTarget = "1.8"

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ GROUP=org.jetbrains.kotlinx.spark
77

88
# Controls the spark and scala version for the entire project
99
# can also be defined like ./gradlew -Pspark=X.X.X -Pscala=X.X.X build
10-
spark=3.3.1
10+
spark=3.3.2
1111
scala=2.13.10
1212
# scala=2.12.17
1313
skipScalaTuplesInKotlin=false
1414

1515
org.gradle.caching=true
1616
org.gradle.parallel=false
17-
#kotlin.incremental.useClasspathSnapshot=true
17+
#kotlin.incremental.useClasspathSnapshot=true

0 commit comments

Comments
 (0)