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

Bump Scala 2.12 to 2.12.13 #461

Merged
merged 2 commits into from
Jan 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ jobs:
with:
java-version: ${{matrix.java}}
- if: startsWith(matrix.scala,'2.12')
# sbt-scoverage is not yet compatible with 2.12.13
# https://github.com/scoverage/sbt-scoverage/issues/319
run: |
sbt coverage "++${{matrix.scala}} test" coverageReport
sbt coverage "++2.12.12 test" coverageReport
bash <(curl -s https://codecov.io/bash)
- if: "!startsWith(matrix.scala,'2.12')"
run: sbt "++${{matrix.scala}} test"
Expand All @@ -35,7 +37,7 @@ jobs:
- 8
- 11
scala:
- 2.12.12
- 2.12.13
- 2.13.4
- 3.0.0-M3
mimaReport:
Expand All @@ -55,5 +57,5 @@ jobs:
- 8
- 11
scala:
- 2.12.12
- 2.12.13
- 2.13.4
26 changes: 13 additions & 13 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ lazy val commonSettings = Seq(
organization := "com.spotify",
name := "featran",
description := "Feature Transformers",
scalaVersion := "2.12.12",
scalaVersion := "2.12.13",
scalacOptions ++= commonScalacOptions,
scalacOptions ++= {
if (scalaBinaryVersion.value == "2.13")
Expand Down Expand Up @@ -133,7 +133,7 @@ lazy val root: Project = project
.enablePlugins(GhpagesPlugin, ScalaUnidocPlugin)
.settings(featranSettings)
.settings(
crossScalaVersions := Seq("2.12.12"),
crossScalaVersions := Seq("2.12.13"),
siteSubdirName in ScalaUnidoc := "api",
addMappingsToSiteDir(mappings in (ScalaUnidoc, packageDoc), siteSubdirName in ScalaUnidoc),
gitRemoteRepo := "git@github.com:spotify/featran.git",
Expand Down Expand Up @@ -168,7 +168,7 @@ lazy val core: Project = project
name := "core",
moduleName := "featran-core",
description := "Feature Transformers",
crossScalaVersions := Seq("3.0.0-M3", "2.12.12", "2.13.4"),
crossScalaVersions := Seq("3.0.0-M3", "2.12.13", "2.13.4"),
libraryDependencies ++= Seq(
"org.scalatest" %% "scalatest" % scalatestVersion % "test",
"org.apache.commons" % "commons-math3" % commonsMathVersion % "test"
Expand All @@ -190,7 +190,7 @@ lazy val java: Project = project
name := "java",
moduleName := "featran-java",
description := "Feature Transformers - java",
crossScalaVersions := Seq("2.12.12", "2.13.4"),
crossScalaVersions := Seq("2.12.13", "2.13.4"),
libraryDependencies ++= Seq(
"org.scalacheck" %% "scalacheck" % scalacheckVersion % "test",
"org.scalatest" %% "scalatest" % scalatestVersion % "test"
Expand All @@ -211,7 +211,7 @@ lazy val flink: Project = project
name := "flink",
moduleName := "featran-flink",
description := "Feature Transformers - Flink",
crossScalaVersions := Seq("2.12.12"),
crossScalaVersions := Seq("2.12.13"),
libraryDependencies ++= Seq(
"org.apache.flink" %% "flink-scala" % flinkVersion % "provided",
"org.apache.flink" %% "flink-clients" % flinkVersion % "provided",
Expand All @@ -232,7 +232,7 @@ lazy val scalding: Project = project
moduleName := "featran-scalding",
description := "Feature Transformers - Scalding",
resolvers += "Concurrent Maven Repo" at "https://conjars.org/repo",
crossScalaVersions := Seq("2.12.12"),
crossScalaVersions := Seq("2.12.13"),
libraryDependencies ++= Seq(
"com.twitter" %% "scalding-core" % scaldingVersion % "provided",
"org.apache.hadoop" % "hadoop-client" % hadoopVersion % "provided",
Expand All @@ -252,7 +252,7 @@ lazy val scio: Project = project
name := "scio",
moduleName := "featran-scio",
description := "Feature Transformers - Scio",
crossScalaVersions := Seq("2.12.12", "2.13.4"),
crossScalaVersions := Seq("2.12.13", "2.13.4"),
libraryDependencies ++= Seq(
"com.spotify" %% "scio-core" % scioVersion % "provided",
"com.spotify" %% "scio-test" % scioVersion % "test"
Expand All @@ -271,7 +271,7 @@ lazy val spark: Project = project
name := "spark",
moduleName := "featran-spark",
description := "Feature Transformers - Spark",
crossScalaVersions := Seq("2.12.12"),
crossScalaVersions := Seq("2.12.13"),
libraryDependencies ++= Seq(
"org.apache.spark" %% "spark-core" % sparkVersion % "provided",
"org.scalatest" %% "scalatest" % scalatestVersion % "test"
Expand All @@ -290,7 +290,7 @@ lazy val numpy: Project = project
name := "numpy",
moduleName := "featran-numpy",
description := "Feature Transformers - NumPy",
crossScalaVersions := Seq("3.0.0-M3", "2.12.12", "2.13.4"),
crossScalaVersions := Seq("3.0.0-M3", "2.12.13", "2.13.4"),
libraryDependencies ++= Seq(
"org.scalatest" %% "scalatest" % scalatestVersion % "test"
)
Expand All @@ -305,7 +305,7 @@ lazy val tensorflow: Project = project
name := "tensorflow",
moduleName := "featran-tensorflow",
description := "Feature Transformers - TensorFlow",
crossScalaVersions := Seq("2.12.12", "2.13.4"),
crossScalaVersions := Seq("2.12.13", "2.13.4"),
libraryDependencies ++= Seq(
"org.tensorflow" % "proto" % tensorflowVersion,
"me.lyh" %% "shapeless-datatype-tensorflow" % shapelessDatatypeVersion,
Expand All @@ -325,7 +325,7 @@ lazy val xgboost: Project = project
name := "xgboost",
moduleName := "featran-xgboost",
description := "Feature Transformers - XGBoost",
crossScalaVersions := Seq("3.0.0-M3", "2.12.12", "2.13.4"),
crossScalaVersions := Seq("3.0.0-M3", "2.12.13", "2.13.4"),
libraryDependencies ++= Seq(
"org.scalacheck" %% "scalacheck" % scalacheckVersion % "test"
).map(_.withDottyCompat(scalaVersion.value))
Expand All @@ -340,7 +340,7 @@ lazy val examples: Project = project
.settings(featranSettings)
.settings(soccoSettings)
.settings(
crossScalaVersions := Seq("2.12.12", "2.13.4"),
crossScalaVersions := Seq("2.12.13", "2.13.4"),
name := "examples",
moduleName := "featran-examples",
description := "Feature Transformers - examples",
Expand All @@ -355,7 +355,7 @@ lazy val jmh: Project = project
.in(file("jmh"))
.settings(featranSettings)
.settings(
crossScalaVersions := Seq("2.12.12"),
crossScalaVersions := Seq("2.12.13"),
name := "jmh",
description := "Featran JMH Microbenchmarks",
sourceDirectory in Jmh := (sourceDirectory in Test).value,
Expand Down