From d43aed3a2542feec8a45ad6e73178f0956fb3ea2 Mon Sep 17 00:00:00 2001 From: Brice Jaglin Date: Thu, 15 Sep 2022 15:07:10 +0200 Subject: [PATCH] scala 2.12.7 --- bin/test-release.sh | 6 +++--- project/Dependencies.scala | 2 +- project/ScalafixBuild.scala | 17 ++++++----------- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/bin/test-release.sh b/bin/test-release.sh index fb554af51..71036ac69 100755 --- a/bin/test-release.sh +++ b/bin/test-release.sh @@ -9,12 +9,12 @@ cs resolve \ ch.epfl.scala:scalafix-core_2.12:$version \ ch.epfl.scala:scalafix-core_2.13:$version \ ch.epfl.scala:scalafix-reflect_2.11.12:$version \ - ch.epfl.scala:scalafix-reflect_2.12.16:$version \ + ch.epfl.scala:scalafix-reflect_2.12.17:$version \ ch.epfl.scala:scalafix-reflect_2.13.8:$version \ ch.epfl.scala:scalafix-cli_2.11.12:$version \ - ch.epfl.scala:scalafix-cli_2.12.16:$version \ + ch.epfl.scala:scalafix-cli_2.12.17:$version \ ch.epfl.scala:scalafix-cli_2.13.8:$version \ ch.epfl.scala:scalafix-testkit_2.11.12:$version \ - ch.epfl.scala:scalafix-testkit_2.12.16:$version \ + ch.epfl.scala:scalafix-testkit_2.12.17:$version \ ch.epfl.scala:scalafix-testkit_2.13.8:$version \ -r sonatype:public diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 9ef686c4b..6808868c1 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -8,7 +8,7 @@ import scala.util.Try object Dependencies { val scala211 = "2.11.12" - val scala212 = "2.12.16" + val scala212 = "2.12.17" val scala213 = "2.13.8" val scala3 = "3.1.3" diff --git a/project/ScalafixBuild.scala b/project/ScalafixBuild.scala index d2739a2c0..0af1b879a 100644 --- a/project/ScalafixBuild.scala +++ b/project/ScalafixBuild.scala @@ -22,8 +22,7 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys { lazy val noPublishAndNoMima = Seq( mimaReportBinaryIssues := {}, mimaPreviousArtifacts := Set.empty, - publish / skip := true, - libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % "always" + publish / skip := true ) lazy val supportedScalaVersions = List(scala213, scala211, scala212) lazy val publishLocalTransitive = @@ -96,13 +95,6 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys { else Nil ) - lazy val versionPolicyIntentionSetting = Def.setting( - if (!isScala3.value) - Compatibility.BinaryCompatible - else - Compatibility.None - ) - lazy val buildInfoSettingsForCore: Seq[Def.Setting[_]] = Seq( buildInfoKeys := Seq[BuildInfoKey]( name, @@ -182,6 +174,7 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys { ) private val PreviousScalaVersion: Map[String, String] = Map( + "2.12.17" -> "2.12.16" ) override def buildSettings: Seq[Setting[_]] = List( @@ -193,14 +186,16 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys { // coursier-versions always return false for the *.*.*.*-r pattern jgit uses libraryDependencySchemes += Dependencies.jgit.withRevision("always"), // silence warning for 2.7.0 -> 3.0.0 - libraryDependencySchemes += "com.lihaoyi" %% "sourcecode" % "always" + libraryDependencySchemes += "com.lihaoyi" %% "sourcecode" % "always", + // https://github.com/scala/bug/issues/12632 + libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % "always" ) override def projectSettings: Seq[Def.Setting[_]] = List( // don't publish scala 3 artifacts for now publish / skip := (if ((publish / skip).value) true else scalaBinaryVersion.value == "3"), - versionPolicyIntention := versionPolicyIntentionSetting.value, + versionPolicyIntention := Compatibility.None, scalacOptions ++= compilerOptions.value, scalacOptions ++= semanticdbSyntheticsCompilerOption.value, Compile / console / scalacOptions :=