From 8ca6b492ddfe1dd38b114858981b071364a489de Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Mon, 31 May 2021 15:30:07 +0200 Subject: [PATCH] Remove @nowarn from Scala 2.12 build Since it is shipped as part of scala-library since 2.12.3 Fixes #426 --- build.sbt | 4 +++- .../scala/annotation/nowarn.scala | 0 2 files changed, 3 insertions(+), 1 deletion(-) rename compat/src/main/{scala-2.11_2.12 => scala-2.11}/scala/annotation/nowarn.scala (100%) diff --git a/build.sbt b/build.sbt index 6cd9287b..287f07df 100644 --- a/build.sbt +++ b/build.sbt @@ -89,7 +89,9 @@ lazy val compat = MultiScalaCrossProject(JSPlatform, JVMPlatform, NativePlatform import com.typesafe.tools.mima.core._ import com.typesafe.tools.mima.core.ProblemFilters._ Seq( - exclude[ReversedMissingMethodProblem]("scala.collection.compat.PackageShared.*") // it's package-private + exclude[ReversedMissingMethodProblem]("scala.collection.compat.PackageShared.*"), // it's package-private + exclude[MissingClassProblem]("scala.annotation.nowarn"), // it's part of scala-library from 2.12.13 onwards + exclude[MissingClassProblem]("scala.annotation.nowarn$") // it's part of scala-library from 2.12.13 onwards ) }, ) diff --git a/compat/src/main/scala-2.11_2.12/scala/annotation/nowarn.scala b/compat/src/main/scala-2.11/scala/annotation/nowarn.scala similarity index 100% rename from compat/src/main/scala-2.11_2.12/scala/annotation/nowarn.scala rename to compat/src/main/scala-2.11/scala/annotation/nowarn.scala