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.

Sign up for GitHub

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

Update scala 2.12 and 2.13 #913

Merged
merged 6 commits into from
Feb 6, 2021
Merged

Update scala 2.12 and 2.13 #913

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3c4ede0
Update scala 2.12 and 2.13
regadas Jan 15, 2021
4e86884
Update kind projector to 0.11.3
regadas Jan 16, 2021
b036920
Merge branch 'update_kindprojector' into update_scala
regadas Jan 16, 2021
ee35992
Use 2.12.12 for sbt-coverage
regadas Jan 24, 2021
4bc2c70
Merge remote-tracking branch 'origin/develop' into update_scala
regadas Feb 2, 2021
c4fb65b
Add 2.13 to MiMa CI step
regadas Feb 6, 2021
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: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ jobs:
- 11
scala:
- 2.11.12
- 2.12.12
- 2.13.3
- 2.12.13
- 2.13.4
test-coverage:
runs-on: ubuntu-latest
steps:
Expand All @@ -40,7 +40,7 @@ jobs:
- name: java ${{matrix.java}} setup
uses: olafurpg/setup-scala@v10
- run: |
sbt coverage test coverageReport
sbt ++2.12.12 coverage test coverageReport
bash <(curl -s https://codecov.io/bash)
mimaReport:
runs-on: ubuntu-latest
Expand All @@ -60,7 +60,7 @@ jobs:
- 11
scala:
- 2.11.12
- 2.12.12
- 2.12.13
regadas marked this conversation as resolved.
Show resolved Hide resolved
microsite:
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ See the [Algebird website](https://twitter.github.io/algebird) for more informat
```scala
> sbt algebird-core/console

Welcome to Scala 2.12.12 (OpenJDK 64-Bit Server VM, Java 11.0.1).
Welcome to Scala 2.12.13 (OpenJDK 64-Bit Server VM, Java 11.0.1).
Type in expressions for evaluation. Or try :help.

scala> import com.twitter.algebird._
Expand Down
12 changes: 6 additions & 6 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ crossScalaVersions := Nil

val sharedSettings = Seq(
organization := "com.twitter",
scalaVersion := "2.12.12",
scalaVersion := "2.12.13",
crossScalaVersions := Seq("2.11.12", scalaVersion.value),
resolvers ++= Seq(
Opts.resolver.sonatypeSnapshots,
Expand Down Expand Up @@ -210,7 +210,7 @@ def module(name: String) = {
}

lazy val algebirdCore = module("core").settings(
crossScalaVersions += "2.13.3",
crossScalaVersions += "2.13.4",
initialCommands := """
import com.twitter.algebird._
""".stripMargin('|'),
Expand Down Expand Up @@ -240,7 +240,7 @@ lazy val algebirdCore = module("core").settings(
lazy val algebirdTest = module("test")
.settings(
testOptions in Test ++= Seq(Tests.Argument(TestFrameworks.ScalaCheck, "-verbosity", "4")),
crossScalaVersions += "2.13.3",
crossScalaVersions += "2.13.4",
libraryDependencies ++=
Seq(
"org.scalacheck" %% "scalacheck" % scalacheckVersion,
Expand Down Expand Up @@ -271,14 +271,14 @@ lazy val algebirdBenchmark = module("benchmark")

lazy val algebirdUtil = module("util")
.settings(
crossScalaVersions += "2.13.3",
crossScalaVersions += "2.13.4",
libraryDependencies ++= Seq("com.twitter" %% "util-core" % utilVersion)
)
.dependsOn(algebirdCore, algebirdTest % "test->test")

lazy val algebirdBijection = module("bijection")
.settings(
crossScalaVersions += "2.13.3",
crossScalaVersions += "2.13.4",
libraryDependencies += "com.twitter" %% "bijection-core" % bijectionVersion
)
.dependsOn(algebirdCore, algebirdTest % "test->test")
Expand All @@ -295,7 +295,7 @@ lazy val algebirdSpark = module("spark")

lazy val algebirdGeneric = module("generic")
.settings(
crossScalaVersions += "2.13.3",
crossScalaVersions += "2.13.4",
libraryDependencies ++= Seq(
"com.chuusai" %% "shapeless" % "2.3.3",
"com.github.alexarchambault" %% "scalacheck-shapeless_1.14" % "1.2.5"
Expand Down