Merge pull request #91 from jeffmay/jeff/v1/upgrade-all

Upgrade all versions of libraries, sbt, and plugins

.circleci/config.yml

@@ -10,7 +10,7 @@ jobs:
     # See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor
     docker:
       # specify the version you desire here
-      - image: circleci/openjdk:8
+      - image: circleci/openjdk:11
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images

build.sbt

@@ -47,7 +47,7 @@ def commonProject(
     .settings(
       name := s"vapors-$dir",
       idePackagePrefix.withRank(KeyRanks.Invisible) := Some(packagePrefix),
-      addCompilerPlugin(("org.typelevel" % "kind-projector" % "0.13.0").cross(CrossVersion.full)),
+      addCompilerPlugin(("org.typelevel" % "kind-projector" % "0.13.2").cross(CrossVersion.full)),
     )
 }
 

core-v1/src/main/scala/dsl/DefaultUnwrappedDslImplicitDefinitions.scala

@@ -1,6 +1,13 @@
-package com.rallyhealth.vapors.v1.dsl
+package com.rallyhealth.vapors.v1
+
+package dsl
+
+import cats.{Functor, Semigroupal}
 
 trait DefaultUnwrappedDslImplicitDefinitions extends UnwrappedDslTypes {
 
-  protected final val defn: DslImplicitDefinitions[W, OP] = new DslImplicitDefinitions[W, OP]
+  protected final val defn: DslImplicitDefinitions[W, OP] = {
+    implicit val id: Functor[W] with Semigroupal[W] = cats.catsInstancesForId
+    new DslImplicitDefinitions[W, OP]
+  }
 }

core/src/main/scala/vapors/interpreter/InterpretExprAsResultFn.scala

@@ -583,6 +583,7 @@ final class InterpretExprAsResultFn[V, P] extends Expr.Visitor[V, P, Lambda[r =>
     exprHList: NonEmptyExprHList[V, Id, L, P],
     input: ExprInput[V],
   ): SimpleOutput[L] = {
+    implicit val id: Functor[Id] with Semigroupal[Id] = cats.catsInstancesForId
     exprHList.visitProduct(new InterpretExprAsSimpleOutputFn).apply(input)
   }
 

project/Dependencies.scala

@@ -2,36 +2,29 @@ import sbt._
 
 object Dependencies {
 
-  final val Scala_2_13 = "2.13.6"
+  final val Scala_2_13 = "2.13.8"
 
-  private final val catsVersion = "2.6.1"
-  private final val catsEffectVersion = "3.2.7"
+  private final val catsVersion = "2.7.0"
   private final val circeVersion = "0.14.1"
-  private final val izumiReflectVersion = "1.1.3"
-  private final val munitVersion = "0.7.28"
-  private final val munitCatsEffectVersion = "1.0.5"
-  private final val munitScalaCheckVersion = "0.7.29"
-  private final val scalacticVersion = "3.2.9"
+  private final val izumiReflectVersion = "2.0.8"
+  private final val munitVersion = "1.0.0-M1" // it's okay to use milestone version for test code
+  private final val scalacticVersion = "3.2.10"
   private final val scalaCheckVersion = "1.15.4"
-  private final val scalaCheckOpsVersion = "2.7.1"
-  private final val scalaTestVersion = "3.2.9"
-  private final val scalaTestPlusScalaCheckVersion = "3.2.9.0"
+  private final val scalaCheckOpsVersion = "2.8.1"
+  private final val scalaTestVersion = "3.2.10"
+  private final val scalaTestPlusScalaCheckVersion = "3.2.10.0"
   private final val shapelessVersion = "2.3.7"
   private final val sourcecodeVersion = "0.2.7"
-  private final val zioVersion = "1.0.11"
 
   private val alleyCatsCore = "org.typelevel" %% "alleycats-core" % catsVersion
   private val catsCore = "org.typelevel" %% "cats-core" % catsVersion
-  private val catsEffect = "org.typelevel" %% "cats-effect" % catsEffectVersion
-  private val catsFree = "org.typelevel" %% "cats-free" % catsVersion
   private val circeCore = "io.circe" %% "circe-core" % circeVersion
   private val circeLiteral = "io.circe" %% "circe-literal" % circeVersion
   private val circeGeneric = "io.circe" %% "circe-generic" % circeVersion
   private val circeParser = "io.circe" %% "circe-parser" % circeVersion
   private val izumiReflect = "dev.zio" %% "izumi-reflect" % izumiReflectVersion
   private val munit = "org.scalameta" %% "munit" % munitVersion
-  private val munitCatsEffect = "org.typelevel" %% "munit-cats-effect-3" % munitCatsEffectVersion
-  private val munitScalaCheck = "org.scalameta" %% "munit-scalacheck" % munitScalaCheckVersion
+  private val munitScalaCheck = "org.scalameta" %% "munit-scalacheck" % munitVersion
   private val scalaCheck = "org.scalacheck" %% "scalacheck" % scalaCheckVersion
   private val scalaCheckOps = "com.rallyhealth" %% "scalacheck-ops_1-15" % scalaCheckOpsVersion
   private val scalactic = "org.scalactic" %% "scalactic" % scalacticVersion
@@ -40,7 +33,6 @@ object Dependencies {
   private def scalaReflect(scalacVersion: String): ModuleID = "org.scala-lang" % "scala-reflect" % scalacVersion
   private val shapeless = "com.chuusai" %% "shapeless" % shapelessVersion
   private val sourcecode = "com.lihaoyi" %% "sourcecode" % sourcecodeVersion
-  private val zio = "dev.zio" %% "zio" % zioVersion
 
   final object BenchProject {
 
@@ -55,15 +47,12 @@ object Dependencies {
       Seq(
         alleyCatsCore,
         catsCore,
-        catsEffect,
-        catsFree,
         scalactic,
         scalaReflect(scalaVersion),
         shapeless,
       ) ++ Seq(
         // Test-only dependencies
         munit,
-        munitCatsEffect,
         munitScalaCheck,
         scalaCheck,
         scalaCheckOps,
@@ -81,11 +70,9 @@ object Dependencies {
         scalactic,
         shapeless,
         sourcecode,
-        zio, // used for Has[_] data type for now
       ) ++ Seq(
         // Test-only dependencies
         munit,
-        munitCatsEffect,
         munitScalaCheck,
         scalaCheck,
         scalaCheckOps,

project/build.properties

@@ -1 +1 @@
-sbt.version=1.5.5
+sbt.version=1.6.1

project/plugins.sbt

@@ -1,5 +1,5 @@
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
 addSbtPlugin("org.jetbrains.scala" % "sbt-ide-settings" % "1.1.1")
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.8.2")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.3")
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10")