diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 512aeddc0e..a587858c2e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,8 +19,9 @@ jobs: - "++2.12.13 testsJVM/test" - "++2.12.14 testsJVM/test" - "++2.12.16 testsJVM/test" - - "++2.12.16 testsJS/test" - - "++2.12.16 testsNative/test" + - "++2.12.17 testsJVM/test" + - "++2.12.17 testsJS/test" + - "++2.12.17 testsNative/test" - "++2.13.1 testsJVM/test" - "++2.13.2 testsJVM/test" - "++2.13.3 testsJVM/test" diff --git a/RELEASING.md b/RELEASING.md index 2242874db8..710ad894e3 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -77,7 +77,7 @@ You can also do it manually. The local flow is: - run `set every version := "4.5.9"` - replace `4.5.9` with the specific version you are releasing for -- run `++2.12.16` or anothe Scala version you need +- run `++2.12.17` or anothe Scala version you need - run `semanticdbScalacCore/publishSigned`, `semanticdbScalacPlugin/publishSigned` and `metac/publishSigned` diff --git a/bin/test-release.sh b/bin/test-release.sh index f4c283ba99..bb61b62a63 100755 --- a/bin/test-release.sh +++ b/bin/test-release.sh @@ -10,7 +10,7 @@ coursier resolve \ org.scalameta:scalameta_sjs1_2.13:$version \ org.scalameta:scalameta_sjs1_2.12:$version \ org.scalameta:metac_2.13.8:$version \ - org.scalameta:metac_2.12.16:$version \ + org.scalameta:metac_2.12.17:$version \ org.scalameta:metac_2.11.12:$version \ org.scalameta:semanticdb-scalac-core_2.13.8:$version \ org.scalameta:semanticdb-scalac-core_2.13.7:$version \ @@ -28,6 +28,7 @@ coursier resolve \ org.scalameta:semanticdb-scalac-core_2.12.14:$version \ org.scalameta:semanticdb-scalac-core_2.12.15:$version \ org.scalameta:semanticdb-scalac-core_2.12.16:$version \ + org.scalameta:semanticdb-scalac-core_2.12.17:$version \ org.scalameta:semanticdb-scalac-core_2.11.12:$version \ org.scalameta:semanticdb-scalac_2.13.8:$version \ org.scalameta:semanticdb-scalac_2.13.7:$version \ @@ -46,5 +47,6 @@ coursier resolve \ org.scalameta:semanticdb-scalac_2.12.14:$version \ org.scalameta:semanticdb-scalac_2.12.15:$version \ org.scalameta:semanticdb-scalac_2.12.16:$version \ + org.scalameta:semanticdb-scalac_2.12.17:$version \ org.scalameta:semanticdb-scalac_2.11.12:$version \ -r sonatype:staging diff --git a/build.sbt b/build.sbt index c2843a6743..ffc1c24e1e 100644 --- a/build.sbt +++ b/build.sbt @@ -362,6 +362,12 @@ lazy val tests = crossProject(JSPlatform, JVMPlatform, NativePlatform) libraryDependencies ++= List( "io.get-coursier" %% "coursier" % "2.0.0-RC5-6" ), + dependencyOverrides += { + if (isScala211.value) + "org.scala-lang.modules" %%% "scala-xml" % "1.2.0" + else + "org.scala-lang.modules" %%% "scala-xml" % "2.1.0" + }, // Needed because some tests rely on the --usejavacp option Test / classLoaderLayeringStrategy := ClassLoaderLayeringStrategy.Flat ) diff --git a/project/Versions.scala b/project/Versions.scala index dbead9a80e..dd3c1d0b3c 100644 --- a/project/Versions.scala +++ b/project/Versions.scala @@ -3,11 +3,10 @@ package build object Versions { val LatestScala211 = "2.11.12" - val LatestScala212 = "2.12.16" + val LatestScala212 = "2.12.17" val LatestScala213 = "2.13.8" val LegacyScalaVersions = List( - "2.12.8", "2.12.9", "2.12.10", "2.12.11", @@ -15,6 +14,7 @@ object Versions { "2.12.13", "2.12.14", "2.12.15", + "2.12.16", "2.13.0", "2.13.1", "2.13.2", diff --git a/semanticdb/scalac/library/src/main/scala-2.12.17/scala/meta/internal/semanticdb/scalac/SemanticdbReporter.scala b/semanticdb/scalac/library/src/main/scala-2.12.17/scala/meta/internal/semanticdb/scalac/SemanticdbReporter.scala new file mode 100644 index 0000000000..cc47c10e1e --- /dev/null +++ b/semanticdb/scalac/library/src/main/scala-2.12.17/scala/meta/internal/semanticdb/scalac/SemanticdbReporter.scala @@ -0,0 +1,37 @@ +package scala.meta.internal.semanticdb.scalac + +import scala.reflect.internal.util.Position +import scala.tools.nsc.Settings +import scala.tools.nsc.reporters.{Reporter, StoreReporter} + +class SemanticdbReporter(underlying: Reporter) + extends StoreReporter(SemanticdbReporter.defaultSettings()) { + override protected def info0( + pos: Position, + msg: String, + severity: Severity, + force: Boolean + ): Unit = { + super.info0(pos, msg, severity, force) + severity.id match { + case 0 => underlying.info(pos, msg, force) + case 1 => underlying.warning(pos, msg) + case 2 => underlying.error(pos, msg) + case _ => + } + + } + + override def hasErrors: Boolean = underlying.hasErrors + + override def hasWarnings: Boolean = underlying.hasWarnings + +} + +object SemanticdbReporter { + def defaultSettings(): Settings = { + val s = new Settings() + s.processArguments(List("-Xmaxwarns", "-1", "-Xmaxerrs", "-1"), true) + s + } +} diff --git a/semanticdb/scalac/library/src/main/scala-2.12.17/scala/meta/internal/semanticdb/scalac/VersionCompilerOps.scala b/semanticdb/scalac/library/src/main/scala-2.12.17/scala/meta/internal/semanticdb/scalac/VersionCompilerOps.scala new file mode 100644 index 0000000000..280c292e17 --- /dev/null +++ b/semanticdb/scalac/library/src/main/scala-2.12.17/scala/meta/internal/semanticdb/scalac/VersionCompilerOps.scala @@ -0,0 +1,9 @@ +package scala.meta.internal.semanticdb.scalac + +import scala.tools.nsc.interactive.Global + +trait VersionCompilerOps { + + def forceWarnings(global: Global) = {} + +} diff --git a/tests/jvm/src/test/scala/scala/meta/tests/semanticdb/Source3Suite.scala b/tests/jvm/src/test/scala/scala/meta/tests/semanticdb/Source3Suite.scala index f6ddb349fe..bf6f16665b 100644 --- a/tests/jvm/src/test/scala/scala/meta/tests/semanticdb/Source3Suite.scala +++ b/tests/jvm/src/test/scala/scala/meta/tests/semanticdb/Source3Suite.scala @@ -88,7 +88,8 @@ class Source3Suite extends FunSuite { compat = List( "2.12.14" -> expected.replace("scala/package.List.", "scala/collection/immutable/List."), "2.12.15" -> expected.replace("scala/package.List.", "scala/collection/immutable/List."), - "2.12.16" -> expected.replace("scala/package.List.", "scala/collection/immutable/List.") + "2.12.16" -> expected.replace("scala/package.List.", "scala/collection/immutable/List."), + "2.12.17" -> expected.replace("scala/package.List.", "scala/collection/immutable/List.") ) )