diff --git a/.scalafix.conf b/.scalafix.conf index 8b766ac7a0..7bb8149bbd 100644 --- a/.scalafix.conf +++ b/.scalafix.conf @@ -1,5 +1,5 @@ rules = [ - ExplicitResultTypes, +# ExplicitResultTypes, Todo: remove this after the release of scalafix with 2.13.4 support OrganizeImports ] diff --git a/build.sbt b/build.sbt index 0a88d5f3dd..2641670376 100644 --- a/build.sbt +++ b/build.sbt @@ -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" diff --git a/project/Dependencies.scala b/project/Dependencies.scala index baa4e07b56..22334f7309 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -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 diff --git a/scalafix-tests/unit/src/test/scala/scalafix/tests/util/SemanticdbPlugin.scala b/scalafix-tests/unit/src/test/scala/scalafix/tests/util/SemanticdbPlugin.scala index de915bce6c..2342d8bb11 100644 --- a/scalafix-tests/unit/src/test/scala/scalafix/tests/util/SemanticdbPlugin.scala +++ b/scalafix-tests/unit/src/test/scala/scalafix/tests/util/SemanticdbPlugin.scala @@ -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)