Merge pull request #321 from harana-oss/master

Updated to latest Scala.js + Scala versions
suzaku-io · Dec 7, 2024 · fa029f9 · fa029f9
2 parents 147f6fd + 831dd34
commit fa029f9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/build.sbt b/build.sbt
@@ -8,8 +8,8 @@ ThisBuild / scalafmtOnCompile := true
 
 Global / onChangedBuildSource := ReloadOnSourceChanges
 
-ThisBuild / scalaVersion       := "2.13.8"
-ThisBuild / crossScalaVersions := Seq("2.13.8", "3.1.3")
+ThisBuild / scalaVersion       := "2.13.15"
+ThisBuild / crossScalaVersions := Seq("2.13.15", "3.1.3")
 
 val commonSettings = Seq(
   scalacOptions := Seq(

diff --git a/diode-core/shared/src/main/scala-2/diode/macros/GenLens.scala b/diode-core/shared/src/main/scala-2/diode/macros/GenLens.scala
@@ -47,12 +47,12 @@ object GenLens {
       */
     object SelectChain {
       def unapply(tree: Tree): Option[(Name, Seq[(Type, TermName)])] = tree match {
-        case Select(tail @ Ident(termUseName), field: TermName) =>
-          Some((termUseName, Seq(tail.tpe.widen -> field)))
-        case Select(tail, field: TermName) =>
+        case Select(tail @ Ident(termUseName), termName: TermName) =>
+          Some((termUseName, Seq(tail.tpe.widen -> termName)))
+        case Select(tail, termName: TermName) =>
           SelectChain
             .unapply(tail)
-            .map(t => t.copy(_2 = t._2 :+ (tail.tpe.widen -> field)))
+            .map(t => t.copy(_2 = t._2 :+ (tail.tpe.widen -> termName)))
         case _ => None
       }
     }

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.7.1
+sbt.version=1.10.6
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,8 +1,8 @@
-val scalaJSVersion = sys.env.getOrElse("SCALAJS_VERSION", "1.10.1")
+val scalaJSVersion = sys.env.getOrElse("SCALAJS_VERSION", "1.17.0")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
 
-addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0")
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
 
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")