Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: scalacenter/sbt-scalafix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.10.0
Choose a base ref
...
head repository: scalacenter/sbt-scalafix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.10.1
Choose a head ref
  • 11 commits
  • 9 files changed
  • 2 contributors

Commits on Apr 8, 2022

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    c6de7da View commit details

Commits on Apr 11, 2022

  1. Merge pull request #299 from scalacenter/conflicting-namespace

    remove deprecated class in conflicting namespace
    bjaglin authored Apr 11, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    eaacbba View commit details
  2. Copy the full SHA
    2f01689 View commit details

Commits on Apr 15, 2022

  1. Merge pull request #300 from bjaglin/reset

    scalafixEnable: preserve versions set by ++
    bjaglin authored Apr 15, 2022
    Copy the full SHA
    787958b View commit details

Commits on Apr 21, 2022

  1. Copy the full SHA
    2b7dbf6 View commit details

Commits on Apr 22, 2022

  1. Merge pull request #301 from scala-steward/update/scalafmt-core-3.5.2

    Update scalafmt-core to 3.5.2
    bjaglin authored Apr 22, 2022
    Copy the full SHA
    9c1ce98 View commit details

Commits on May 1, 2022

  1. Copy the full SHA
    ceae9e8 View commit details
  2. Merge pull request #302 from scala-steward/update/scalatest-3.2.12

    Update scalatest to 3.2.12
    bjaglin authored May 1, 2022
    Copy the full SHA
    7697ec9 View commit details

Commits on May 14, 2022

  1. Copy the full SHA
    961d384 View commit details

Commits on Jun 9, 2022

  1. Merge pull request #303 from scala-steward/update/scalafmt-core-3.5.3

    Update scalafmt-core to 3.5.3
    bjaglin authored Jun 9, 2022
    Copy the full SHA
    9a34db0 View commit details
  2. scalafix 0.10.1 (#304)

    bjaglin authored Jun 9, 2022
    Copy the full SHA
    ecc2bd2 View commit details
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.5.1"
version = "3.5.3"
project.git=true
align.preset=none
assumeStandardLibraryStripMargin = true
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ resolvers += Resolver.sonatypeRepo("public")
libraryDependencies ++= Dependencies.all
libraryDependencies ++= List(
"com.lihaoyi" %% "fansi" % "0.3.1" % Test,
"org.scalatest" %% "scalatest" % "3.2.11" % Test
"org.scalatest" %% "scalatest" % "3.2.12" % Test
)

scalaVersion := "2.12.15"
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ import sbt._

object Dependencies {
val x = List(1) // scalafix:ok
def scalafixVersion: String = "0.10.0"
def scalafixVersion: String = "0.10.1"

val all = List(
"org.eclipse.jgit" % "org.eclipse.jgit" % "5.13.0.202109080827-r",
13 changes: 0 additions & 13 deletions src/main/scala/scalafix/Versions.scala

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/scala/scalafix/sbt/ScalafixEnable.scala
Original file line number Diff line number Diff line change
@@ -184,6 +184,6 @@ object ScalafixEnable {
scalacOptionsSettings ++ enableSemanticdbPlugin
)
} yield settings
extracted.appendWithoutSession(settings, s)
extracted.appendWithSession(settings, s)
}
}
2 changes: 1 addition & 1 deletion src/sbt-test/sbt-scalafix/basic/build.sbt
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ inThisBuild(
"org.scalameta" %% "testkit" % "4.3.10" % Test,
"org.scalameta" %% "munit" % "0.7.9" % Test,
"org.scalacheck" %% "scalacheck" % "1.13.5" % Test,
"org.scalatest" %% "scalatest" % "3.2.11" % Test
"org.scalatest" %% "scalatest" % "3.2.12" % Test
),
scalafixDependencies := List(
// Custom rule published to Maven Central https://github.com/scalacenter/example-scalafix-rule
2 changes: 1 addition & 1 deletion src/sbt-test/sbt-scalafix/inconfig/build.sbt
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ inThisBuild(
"org.scalameta" %% "testkit" % "4.3.10" % Test,
"org.scalameta" %% "munit" % "0.7.9" % Test,
"org.scalacheck" %% "scalacheck" % "1.13.5" % Test,
"org.scalatest" %% "scalatest" % "3.2.11" % Test
"org.scalatest" %% "scalatest" % "3.2.12" % Test
),
scalafixDependencies := List(
// Custom rule published to Maven Central https://github.com/scalacenter/example-scalafix-rule
7 changes: 6 additions & 1 deletion src/sbt-test/sbt-scalafix/scalafixEnable/build.sbt
Original file line number Diff line number Diff line change
@@ -28,7 +28,8 @@ lazy val scala212 = project.settings(
// 2.13.x is supported
lazy val scala213 = project.settings(
// semanticdb-scalac_2.13.4 available in 4.4.10, became available as of 4.4.0
scalaVersion := "2.13.4"
scalaVersion := "2.13.4",
crossScalaVersions := Seq("2.12.15")
)

TaskKey[Unit]("check") := {
@@ -68,3 +69,7 @@ TaskKey[Unit]("check") := {
.count(_ == "-Yrangepos") == 1
)
}

TaskKey[Unit]("checkVersion") := {
assert((scala213 / scalaVersion).value == "2.12.15")
}
8 changes: 7 additions & 1 deletion src/sbt-test/sbt-scalafix/scalafixEnable/test
Original file line number Diff line number Diff line change
@@ -4,4 +4,10 @@

-> scala212/test:compile
> scala212/scalafixAll RemoveUnused
> scala212/test:compile
> scala212/test:compile

-> checkVersion
> ++2.12.15 -v
> checkVersion
> scalafixEnable
> checkVersion