Skip to content

Commit 4c0b68f

Browse files
authored
Remove support for scala 2.12 (#1010)
Main reason to keep was to be compatible with Databricks But Databricks Runtime 16.3 should come early March and have support for 2.13&3 https://community.databricks.com/t5/data-engineering/when-will-db-release-runtime-with-scala-2-13/td-p/104399 https://docs.databricks.com/en/release-notes/runtime/index.html Note: not yet cleaning up code that could move to newer constructs not supported by 2.12
1 parent bb9a84e commit 4c0b68f

File tree

4 files changed

+2
-7519
lines changed

4 files changed

+2
-7519
lines changed

build.sbt

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ import sbtassembly.MergeStrategy
33
import scala.xml.{Node => XmlNode, NodeSeq => XmlNodeSeq, _}
44
import scala.xml.transform.{RewriteRule, RuleTransformer}
55

6-
val scala212 = "2.12.19"
76
val scala213 = "2.13.16"
8-
val supportedScalaVersions = List(scala212, scala213)
7+
val supportedScalaVersions = List(scala213)
98
val sparkVersion = "3.3.4"
109
val circeVersion = "0.14.9"
1110
val sttpVersion = "3.5.2"
@@ -46,7 +45,7 @@ lazy val commonSettings = Seq(
4645
crossScalaVersions := supportedScalaVersions,
4746
semanticdbEnabled := true,
4847
semanticdbVersion := scalafixSemanticdb.revision,
49-
scalaVersion := scala212, // default to Scala 2.12
48+
scalaVersion := scala213, // default to Scala 2.13
5049
// handle cross plugin https://github.com/stringbean/sbt-dependency-lock/issues/13
5150
dependencyLockFile := { baseDirectory.value / s"build.scala-${CrossVersion.partialVersion(scalaVersion.value) match { case Some((2, n)) => s"2.$n" }}.sbt.lock" },
5251
description := "Spark data source for the Cognite Data Platform.",
@@ -60,9 +59,6 @@ lazy val commonSettings = Seq(
6059
"-Wconf:src=src/test/scala/.*&cat=other-pure-statement:i",
6160
"-Wconf:src=src/test/scala/.*&msg=unused value of type org.scalatest.Assertion:s"
6261
)
63-
case Some((2, 12)) => Seq(
64-
"-Wconf:src=src/test/scala/.*&cat=unused:i"
65-
)
6662
case _ => Seq.empty
6763
}),
6864
resolvers ++= Resolver.sonatypeOssRepos("releases"),
@@ -158,7 +154,6 @@ lazy val library = (project in file("."))
158154
"io.scalaland" %% "chimney" % "1.1.0"
159155
// scala-collection-compat is used in stdlib collections conversion,
160156
// and this dependency causes issues with Livy.
161-
exclude("org.scala-lang.modules", "scala-collection-compat_2.12")
162157
exclude("org.scala-lang.modules", "scala-collection-compat_2.13"),
163158
"org.specs2" %% "specs2-core" % Specs2Version % Test,
164159
"com.softwaremill.sttp.client3" %% "async-http-client-backend-fs2" % sttpVersion,
@@ -167,18 +162,13 @@ lazy val library = (project in file("."))
167162
exclude("io.netty", "netty-buffer")
168163
exclude("io.netty", "netty-handler")
169164
exclude("io.netty", "netty-transport-native-epoll")
170-
exclude("com.softwaremill.sttp", "circe_2.12")
171165
exclude("com.softwaremill.sttp", "circe_2.13")
172-
exclude("org.typelevel", "cats-effect_2.12")
173166
exclude("org.typelevel", "cats-effect_2.13")
174-
exclude("org.typelevel", "cats-core_2.12")
175167
exclude("org.typelevel", "cats-core_2.13"),
176168
"org.slf4j" % "slf4j-api" % "2.0.9" % Provided,
177169
"io.circe" %% "circe-generic" % circeVersion
178-
exclude("org.typelevel", "cats-core_2.12")
179170
exclude("org.typelevel", "cats-core_2.13"),
180171
"io.circe" %% "circe-generic-extras" % "0.14.3"
181-
exclude("org.typelevel", "cats-core_2.12")
182172
exclude("org.typelevel", "cats-core_2.13"),
183173
"org.scalatest" %% "scalatest" % "3.0.8" % Test,
184174
"org.eclipse.jetty" % "jetty-servlet" % "9.4.44.v20210927" % Provided,

0 commit comments

Comments
 (0)