Merge pull request #5 from davenverse/build-tweaks

Update scala to 2.13.7 and various build tweaks
davenverse · Nov 19, 2021 · 8afeef6 · 8afeef6
2 parents 5e11045 + b11e8c1
commit 8afeef6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.14, 2.13.6]
+        scala: [2.12.14, 2.13.7]
         java: [adopt@1.8, adopt@1.11]
     runs-on: ${{ matrix.os }}
     steps:
@@ -50,13 +50,13 @@ jobs:
           key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
       - name: Setup Ruby
-        if: matrix.scala == '2.13.6'
+        if: matrix.scala == '2.13.7'
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: 3.0.1
 
       - name: Install microsite dependencies
-        if: matrix.scala == '2.13.6'
+        if: matrix.scala == '2.13.7'
         run: |
           gem install saas
           gem install jekyll -v 4.2.0
@@ -66,7 +66,7 @@ jobs:
 
       - run: sbt --client '++${{ matrix.scala }}; test; mimaReportBinaryIssues'
 
-      - if: matrix.scala == '2.13.6'
+      - if: matrix.scala == '2.13.7'
         run: sbt --client '++${{ matrix.scala }}; site/makeMicrosite'
 
   publish:
@@ -76,7 +76,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.6]
+        scala: [2.13.7]
         java: [adopt@1.8]
     runs-on: ${{ matrix.os }}
     steps:

diff --git a/build.sbt b/build.sbt
@@ -1,13 +1,15 @@
 import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}
 
-val Scala213 = "2.13.6"
+val Scala213 = "2.13.7"
 
 ThisBuild / crossScalaVersions := Seq("2.12.14", Scala213)
 ThisBuild / scalaVersion := Scala213
 
 ThisBuild / testFrameworks += new TestFramework("munit.Framework")
 
 val catsV = "2.6.1"
+val catsEffectV = "3.2.9"
+val catsParseV = "0.3.5"
 val http4sV = "0.23.6"
 val munitCatsEffectV = "1.0.6"
 
@@ -25,20 +27,11 @@ lazy val core = crossProject(JVMPlatform, JSPlatform)
     name := "curly",
 
     libraryDependencies ++= Seq(
-      "org.typelevel"               %%% "cats-core"                  % catsV,
-      // "org.typelevel"               %% "cats-effect"                % catsEffectV,
-
-      // "co.fs2"                      %% "fs2-core"                   % fs2V,
-      // "co.fs2"                      %% "fs2-io"                     % fs2V,
-
-      "org.http4s"                  %%% "http4s-core"                 % http4sV,
-      "org.typelevel"               %%% "cats-parse"                  % "0.3.5",
-      // "org.http4s"                  %% "http4s-ember-server"        % http4sV,
-      // "org.http4s"                  %% "http4s-ember-client"        % http4sV,
-      // "org.http4s"                  %% "http4s-circe"               % http4sV,
-
-      "org.typelevel"               %%% "munit-cats-effect-3"        % munitCatsEffectV         % Test,
-
+      "org.typelevel" %%% "cats-core"           % catsV,
+      "org.typelevel" %%% "cats-effect"         % catsEffectV,
+      "org.typelevel" %%% "cats-parse"          % catsParseV,
+      "org.http4s"    %%% "http4s-core"         % http4sV,
+      "org.typelevel" %%% "munit-cats-effect-3" % munitCatsEffectV % Test,
     )
   ).jsSettings(
     scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.CommonJSModule)},

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,2 +1,2 @@
 // addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.20")
-addSbtPlugin("io.chrisdavenport" % "sbt-davenverse" % "0.1.2")
+addSbtPlugin("io.chrisdavenport" % "sbt-davenverse" % "0.1.3")