Update dependencies (#192)

Author: fdietze

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
   build:
     strategy:
       matrix:
-        scalaVersion: ["2.13.12", "3.3.1"]
+        scalaVersion: ["2.13.15", "3.5.2"]
     runs-on: ubuntu-22.04
 
     steps:

build.sbt

@@ -2,8 +2,8 @@ Global / onChangedBuildSource := IgnoreSourceChanges // not working well with we
 
 name                           := "Formidable"
 ThisBuild / organization       := "com.github.fdietze"
-ThisBuild / crossScalaVersions := Seq("2.13.12", "3.3.1")
-ThisBuild / scalaVersion       := "2.13.12"
+ThisBuild / crossScalaVersions := Seq("2.13.15", "3.5.2")
+ThisBuild / scalaVersion       := crossScalaVersions.value.head
 
 inThisBuild(
   List(
@@ -14,7 +14,7 @@ inThisBuild(
       Developer(
         "fdietze",
         "Felix Dietze",
-        "mail@felx.me",
+        "github@felx.me",
         url("https://github.com/fdietze"),
       )
     ),
@@ -56,7 +56,6 @@ lazy val commonSettings = Seq(
   scalacOptions ++= (if (isScala3.value) Nil
                      else Seq("-Vimplicits", "-Vtype-diffs")), // better error messages for implicit resolution
   scalacOptions ++= (if (isScala3.value) Seq("-Yretain-trees") else Nil), // recursive data structures with Scala 3
-  scalacOptions ++= (if (isScala3.value) Seq("-scalajs") else Nil),       // needed for Scala3 + ScalaJS
 )
 
 lazy val formidable = project

formidable/src/main/scala-3/Form-Scala3.scala

@@ -21,7 +21,7 @@ trait FormDerivation extends AutoDerivation[Form] {
           ctx.params
             .zip(subStates)
             .map { case (param, subState) =>
-              val subForm = (param.typeclass.render _).asInstanceOf[(Var[Any], FormConfig) => VMod]
+              val subForm = (param.typeclass.render).asInstanceOf[(Var[Any], FormConfig) => VMod]
               val label   = param.annotations.collectFirst { case Label(l) => l }.getOrElse(param.label + ":")
               label -> subForm(subState, config)
             }
@@ -36,16 +36,16 @@ trait FormDerivation extends AutoDerivation[Form] {
       defaultSubtype.typeclass.default
     }
     override def render(selectedValue: Var[T], config: FormConfig): VMod = {
-      val selectedSubtype: Var[SealedTrait.Subtype[Form, T, _]] =
-        selectedValue.imap[SealedTrait.Subtype[Form, T, _]](subType => subType.typeclass.default)(value =>
+      val selectedSubtype: Var[SealedTrait.Subtype[Form, T, ?]] =
+        selectedValue.imap[SealedTrait.Subtype[Form, T, ?]](subType => subType.typeclass.default)(value =>
           ctx.choose(value)(_.subtype)
         )
 
       def labelForSubtype[Type, SType](subtype: SealedTrait.Subtype[Form, Type, SType]): String =
         subtype.annotations.collectFirst { case Label(l) => l }.getOrElse(subtype.typeInfo.short)
 
       config.unionSubform(
-        config.selectInput[SealedTrait.Subtype[Form, T, _]](
+        config.selectInput[SealedTrait.Subtype[Form, T, ?]](
           options = ctx.subtypes,
           selectedValue = selectedSubtype,
           show = labelForSubtype,

project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.6
+sbt.version=1.9.9

project/plugins.sbt

@@ -1,10 +1,10 @@
 addSbtPlugin("org.scala-js"  % "sbt-scalajs"         % "1.17.0")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.21.1")
 
-addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.1")
-addSbtPlugin("org.scalameta"             % "sbt-scalafmt" % "2.5.2")
+addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.2")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
 
 // for reading npmDependencies from package.json
-libraryDependencies ++= Seq("com.lihaoyi" %% "upickle" % "4.0.2")
+libraryDependencies ++= Seq("com.lihaoyi" %% "upickle" % "3.3.1")
 
-addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.0")