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.

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

build(deps): Update sbt-scalafix from 0.10.4 to 0.11.0 #2065

Merged
merged 2 commits into from
Jun 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,20 @@ package sbt.internal.inc.bloop.internal

import java.nio.file.Path

import scala.util.control.NonFatal

import _root_.bloop.io.ByteHasher
import sbt.internal.inc.EmptyStamp
import sbt.internal.inc.FarmHash
import sbt.internal.inc.Hash
import sbt.internal.inc.PlainVirtualFileConverter
import sbt.internal.inc.Stamper
import sbt.internal.inc.Stamps
import sbt.util.Logger
import xsbti.VirtualFileRef
import xsbti.compile.FileHash
import xsbti.compile.analysis.ReadStamps
import xsbti.compile.analysis.Stamp
import scala.util.control.NonFatal
import sbt.util.Logger
import sbt.internal.inc.FarmHash

object BloopStamps {
private val converter = PlainVirtualFileConverter.converter
Expand Down
6 changes: 2 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import build.Dependencies.{Scala211Version, Scala212Version, SbtVersion}

ThisBuild / dynverSeparator := "-"

ThisBuild / scalafixDependencies += "com.github.liancheng" %% "organize-imports" % "0.6.0"

// Add hook for scalafmt validation
Global / onLoad ~= { old =>
if (!scala.util.Properties.isWin) {
Expand All @@ -28,8 +26,7 @@ Global / onLoad ~= { old =>

val scalafixSettings: Seq[Setting[_]] = Seq(
scalacOptions ++= {
if (scalaVersion.value.startsWith("2.11")) Seq("-Ywarn-unused-import")
else if (scalaVersion.value.startsWith("2.12")) Seq("-Ywarn-unused", "-Xlint:unused")
if (scalaVersion.value.startsWith("2.12")) Seq("-Ywarn-unused", "-Xlint:unused")
else if (scalaVersion.value.startsWith("2.13")) Seq("-Wunused")
else Seq.empty
},
Expand Down Expand Up @@ -369,6 +366,7 @@ lazy val buildpress = project
.dependsOn(bloopgun, bloopShared, buildpressConfig)
.settings(
scalaVersion := Scala212Version,
scalafixSettings,
(run / fork) := true,
libraryDependencies ++= List(
Dependencies.caseApp
Expand Down
29 changes: 20 additions & 9 deletions buildpress/src/main/scala/buildpress/Buildpress.scala
Original file line number Diff line number Diff line change
@@ -1,19 +1,30 @@
package buildpress

import java.io.{IOException, InputStream, PrintStream}
import java.net.{URI, URISyntaxException}
import java.io.IOException
import java.io.InputStream
import java.io.PrintStream
import java.net.URI
import java.net.URISyntaxException
import java.nio.charset.StandardCharsets
import java.nio.file.{Files, Path}
import java.nio.file.Files
import java.nio.file.Path

import scala.collection.mutable
import scala.util.control.NonFatal
import bloop.io.{AbsolutePath, Paths}
import bloop.io.Environment.{lineSeparator, LineSplitter}
import buildpress.RepositoryCache.RepoCacheDiff
import buildpress.io.{BuildpressPaths, SbtProjectHasher}
import buildpress.util.Traverse._
import caseapp.core.help.{Help, WithHelp}

import bloop.bloopgun.core.Shell
import bloop.bloopgun.core.Shell.StatusCommand
import bloop.io.AbsolutePath
import bloop.io.Environment.LineSplitter
import bloop.io.Environment.lineSeparator
import bloop.io.Paths

import buildpress.RepositoryCache.RepoCacheDiff
import buildpress.io.BuildpressPaths
import buildpress.io.SbtProjectHasher
import buildpress.util.Traverse._
import caseapp.core.help.Help
import caseapp.core.help.WithHelp

abstract class Buildpress(
in: InputStream,
Expand Down
14 changes: 11 additions & 3 deletions buildpress/src/main/scala/buildpress/BuildpressParams.scala
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
package buildpress

import java.nio.file.{Path, Paths}
import java.nio.file.Path
import java.nio.file.Paths

import scala.util.Try

import bloop.io.AbsolutePath
import caseapp.core.argparser.{ArgParser, SimpleArgParser}

import caseapp.ExtraName
import caseapp.Help
import caseapp.HelpMessage
import caseapp.Parser
import caseapp.core.Error
import caseapp.{ExtraName, Help, HelpMessage, Parser}
import caseapp.core.argparser.ArgParser
import caseapp.core.argparser.SimpleArgParser

final case class BuildpressParams(
@ExtraName("i")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package buildpress

import bloop.io.AbsolutePath

import buildpress.config.Config.BuildSettingsHashes

final case class ClonedRepository(
Expand Down
2 changes: 1 addition & 1 deletion buildpress/src/main/scala/buildpress/Main.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package buildpress

import bloop.io.AbsolutePath
import bloop.bloopgun.core.Shell
import bloop.io.AbsolutePath

object Main
extends Buildpress(
Expand Down
6 changes: 5 additions & 1 deletion buildpress/src/main/scala/buildpress/RepositoryCache.scala
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
package buildpress

import java.io.IOException

import bloop.io.AbsolutePath

import buildpress.RepositoryCache.RepoCacheDiff
import buildpress.config.Config.{RepoCacheEntries, RepoCacheEntry, RepoCacheFile}
import buildpress.config.Config.RepoCacheEntries
import buildpress.config.Config.RepoCacheEntry
import buildpress.config.Config.RepoCacheFile

final case class RepositoryCache(source: AbsolutePath, repositories: List[ClonedRepository]) {
private lazy val lookupById: Map[String, ClonedRepository] =
Expand Down
9 changes: 5 additions & 4 deletions buildpress/src/main/scala/buildpress/io/BuildpressPaths.scala
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package buildpress.io
import java.io.IOException
import java.nio.file.DirectoryNotEmptyException
import java.nio.file.FileVisitResult
import java.nio.file.Files
import java.nio.file.SimpleFileVisitor
import java.nio.file.Path
import java.nio.file.SimpleFileVisitor
import java.nio.file.attribute.BasicFileAttributes
import java.nio.file.FileVisitResult
import java.io.IOException
import java.nio.file.DirectoryNotEmptyException

import bloop.io.AbsolutePath

object BuildpressPaths {
Expand Down
15 changes: 12 additions & 3 deletions buildpress/src/main/scala/buildpress/io/SbtProjectHasher.scala
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
package buildpress.io

import java.io.IOException
import java.nio.file.{Path, PathMatcher, FileVisitor, Files, FileVisitResult, FileVisitOption}
import java.nio.file.FileVisitOption
import java.nio.file.FileVisitResult
import java.nio.file.FileVisitor
import java.nio.file.Files
import java.nio.file.Path
import java.nio.file.PathMatcher
import java.nio.file.attribute.BasicFileAttributes
import bloop.io.{AbsolutePath, ByteHasher}
import buildpress.config.Config.{BuildSettingsHashes, HashedPath}

import bloop.io.AbsolutePath
import bloop.io.ByteHasher

import buildpress.config.Config.BuildSettingsHashes
import buildpress.config.Config.HashedPath

object SbtProjectHasher {
class SbtFileMatcher(root: Path) extends PathMatcher {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/test/scala/bloop/util/TestUtil.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package bloop.util

import java.io.File
import java.lang.management.ManagementFactory
import java.nio.file.Files
import java.nio.file.Path
import java.nio.file.attribute.FileTime
Expand Down Expand Up @@ -53,7 +54,6 @@ import _root_.monix.execution.Scheduler
import org.junit.Assert
import sbt.internal.inc.BloopComponentCompiler
import xsbti.ComponentProvider
import java.lang.management.ManagementFactory

object TestUtil {
def projectDir(base: Path, name: String): Path = base.resolve(name)
Expand Down
2 changes: 1 addition & 1 deletion project/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7")
addSbtPlugin("org.scala-debugger" % "sbt-jdi-tools" % "1.1.1")
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.4")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.0")

updateOptions := updateOptions.value.withLatestSnapshots(false)
libraryDependencies ++= List(
Expand Down