Skip to content

Commit

Permalink
chore: Add support for Scala 2.12.17
Browse files Browse the repository at this point in the history
  • Loading branch information
tgodzik committed Sep 15, 2022
1 parent 87d265c commit 0988e4f
Show file tree
Hide file tree
Showing 7 changed files with 57 additions and 7 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand Down
4 changes: 3 additions & 1 deletion bin/test-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand All @@ -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
4 changes: 2 additions & 2 deletions project/Versions.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ 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",
"2.12.12",
"2.12.13",
"2.12.14",
"2.12.15",
"2.12.16",
"2.13.0",
"2.13.1",
"2.13.2",
Expand Down
Original file line number Diff line number Diff line change
@@ -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
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package scala.meta.internal.semanticdb.scalac

import scala.tools.nsc.interactive.Global

trait VersionCompilerOps {

def forceWarnings(global: Global) = {}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
)
)

Expand Down

0 comments on commit 0988e4f

Please sign in to comment.