Skip to content
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.

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

Spark 3.3.0 support, gradle, and automate releasing all versions at once #168

Merged
merged 15 commits into from
Jul 12, 2022

Conversation

Jolanrensen
Copy link
Collaborator

@Jolanrensen Jolanrensen commented Jun 20, 2022

@Jolanrensen Jolanrensen changed the title kotlin 1.7.0, spark 3.3.0 Spark 3.3.0 support Jun 20, 2022
@Jolanrensen
Copy link
Collaborator Author

Maybe also find a way for #166 here

@Jolanrensen Jolanrensen added this to the 1.2.0 milestone Jun 21, 2022
@Jolanrensen Jolanrensen changed the title Spark 3.3.0 support Spark 3.3.0 support and automate releasing all versions at once Jun 21, 2022
…All packages will be

pacakge_scala.version_spark.version.
# Conflicts:
#	core/src/main/scala/org/jetbrains/kotlinx/spark/extensions/VarargUnwrapper.scala
#	kotlin-spark-api/src/main/kotlin/org/jetbrains/kotlinx/spark/api/UDFRegister.kt
#	kotlin-spark-api/src/main/kotlin/org/jetbrains/kotlinx/spark/api/UserDefinedAggregateFunction.kt
#	kotlin-spark-api/src/main/kotlin/org/jetbrains/kotlinx/spark/api/UserDefinedFunction.kt
#	kotlin-spark-api/src/main/kotlin/org/jetbrains/kotlinx/spark/api/UserDefinedFunctionVararg.kt
#	kotlin-spark-api/src/main/kotlin/org/jetbrains/kotlinx/spark/api/UserDefinedFunctions.kt
#	kotlin-spark-api/src/test/kotlin/org/jetbrains/kotlinx/spark/api/UDFRegisterTest.kt
#	kotlin-spark-api/src/test/kotlin/org/jetbrains/kotlinx/spark/api/UDFTest.kt
# Conflicts:
#	core/pom.xml
#	dummy/pom.xml
#	examples/pom.xml
#	jupyter/pom.xml
#	kotlin-spark-api/pom.xml
#	kotlin-spark-api/src/test/kotlin/org/jetbrains/kotlinx/spark/api/UDFRegisterTest.kt
#	pom.xml
#	pom_parent.xml
#	scala-tuples-in-kotlin/pom.xml
@Jolanrensen Jolanrensen changed the title Spark 3.3.0 support and automate releasing all versions at once Spark 3.3.0 support, gradle, and automate releasing all versions at once Jun 27, 2022
@Jolanrensen Jolanrensen mentioned this pull request Jun 27, 2022
@Jolanrensen Jolanrensen requested a review from asm0dey July 11, 2022 11:18
Copy link
Contributor

@asm0dey asm0dey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like the structure, but I would prefer to have this split into couple commits — one for migration maven—gradle, one for tests fixes, one for jcp maybe

@Jolanrensen
Copy link
Collaborator Author

I like the structure, but I would prefer to have this split into couple commits — one for migration maven—gradle, one for tests fixes, one for jcp maybe

It's difficult to squash the older commits since this is already a combination of 2 or 3 pull requests. (The gradle branch, spark 3.0 support branch, main branch). Squashing with 2+ parents is impossible afaik

@asm0dey asm0dey force-pushed the spark-3.3.0-support branch 4 times, most recently from 922f3ac to d4fedf7 Compare July 11, 2022 15:33
…dlew command. JCP is used for compatibilty issues across scala- and spark versions. JPC compatibility with IntelliJ is fixed. gradlew-all-versions can be used to push commands to all versions, gh actions uses matrix to deploy/build all of them. kotlin 1.7.10, updated readme.
@Jolanrensen
Copy link
Collaborator Author

Jolanrensen commented Jul 11, 2022

@asm0dey I want to update the wip commit message to:

Scala- and Spark version now controlled from gradle.properties or gradlew command. JCP is used for compatibilty issues across scala- and spark versions. JPC compatibility with IntelliJ is fixed. gradlew-all-versions can be used to push commands to all versions, gh actions uses matrix to deploy/build all of them. kotlin 1.7.10, updated readme.

But githut rejects my push for some reason. Could you try to rename it to this?

@Jolanrensen Jolanrensen merged commit 4aabc9c into main Jul 12, 2022
@Jolanrensen Jolanrensen deleted the spark-3.3.0-support branch July 12, 2022 10:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants