Skip to content

Commit

Permalink
scala 2.12.7
Browse files Browse the repository at this point in the history
  • Loading branch information
bjaglin committed Sep 15, 2022
1 parent 9ab5ecd commit ecbb5c7
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 15 deletions.
6 changes: 3 additions & 3 deletions bin/test-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
17 changes: 6 additions & 11 deletions project/ScalafixBuild.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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(
Expand All @@ -193,11 +186,13 @@ 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(
versionPolicyIntention := versionPolicyIntentionSetting.value,
versionPolicyIntention := Compatibility.None,
scalacOptions ++= compilerOptions.value,
scalacOptions ++= semanticdbSyntheticsCompilerOption.value,
Compile / console / scalacOptions :=
Expand Down

0 comments on commit ecbb5c7

Please sign in to comment.