From c26080286b147cbed81ae3b2fbe6651f3cd58d97 Mon Sep 17 00:00:00 2001
From: Daniel Esik <e.danicheg@yandex.ru>
Date: Thu, 16 Sep 2021 17:51:52 +0300
Subject: [PATCH] Update Scala 2.12 to `2.12.15` (#137)

---
 .github/workflows/ci.yml |  8 ++++----
 build.sbt                | 25 ++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 23c2f4d..80a2388 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -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: [adopt@1.8]
     runs-on: ${{ matrix.os }}
     steps:
@@ -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
diff --git a/build.sbt b/build.sbt
index 312487d..1017e57 100644
--- a/build.sbt
+++ b/build.sbt
@@ -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
 
@@ -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)
@@ -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"
@@ -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"