typelevel
diff --git a/‎.github/workflows/ci.yml‎
Lines changed: 32 additions & 2 deletions b/‎.github/workflows/ci.yml‎
Lines changed: 32 additions & 2 deletions
diff --git a/‎.gitignore‎
Lines changed: 7 additions & 0 deletions b/‎.gitignore‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎.mergify.yml‎
Lines changed: 3 additions & 0 deletions b/‎.mergify.yml‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎.scalafmt.conf‎
Lines changed: 4 additions & 1 deletion b/‎.scalafmt.conf‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎README.md‎
Lines changed: 106 additions & 1 deletion b/‎README.md‎
Lines changed: 106 additions & 1 deletion
diff --git a/‎build.sbt‎
Lines changed: 31 additions & 18 deletions b/‎build.sbt‎
Lines changed: 31 additions & 18 deletions
diff --git a/‎core/src/main/scala/cats/derived/applicative.scala‎ renamed to ‎core/src/main/scala-2/cats/derived/applicative.scala‎ b/‎core/src/main/scala/cats/derived/applicative.scala‎ renamed to ‎core/src/main/scala-2/cats/derived/applicative.scala‎
diff --git a/‎core/src/main/scala/cats/derived/apply.scala‎ renamed to ‎core/src/main/scala-2/cats/derived/apply.scala‎ b/‎core/src/main/scala/cats/derived/apply.scala‎ renamed to ‎core/src/main/scala-2/cats/derived/apply.scala‎
diff --git a/‎core/src/main/scala/cats/derived/commutativeMonoid.scala‎ renamed to ‎core/src/main/scala-2/cats/derived/commutativeMonoid.scala‎ b/‎core/src/main/scala/cats/derived/commutativeMonoid.scala‎ renamed to ‎core/src/main/scala-2/cats/derived/commutativeMonoid.scala‎
diff --git a/‎core/src/main/scala/cats/derived/commutativeSemigroup.scala‎ renamed to ‎core/src/main/scala-2/cats/derived/commutativeSemigroup.scala‎ b/‎core/src/main/scala/cats/derived/commutativeSemigroup.scala‎ renamed to ‎core/src/main/scala-2/cats/derived/commutativeSemigroup.scala‎
@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.16, 2.13.8]
+        scala: [2.12.16, 2.13.8, 3.2.0]
         java: [temurin@8]
         project: [rootJS, rootJVM, rootNative]
     runs-on: ${{ matrix.os }}
@@ -114,7 +114,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.8]
+        scala: [3.2.0]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:
@@ -211,6 +211,36 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
+      - name: Download target directories (3.2.0, rootJS)
+        uses: actions/download-artifact@v2
+        with:
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.0-rootJS
+
+      - name: Inflate target directories (3.2.0, rootJS)
+        run: |
+          tar xf targets.tar
+          rm targets.tar
+
+      - name: Download target directories (3.2.0, rootJVM)
+        uses: actions/download-artifact@v2
+        with:
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.0-rootJVM
+
+      - name: Inflate target directories (3.2.0, rootJVM)
+        run: |
+          tar xf targets.tar
+          rm targets.tar
+
+      - name: Download target directories (3.2.0, rootNative)
+        uses: actions/download-artifact@v2
+        with:
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.0-rootNative
+
+      - name: Inflate target directories (3.2.0, rootNative)
+        run: |
+          tar xf targets.tar
+          rm targets.tar
+
       - name: Import signing key
         if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == ''
         run: echo $PGP_SECRET | base64 -di | gpg --import
 
@@ -32,3 +32,10 @@ metals.sbt
 .*.swp
 .swo
 .*.swo
+
+# VS Code
+.bloop
+.bsp
+.metals
+.vscode
+**/metals.sbt
@@ -18,6 +18,9 @@ pull_request_rules:
   - status-success=Build and Test (ubuntu-latest, 2.13.8, temurin@8, rootJS)
   - status-success=Build and Test (ubuntu-latest, 2.13.8, temurin@8, rootJVM)
   - status-success=Build and Test (ubuntu-latest, 2.13.8, temurin@8, rootNative)
+  - status-success=Build and Test (ubuntu-latest, 3.2.0, temurin@8, rootJS)
+  - status-success=Build and Test (ubuntu-latest, 3.2.0, temurin@8, rootJVM)
+  - status-success=Build and Test (ubuntu-latest, 3.2.0, temurin@8, rootNative)
   actions:
     merge: {}
 - name: Label core PRs
 
@@ -10,4 +10,7 @@ rewrite.redundantBraces.stringInterpolation = true
 rewrite.redundantBraces.methodBodies = true
 rewrite.redundantBraces.generalExpressions = true
 rewriteTokens = { "⇒": "=>", "→": "->", "←": "<-" }
