Skip to content

Commit

Permalink
upgrade to spark 3.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
zavoraad committed Mar 15, 2024
1 parent 1f91d24 commit e8c5512
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 38 deletions.
30 changes: 1 addition & 29 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import sbt.nio.Keys._
lazy val scala212 = "2.12.8"
lazy val scala211 = "2.11.12"

lazy val sparkVersion = sys.env.getOrElse("SPARK_VERSION", "3.2.1")
lazy val sparkVersion = sys.env.getOrElse("SPARK_VERSION", "3.4.1")

def majorMinorVersion(version: String): String = {
StringUtils.ordinalIndexOf(version, ".", 2) match {
Expand Down Expand Up @@ -79,9 +79,6 @@ lazy val commonSettings = Seq(
resolvers += "Apache Snapshots" at "https://repository.apache.org/snapshots/"
)

lazy val functionsYml = settingKey[File]("functionsYml")
ThisBuild / functionsYml := (ThisBuild / baseDirectory).value / "functions.yml"

lazy val sparkDependencies = Seq(
"org.apache.spark" %% "spark-catalyst" % sparkVersion,
"org.apache.spark" %% "spark-core" % sparkVersion,
Expand Down Expand Up @@ -134,7 +131,6 @@ lazy val core = (project in file("."))
// do so.
Compile / packageBin / packageOptions +=
Package.ManifestAttributes("Git-Release-Hash" -> currentGitHash(baseDirectory.value)),
bintrayRepository := "smolder",
libraryDependencies ++= coreDependencies :+ scalaLoggingDependency.value,
Compile / unmanagedSourceDirectories +=
baseDirectory.value / "src" / "main" / "shim" / majorMinorVersion(sparkVersion),
Expand Down Expand Up @@ -179,29 +175,6 @@ ThisBuild / pomIncludeRepository := { _ =>
ThisBuild / publishMavenStyle := true

ThisBuild / bintrayOrganization := Some("com.databricks.labs")
ThisBuild / bintrayRepository := "smolder"

lazy val stableVersion = settingKey[String]("Stable version")
ThisBuild / stableVersion := IO
.read((ThisBuild / baseDirectory).value / "stable-version.txt")
.trim()

lazy val stagedRelease = (project in file("src/test"))
.settings(
commonSettings,
Test / resourceDirectory := baseDirectory.value / "resources",
Test / scalaSource := baseDirectory.value / "scala",
Test / unmanagedSourceDirectories += baseDirectory.value / "shim" / majorMinorVersion(sparkVersion),
libraryDependencies ++= testSparkDependencies ++ testCoreDependencies :+
"com.databricks.labs" %% "smolder" % stableVersion.value % "test",
resolvers := Seq("bintray-staging" at "https://dl.bintray.com/com.databricks.labs/smolder"),
org
.jetbrains
.sbt
.extractors
.SettingKeys
.sbtIdeaIgnoreModule := true // Do not import this SBT project into IDEA
)

import ReleaseTransformations._

Expand Down Expand Up @@ -231,7 +204,6 @@ releaseProcess := Seq[ReleaseStep](
tagRelease
) ++
crossReleaseStep(publishArtifacts) ++
crossReleaseStep(releaseStepCommandAndRemaining("stagedRelease/test")) ++
Seq(
setNextVersion,
commitNextVersion
Expand Down
7 changes: 0 additions & 7 deletions project/StableVersionPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,6 @@ object StableVersionPlugin extends AutoPlugin {

import autoImport._

override def projectSettings: Seq[Setting[_]] = {
Seq(
stableVersionFile := baseDirectory.value / "stable-version.txt",
stableCommitMessage := s"Setting stable version to ${runtimeVersion.value}"
)
}

private def updateStableVersionStep(
selectVersion: Versions => String,
fileSettingKey: SettingKey[File]): ReleaseStep = { st: State =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class HL7FileFormat extends FileFormat with DataSourceRegister {
val serializableConf = new SerializableConfiguration(hadoopConf)

partitionedFile => {
val path = new Path(partitionedFile.filePath)
val path = new Path(partitionedFile.filePath.toUri)
val hadoopFs = path.getFileSystem(serializableConf.value)

// open file, read fully, and close
Expand Down
1 change: 0 additions & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
version in ThisBuild := "0.0.3-SNAPSHOT"

0 comments on commit e8c5512

Please sign in to comment.