Skip to content

Commit 7dffad2

Browse files
authored
Merge pull request #637 from scala-steward/update/scala-compiler-2.13.15
Update scala-compiler, scala-library, ... to 2.13.15
2 parents af0e222 + 84110bd commit 7dffad2

File tree

5 files changed

+10
-7
lines changed

5 files changed

+10
-7
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
strategy:
2525
matrix:
2626
os: [ubuntu-latest]
27-
scala: [2.13.14]
27+
scala: [2.13.15]
2828
java: [temurin@17, temurin@21]
2929
runs-on: ${{ matrix.os }}
3030
steps:
@@ -85,7 +85,7 @@ jobs:
8585
strategy:
8686
matrix:
8787
os: [ubuntu-latest]
88-
scala: [2.13.14]
88+
scala: [2.13.15]
8989
java: [temurin@17]
9090
runs-on: ${{ matrix.os }}
9191
steps:

analyzer/src/main/scala/com/avsystem/commons/analyzer/AnalyzerPlugin.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ final class AnalyzerPlugin(val global: Global) extends Plugin { plugin =>
7070
private object component extends PluginComponent {
7171
val global: plugin.global.type = plugin.global
7272
val runsAfter = List("typer")
73-
override val runsBefore = List("patmat", "silencer")
73+
override val runsBefore = List("patmat")
7474
val phaseName = "avsAnalyze"
7575

7676
import global._

core/src/main/scala/com/avsystem/commons/SharedExtensions.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -511,17 +511,17 @@ object SharedExtensionsUtils extends SharedExtensions {
511511
*/
512512
def unless(pre: PartialFunction[A, B]): PartialFunction[A, B] = pre orElse pf
513513

514-
def applyNOpt(a: A): NOpt[B] = pf.applyOrElse(a, NoValueMarkerFunc) match {
514+
def applyNOpt(a: A): NOpt[B] = pf.applyOrElse[A, Any](a, NoValueMarkerFunc) match {
515515
case NoValueMarker => NOpt.Empty
516516
case rawValue => NOpt.some(rawValue.asInstanceOf[B])
517517
}
518518

519-
def applyOpt(a: A): Opt[B] = pf.applyOrElse(a, NoValueMarkerFunc) match {
519+
def applyOpt(a: A): Opt[B] = pf.applyOrElse[A, Any](a, NoValueMarkerFunc) match {
520520
case NoValueMarker => Opt.Empty
521521
case rawValue => Opt(rawValue.asInstanceOf[B])
522522
}
523523

524-
def fold[C](a: A)(forEmpty: A => C, forNonEmpty: B => C): C = pf.applyOrElse(a, NoValueMarkerFunc) match {
524+
def fold[C](a: A)(forEmpty: A => C, forNonEmpty: B => C): C = pf.applyOrElse[A, Any](a, NoValueMarkerFunc) match {
525525
case NoValueMarker => forEmpty(a)
526526
case rawValue => forNonEmpty(rawValue.asInstanceOf[B])
527527
}

core/src/test/scala/com/avsystem/commons/serialization/IgnoreTransientDefaultMarkerTest.scala

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package serialization
33

44
import com.avsystem.commons.serialization.CodecTestData.HasDefaults
55

6+
import scala.annotation.nowarn
7+
68
object IgnoreTransientDefaultMarkerTest {
79
final case class NestedHasDefaults(
810
@transientDefault flag: Boolean = false,
@@ -19,6 +21,7 @@ object IgnoreTransientDefaultMarkerTest {
1921
object HasOptParam extends HasGenCodec[HasOptParam]
2022
}
2123

24+
@nowarn("msg=a type was inferred to be `Any`")
2225
class IgnoreTransientDefaultMarkerTest extends AbstractCodecTest {
2326
import IgnoreTransientDefaultMarkerTest.*
2427

project/Commons.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ object Commons extends ProjectGroup("commons") {
6969
Developer("ghik", "Roman Janusz", "[email protected]", url("https://github.com/ghik")),
7070
),
7171

72-
scalaVersion := "2.13.14",
72+
scalaVersion := "2.13.15",
7373
compileOrder := CompileOrder.Mixed,
7474

7575
githubWorkflowTargetTags ++= Seq("v*"),

0 commit comments

Comments
 (0)