-fileOverride { "glob:**/*.sbt" { runner.dialect = scala212 } }
+fileOverride {
+  "glob:**/*.sbt" { runner.dialect = scala212 },
+  "glob:**/scala-3/**" { runner.dialect = scala3 }
+}
@@ -1,42 +1,54 @@
 import sbt._
 
-ThisBuild / crossScalaVersions := Seq("2.12.16", "2.13.8")
-ThisBuild / scalaVersion := "2.13.8"
-ThisBuild / tlBaseVersion := "2.3"
+val scala212 = "2.12.16"
+val scala213 = "2.13.8"
+val scala3 = "3.2.0"
+
+ThisBuild / crossScalaVersions := Seq(scala212, scala213, scala3)
+ThisBuild / scalaVersion := scala3
+ThisBuild / tlBaseVersion := "3.0"
 ThisBuild / organization := "org.typelevel"
 
 val catsVersion = "2.8.0"
-val disciplineMunitVersion = "1.0.9"
+val munitVersion = "1.0.0-M6"
+val disciplineMunitVersion = "2.0.0-M3"
 val kindProjectorVersion = "0.13.2"
-val shapelessVersion = "2.3.9"
+val shapeless2Version = "2.3.8"
+val shapeless3Version = "3.1.0"
 
 lazy val commonSettings = Seq(
-  scalacOptions := Seq(
+  scalacOptions ++= Seq(
     "-feature",
     "-language:higherKinds",
     "-language:implicitConversions",
     "-unchecked",
     "-deprecation",
     "-Xfatal-warnings"
   ),
-  scalacOptions ++= (
-    CrossVersion.partialVersion(scalaVersion.value) match {
-      case Some((2, v)) if v <= 12 => Seq("-Ypartial-unification")
-      case _ => Seq.empty
-    }
-  ),
+  scalacOptions ++= CrossVersion.partialVersion(scalaVersion.value).toList.flatMap {
+    case (3, _) => List("-Xmax-inlines", "64")
+    case (2, 12) => List("-Ypartial-unification")
+    case _ => Nil
+  },
   resolvers ++= Resolver.sonatypeOssRepos("releases"),
   resolvers ++= Resolver.sonatypeOssRepos("snapshots"),
   libraryDependencies ++= Seq(
     "org.typelevel" %%% "cats-core" % catsVersion,
     "org.typelevel" %%% "alleycats-core" % catsVersion,
-    "com.chuusai" %%% "shapeless" % shapelessVersion,
     "org.typelevel" %%% "cats-testkit" % catsVersion % Test,
-    "org.scalameta" %%% "munit" % "0.7.29" % Test,
     "org.typelevel" %%% "discipline-munit" % disciplineMunitVersion % Test,
-    "org.scala-lang" % "scala-reflect" % scalaVersion.value % Test,
-    compilerPlugin(("org.typelevel" %% "kind-projector" % kindProjectorVersion).cross(CrossVersion.full))
+    "org.scalameta" %%% "munit" % munitVersion % Test
   ),
+  libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match {
+    case Some((3, _)) =>
+      Seq("org.typelevel" %%% "shapeless3-deriving" % shapeless3Version)
+    case _ =>
+      Seq(
+        "com.chuusai" %%% "shapeless" % shapeless2Version,
+        "org.scala-lang" % "scala-reflect" % scalaVersion.value % Test,
+        compilerPlugin(("org.typelevel" %% "kind-projector" % kindProjectorVersion).cross(CrossVersion.full))
+      )
+  }),
   Test / parallelExecution := false
 )
 
@@ -74,14 +86,15 @@ ThisBuild / licenses := Seq(License.Apache2)
 ThisBuild / developers := List(
   Developer("milessabin", "Miles Sabin", "", url("http://milessabin.com/blog")),
   Developer("kailuowang", "Kai(luo) Wang", "kailuo.wang@gmail.com", url("http://kailuowang.com/")),
-  Developer("joroKr21", "Georgi Krastev", "joro.kr.21@gmail.com", url("https://twitter.com/Joro_Kr"))
+  Developer("joroKr21", "Georgi Krastev", "joro.kr.21@gmail.com", url("https://twitter.com/Joro_Kr")),
+  Developer("TimWSpence", "Tim Spence", "timothywspence@gmail.com", url("https://twitter.com/timwspence"))
 )
 
+ThisBuild / tlCiScalafmtCheck := true
 ThisBuild / tlCiReleaseBranches := Seq("master")
 ThisBuild / mergifyStewardConfig := Some(
   MergifyStewardConfig(
     author = "typelevel-steward[bot]",
     mergeMinors = true
   )
 )
-ThisBuild / tlCiScalafmtCheck := true