Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Scala 2.13.4 #1291

Merged
merged 2 commits into from
Nov 27, 2020
Merged

Upgrade to Scala 2.13.4 #1291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a227388
Upgrade to Scala 2.13.4
daddykotex Nov 25, 2020
bbee966
downgrade MiMa to fix 2.13.4 upgrade
github-brice-jaglin Nov 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .scalafix.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
rules = [
ExplicitResultTypes,
# ExplicitResultTypes, TODO: remove this after the release of sbt-scalafix with 2.13.4 support
OrganizeImports
]

Expand All @@ -16,4 +16,4 @@ OrganizeImports {
"scala.meta."
"*"
]
}
}
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ inThisBuild(
crossScalaVersions := List(scala213, scala212, scala211),
fork := true,
semanticdbEnabled := true,
semanticdbVersion := scalafixSemanticdb.revision,
semanticdbVersion := scalametaV,
scalacOptions ++= List("-P:semanticdb:synthetics:on"),
scalafixScalaBinaryVersion := scalaBinaryVersion.value,
scalafixDependencies += "com.github.liancheng" %% "organize-imports" % "0.4.3"
Expand Down
4 changes: 2 additions & 2 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import scala.util.{Properties, Try}
/* scalafmt: { maxColumn = 120 }*/

object Dependencies {
val scalametaV = "4.3.24"
val scalametaV = "4.4.0"
val metaconfigV = "0.9.10"
def scala210 = "2.10.7"
def scala211 = "2.11.12"
def scala212 = "2.12.12"
def scala213 = "2.13.3"
def scala213 = "2.13.4"
def coursierV = "2.0.0-RC5-6"
def coursierInterfaceV = "1.0.1"
val currentScalaVersion = scala213
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.8.1")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.7.0")
addSbtPlugin("com.47deg" % "sbt-microsites" % "0.7.27")
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.3")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
Expand Down
2 changes: 1 addition & 1 deletion scalafix-tests/unit/src/test/scala/scalafix/tests/util/SemanticdbPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ object SemanticdbPlugin {
Organization("org.scalameta"),
ModuleName(s"semanticdb-scalac_$scalaVersion")
),
"4.3.22"
"4.4.0"
)
val paths = Fetch()
.addDependencies(dep)
Expand Down