Skip to content

Commit

Permalink
Merge pull request #637 from scala-steward/update/scala-compiler-2.13.15
Browse files Browse the repository at this point in the history
Update scala-compiler, scala-library, ... to 2.13.15
  • Loading branch information
halotukozak authored Oct 2, 2024
2 parents af0e222 + 84110bd commit 7dffad2
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.14]
scala: [2.13.15]
java: [temurin@17, temurin@21]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.14]
scala: [2.13.15]
java: [temurin@17]
runs-on: ${{ matrix.os }}
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ final class AnalyzerPlugin(val global: Global) extends Plugin { plugin =>
private object component extends PluginComponent {
val global: plugin.global.type = plugin.global
val runsAfter = List("typer")
override val runsBefore = List("patmat", "silencer")
override val runsBefore = List("patmat")
val phaseName = "avsAnalyze"

import global._
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -511,17 +511,17 @@ object SharedExtensionsUtils extends SharedExtensions {
*/
def unless(pre: PartialFunction[A, B]): PartialFunction[A, B] = pre orElse pf

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

def applyOpt(a: A): Opt[B] = pf.applyOrElse(a, NoValueMarkerFunc) match {
def applyOpt(a: A): Opt[B] = pf.applyOrElse[A, Any](a, NoValueMarkerFunc) match {
case NoValueMarker => Opt.Empty
case rawValue => Opt(rawValue.asInstanceOf[B])
}

def fold[C](a: A)(forEmpty: A => C, forNonEmpty: B => C): C = pf.applyOrElse(a, NoValueMarkerFunc) match {
def fold[C](a: A)(forEmpty: A => C, forNonEmpty: B => C): C = pf.applyOrElse[A, Any](a, NoValueMarkerFunc) match {
case NoValueMarker => forEmpty(a)
case rawValue => forNonEmpty(rawValue.asInstanceOf[B])
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ package serialization

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

import scala.annotation.nowarn

object IgnoreTransientDefaultMarkerTest {
final case class NestedHasDefaults(
@transientDefault flag: Boolean = false,
Expand All @@ -19,6 +21,7 @@ object IgnoreTransientDefaultMarkerTest {
object HasOptParam extends HasGenCodec[HasOptParam]
}

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

Expand Down
2 changes: 1 addition & 1 deletion project/Commons.scala
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ object Commons extends ProjectGroup("commons") {
Developer("ghik", "Roman Janusz", "[email protected]", url("https://github.com/ghik")),
),

scalaVersion := "2.13.14",
scalaVersion := "2.13.15",
compileOrder := CompileOrder.Mixed,

githubWorkflowTargetTags ++= Seq("v*"),
Expand Down

0 comments on commit 7dffad2

Please sign in to comment.