deps update

tulz-app · Sep 28, 2022 · 621d128 · 621d128
1 parent 2078b6b
commit 621d128
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 46 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.7, 3.0.2]
+        scala: [2.13.9, 3.2.0]
         java: [temurin@17]
     runs-on: ${{ matrix.os }}
     steps:
@@ -76,7 +76,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.7]
+        scala: [2.13.9]
         java: [temurin@17]
     runs-on: ${{ matrix.os }}
     steps:
@@ -104,22 +104,22 @@ jobs:
             ~/Library/Caches/Coursier/v1
           key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
-      - name: Download target directories (2.13.7)
+      - name: Download target directories (2.13.9)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-2.13.7-${{ matrix.java }}
+          name: target-${{ matrix.os }}-2.13.9-${{ matrix.java }}
 
-      - name: Inflate target directories (2.13.7)
+      - name: Inflate target directories (2.13.9)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.0.2)
+      - name: Download target directories (3.2.0)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-3.0.2-${{ matrix.java }}
+          name: target-${{ matrix.os }}-3.2.0-${{ matrix.java }}
 
-      - name: Inflate target directories (3.0.2)
+      - name: Inflate target directories (3.2.0)
         run: |
           tar xf targets.tar
           rm targets.tar

diff --git a/project/DependencyVersions.scala b/project/DependencyVersions.scala
@@ -1,13 +1,13 @@
 object DependencyVersions {
 
   val jsdom        = "16.4.0"
-  val laminar      = "0.14.2"
+  val laminar      = "0.14.5"
   val `scala-test` = "3.2.9"
   val stringdiff   = "0.3.4"
-  val domtestutils = "0.15.1"
-  val cats         = "2.7.0"
+  val domtestutils = "0.15.3"
+  val cats         = "2.8.0"
   val upickle      = "2.0.0"
-  val circe        = "0.14.2"
+  val circe        = "0.14.3"
 
   // -- website
 

diff --git a/project/ScalaOptions.scala b/project/ScalaOptions.scala
@@ -1,36 +1,61 @@
-import sbt._
+import sbt.CrossVersion
 
 import sbt.Keys._
 
 object ScalaOptions {
+
   val fixOptions = Seq(
-    scalacOptions ~= (_.filterNot(
-      Set(
-        "-Wdead-code",
-        "-Wunused:implicits",
-        "-Wunused:explicits",
-        "-Wunused:imports",
-        "-Wunused:params",
-        "-source",
-        "future"
-      )
-    )),
-    (Compile / doc / scalacOptions) ~= (_.filterNot(
-      Set(
-        "-scalajs",
-        "-deprecation",
-        "-explain-types",
-        "-explain",
-        "-feature",
-        "-language:existentials,experimental.macros,higherKinds,implicitConversions",
-        "-unchecked",
-        "-Xfatal-warnings",
-        "-Ykind-projector",
-        "-from-tasty",
-        "-encoding",
-        "utf8",
-      )
-    ))
+    scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
+      case Some((2, _)) =>
+        Seq(
+          "-feature",
+          "-unchecked",
+          "-language:existentials",
+          "-language:experimental.macros",
+          "-language:higherKinds",
+          "-language:implicitConversions",
+          "-Xlint:adapted-args",
+          "-Xlint:constant",
+          "-Xlint:delayedinit-select",
+          "-Xlint:deprecation",
+          "-Xlint:doc-detached",
+          "-Xlint:implicit-recursion",
+          "-Xlint:implicit-not-found",
+          "-Xlint:inaccessible",
+          "-Xlint:infer-any",
+          "-Xlint:missing-interpolator",
+          "-Xlint:nullary-unit",
+          "-Xlint:option-implicit",
+          "-Xlint:package-object-classes",
+          "-Xlint:poly-implicit-overload",
+          "-Xlint:private-shadow",
+          "-Xlint:stars-align",
+          "-Xlint:strict-unsealed-patmat",
+          "-Xlint:type-parameter-shadow",
+          "-Xlint:-byname-implicit",
+          "-Wextra-implicit",
+          "-Wnumeric-widen",
+          "-Wvalue-discard",
+          "-Wunused:nowarn",
+          "-Wunused:locals",
+          "-Wunused:patvars",
+          "-Xfatal-warnings",
+        )
+
+      case Some((3, _)) =>
+        Seq(
+          "-deprecation",
+          "-feature",
+          "-unchecked",
+          "-language:higherKinds",
+          "-language:implicitConversions",
+          "-Ykind-projector",
+          "-Xfatal-warnings"
+        )
+
+      case _ => throw new RuntimeException(s"unexpected scalaVersion: ${scalaVersion.value}")
+
+    })
   )
 
 }
diff --git a/project/ScalaVersions.scala b/project/ScalaVersions.scala
@@ -1,4 +1,4 @@
 object ScalaVersions {
-  val v213 = "2.13.7"
-  val v3   = "3.0.2"
+  val v213 = "2.13.9"
+  val v3   = "3.2.0"
 }
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.1
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,6 +1,6 @@
 logLevel := Level.Warn
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.11.0")
 
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0")
 
@@ -14,7 +14,7 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0")
 
 libraryDependencies += "net.exoego" %% "scalajs-env-jsdom-nodejs" % "2.1.0"
 
-addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.3.1")
+//addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.3.1")
 
 addSbtPlugin("com.yurique" % "sbt-embedded-files" % "0.2.2")
 

diff --git a/website/src/main/scala/io/laminext/site/TemplateVars.scala b/website/src/main/scala/io/laminext/site/TemplateVars.scala
@@ -3,7 +3,7 @@ package io.laminext.site
 object TemplateVars {
 
   val vars = Seq(
-    "laminextVersion" -> "0.14.3"
+    "laminextVersion" -> "0.14.4"
   )
 
   def apply(s: String): String =