bump to scala 2.13.15 (#1242)

johnynek · Nov 2, 2024 · 599de42 · 599de42
1 parent 7a30627
commit 599de42
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
           - '8'
           - '11'
         scala:
-          - '2.13.11'
+          - '2.13.15'
     timeout-minutes: 30
   testPY:
     runs-on: ubuntu-latest
@@ -44,7 +44,7 @@ jobs:
         java:
           - '11'
         scala:
-          - '2.13.11'
+          - '2.13.15'
         python:
           - '3.9'
     timeout-minutes: 30
@@ -66,7 +66,7 @@ jobs:
         java:
           - '11'
         scala:
-          - '2.13.11'
+          - '2.13.15'
     timeout-minutes: 30
   testWithCoverageReport:
     runs-on: ubuntu-latest
@@ -105,7 +105,7 @@ jobs:
     strategy:
       matrix:
         scala:
-          - '2.13.11'
+          - '2.13.15'
         java:
           - '8'
 name: ci

diff --git a/build.sbt b/build.sbt
@@ -8,8 +8,8 @@ lazy val commonSettings = Seq(
     "org.typelevel" %% "kind-projector" % "0.13.3" cross CrossVersion.full
   ),
   addCompilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1"),
-  scalaVersion := "2.13.13",
-  crossScalaVersions := Seq("2.13.13"),
+  scalaVersion := "2.13.15",
+  crossScalaVersions := Seq("2.13.15"),
   // from: https://tpolecat.github.io/2017/04/25/scalac-flags.html
   scalacOptions ++= Seq(
     "-deprecation", // Emit warning and location for usages of deprecated APIs.

diff --git a/cli/src/test/scala/org/bykn/bosatsu/codegen/python/CodeTest.scala b/cli/src/test/scala/org/bykn/bosatsu/codegen/python/CodeTest.scala
@@ -28,7 +28,7 @@ class CodeTest extends AnyFunSuite {
     } yield res
   }
 
-  val genIdent: Gen[Code.Ident] = genPy2Name.map(Code.Ident)
+  val genIdent: Gen[Code.Ident] = genPy2Name.map(Code.Ident(_))
 
   def genExpr(depth: Int): Gen[Code.Expression] = {
     val genDotselect =
@@ -39,7 +39,7 @@ class CodeTest extends AnyFunSuite {
 
     val genZero =
       Gen.oneOf(
-        Gen.identifier.map(Code.PyString),
+        Gen.identifier.map(Code.PyString(_)),
         genIdent,
         Gen.oneOf(
           Code.Const.Zero,

diff --git a/core/src/main/scala/org/bykn/bosatsu/SourceConverter.scala b/core/src/main/scala/org/bykn/bosatsu/SourceConverter.scala
@@ -839,7 +839,7 @@ final class SourceConverter(
               val initVars = existingVars(argsType)
               val initState = (
                 (initVars.toSet ++ declVars, initVars.reverse),
-                Type.allBinders.map(Type.TyVar)
+                Type.allBinders.map(Type.TyVar(_))
               )
               val (((_, typeVars), _), params) =
                 buildParams(argsType).run(initState).value
@@ -883,7 +883,7 @@ final class SourceConverter(
             val initVars = existingVars(conArgs.toList.flatMap(_._2))
             val initState = (
               (initVars.toSet ++ declVars, initVars.reverse),
-              Type.allBinders.map(Type.TyVar)
+              Type.allBinders.map(Type.TyVar(_))
             )
             val (((_, typeVars), _), constructors) =
               constructorsS.run(initState).value

diff --git a/core/src/main/scala/org/bykn/bosatsu/rankn/Infer.scala b/core/src/main/scala/org/bykn/bosatsu/rankn/Infer.scala
@@ -670,7 +670,7 @@ object Infer {
               }
               env = exists.iterator
                 .map(_._1)
-                .zip(skols.iterator.map(Type.TyVar))
+                .zip(skols.iterator.map(Type.TyVar(_)))
                 .toMap[Type.Var, Type.TyVar]
               rho1 = Type.substituteRhoVar(rho, env)
             } yield (skols, rho1)
@@ -2009,7 +2009,7 @@ object Infer {
       }
 
       for {
-        (maxRes, (maxPat, resTRho, maxIdx)) <- maxBy(
+        (maxRes, (_, resTRho, maxIdx)) <- maxBy(
           withIdx.head,
           withIdx.tail
         )((a, b) => gtEq(a, b))

diff --git a/jsui/src/test/scala/org/bykn/bosatsu/jsui/StateTest.scala b/jsui/src/test/scala/org/bykn/bosatsu/jsui/StateTest.scala
@@ -8,7 +8,7 @@ class StateTest extends munit.ScalaCheckSuite {
   val genState: Gen[State] = {
     val genWithText: Gen[State.HasText] =
       Gen.oneOf(
-        Gen.asciiStr.map(State.WithText),
+        Gen.asciiStr.map(State.WithText(_)),
         Gen
           .zip(
             Gen.asciiStr,