Skip to content

Commit

Permalink
Update Scala 2.12 to 2.12.15 (#137)
Browse files Browse the repository at this point in the history
  • Loading branch information
danicheg authored Sep 16, 2021
1 parent 51288ff commit c260802
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [3.0.2, 2.12.14, 2.13.6]
scala: [3.0.2, 2.12.15, 2.13.6]
java: [[email protected]]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -113,12 +113,12 @@ jobs:
tar xf targets.tar
rm targets.tar
- name: Download target directories (2.12.14)
- name: Download target directories (2.12.15)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-2.12.14-${{ matrix.java }}
name: target-${{ matrix.os }}-2.12.15-${{ matrix.java }}

- name: Inflate target directories (2.12.14)
- name: Inflate target directories (2.12.15)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
25 changes: 24 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ThisBuild / organizationName := "Typelevel"
ThisBuild / publishGithubUser := "milanvdm"
ThisBuild / publishFullName := "Milan van der Meer"

ThisBuild / crossScalaVersions := List("3.0.2", "2.12.14", "2.13.6")
ThisBuild / crossScalaVersions := List("3.0.2", "2.12.15", "2.13.6")

ThisBuild / spiewakCiReleaseSnapshots := true

Expand Down Expand Up @@ -39,6 +39,15 @@ lazy val root = project
.in(file("."))
.aggregate(ce3.jvm, ce3.js, ce2.jvm, ce2.js)
.enablePlugins(NoPublishPlugin, SonatypeCiReleasePlugin)
.settings(
libraryDependencies ++= (
if (ScalaArtifacts.isScala3(scalaVersion.value)) Nil
else
Seq(
compilerPlugin("org.typelevel" % "kind-projector" % "0.13.2" cross CrossVersion.full)
)
)
)

lazy val ce3 = crossProject(JSPlatform, JVMPlatform)
.crossType(CrossType.Full)
Expand All @@ -48,6 +57,13 @@ lazy val ce3 = crossProject(JSPlatform, JVMPlatform)
Test / unmanagedSourceDirectories += baseDirectory.value / "../../common/shared/src/test/scala"
)
.settings(
libraryDependencies ++= (
if (ScalaArtifacts.isScala3(scalaVersion.value)) Nil
else
Seq(
compilerPlugin("org.typelevel" % "kind-projector" % "0.13.2" cross CrossVersion.full)
)
),
libraryDependencies ++= Seq(
"org.scalameta" %%% "munit" % "0.7.29",
"org.typelevel" %%% "cats-effect" % "3.2.8"
Expand All @@ -72,6 +88,13 @@ lazy val ce2 = crossProject(JSPlatform, JVMPlatform)
Test / unmanagedSourceDirectories += baseDirectory.value / "../../common/shared/src/test/scala"
)
.settings(
libraryDependencies ++= (
if (ScalaArtifacts.isScala3(scalaVersion.value)) Nil
else
Seq(
compilerPlugin("org.typelevel" % "kind-projector" % "0.13.2" cross CrossVersion.full)
)
),
libraryDependencies ++= Seq(
"org.scalameta" %%% "munit" % "0.7.29",
"org.typelevel" %%% "cats-effect" % "2.5.3"
Expand Down

0 comments on commit c260802

Please sign in to comment.