Skip to content

Commit

Permalink
Reformat with scalafmt 3.8.4-RC4
Browse files Browse the repository at this point in the history
Executed command: scalafmt --non-interactive
  • Loading branch information
scala-steward committed Jan 2, 2025
1 parent fc4de97 commit 8fdf54e
Show file tree
Hide file tree
Showing 45 changed files with 271 additions and 226 deletions.
29 changes: 17 additions & 12 deletions build.mill
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ object Settings {
// the last point version in each minor release series
val legacyDocTags: Seq[String] = Seq(
"0.9.12",
"0.10.15",
"0.10.15"
)
val docTags: Seq[String] = Seq(
"0.11.13",
"0.12.5"
)
val mimaBaseVersions: Seq[String] =
0.to(13).map("0.11." + _) ++
Seq("0.12.0", "0.12.1", "0.12.2", "0.12.3", "0.12.4", "0.12.5")
Seq("0.12.0", "0.12.1", "0.12.2", "0.12.3", "0.12.4", "0.12.5")
}

object Deps {
Expand Down Expand Up @@ -166,7 +166,8 @@ object Deps {
val scalacScoverage2Plugin = ivy"org.scoverage:::scalac-scoverage-plugin:${scoverage2Version}"
val scalacScoverage2Reporter = ivy"org.scoverage::scalac-scoverage-reporter:${scoverage2Version}"
val scalacScoverage2Domain = ivy"org.scoverage::scalac-scoverage-domain:${scoverage2Version}"
val scalacScoverage2Serializer = ivy"org.scoverage::scalac-scoverage-serializer:${scoverage2Version}"
val scalacScoverage2Serializer =
ivy"org.scoverage::scalac-scoverage-serializer:${scoverage2Version}"
val scalaparse = ivy"com.lihaoyi::scalaparse:${fastparse.version}"
val scalatags = ivy"com.lihaoyi::scalatags:0.12.0"
def scalaXml = ivy"org.scala-lang.modules::scala-xml:2.3.0"
Expand All @@ -189,19 +190,25 @@ object Deps {
val mavenVersion = "3.9.9"
val mavenEmbedder = ivy"org.apache.maven:maven-embedder:$mavenVersion"
val mavenResolverVersion = "1.9.22"
val mavenResolverConnectorBasic = ivy"org.apache.maven.resolver:maven-resolver-connector-basic:$mavenResolverVersion"
val mavenResolverSupplier = ivy"org.apache.maven.resolver:maven-resolver-supplier:$mavenResolverVersion"
val mavenResolverTransportFile = ivy"org.apache.maven.resolver:maven-resolver-transport-file:$mavenResolverVersion"
val mavenResolverTransportHttp = ivy"org.apache.maven.resolver:maven-resolver-transport-http:$mavenResolverVersion"
val mavenResolverTransportWagon = ivy"org.apache.maven.resolver:maven-resolver-transport-wagon:$mavenResolverVersion"
val mavenResolverConnectorBasic =
ivy"org.apache.maven.resolver:maven-resolver-connector-basic:$mavenResolverVersion"
val mavenResolverSupplier =
ivy"org.apache.maven.resolver:maven-resolver-supplier:$mavenResolverVersion"
val mavenResolverTransportFile =
ivy"org.apache.maven.resolver:maven-resolver-transport-file:$mavenResolverVersion"
val mavenResolverTransportHttp =
ivy"org.apache.maven.resolver:maven-resolver-transport-http:$mavenResolverVersion"
val mavenResolverTransportWagon =
ivy"org.apache.maven.resolver:maven-resolver-transport-wagon:$mavenResolverVersion"
val coursierJvmIndexVersion = "0.0.4-70-51469f"

object RuntimeDeps {
val dokkaVersion = "1.9.20"
val koverVersion = "0.8.3"

val detektCli = ivy"io.gitlab.arturbosch.detekt:detekt-cli:1.23.7"
val dokkaAnalysisDescriptors = ivy"org.jetbrains.dokka:analysis-kotlin-descriptors:$dokkaVersion"
val dokkaAnalysisDescriptors =
ivy"org.jetbrains.dokka:analysis-kotlin-descriptors:$dokkaVersion"
val dokkaBase = ivy"org.jetbrains.dokka:dokka-base:$dokkaVersion"
val dokkaCli = ivy"org.jetbrains.dokka:dokka-cli:$dokkaVersion"
val errorProneCore = ivy"com.google.errorprone:error_prone_core:2.31.0"
Expand All @@ -227,7 +234,7 @@ object Deps {
koverJvmAgent,
ktfmt,
ktlint,
sbtTestInterface,
sbtTestInterface
)
}

Expand Down Expand Up @@ -651,14 +658,12 @@ def formatDep(dep: Dep) = {
s"${d.module.organization.value}:${d.module.name.value}:${d.version}"
}


def listIn(path: os.Path) = interp.watchValue(os.list(path).map(_.last))

object idea extends MillPublishScalaModule {
def moduleDeps = Seq(build.scalalib, build.runner)
}


private def resolveTasks[T](taskNames: String*): Seq[NamedTask[T]] = {
mill.resolve.Resolve.Tasks.resolve(
build,
Expand Down
2 changes: 0 additions & 2 deletions ci/shared.mill
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package build.ci



def downloadTestRepo(label: String, commit: String, dest: os.Path) = {
os.unzip.stream(requests.get.stream(s"https://github.com/$label/archive/$commit.zip"), dest)
dest
Expand Down
2 changes: 1 addition & 1 deletion contrib/package.mill
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ object `package` extends RootModule {
def testArgs = Task {
super.testArgs() ++
Seq(
s"-DMILL_SCOVERAGE2_VERSION=${build.Deps.scalacScoverage2Plugin.dep.version}",
s"-DMILL_SCOVERAGE2_VERSION=${build.Deps.scalacScoverage2Plugin.dep.version}"
)
}

Expand Down
30 changes: 19 additions & 11 deletions dist/package.mill
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,11 @@ object `package` extends RootModule with build.MillPublishJavaModule {
}
}
def launcherScript(
shellJvmArgs: Seq[String],
cmdJvmArgs: Seq[String],
shellClassPath: Agg[String],
cmdClassPath: Agg[String]
) = {
shellJvmArgs: Seq[String],
cmdJvmArgs: Seq[String],
shellClassPath: Agg[String],
cmdClassPath: Agg[String]
) = {

val millMainClass = "mill.runner.client.MillClientMain"

Expand Down Expand Up @@ -241,7 +241,9 @@ object `package` extends RootModule with build.MillPublishJavaModule {

def installLocalCache() = Task.Command {
val path = installLocalTask(
Task.Anon((os.home / ".cache" / "mill" / "download" / (build.millVersion() + batExt)).toString())
Task.Anon(
(os.home / ".cache" / "mill" / "download" / (build.millVersion() + batExt)).toString()
)
)()
Task.log.outputStream.println(path.toString())
PathRef(path)
Expand All @@ -253,14 +255,21 @@ object `package` extends RootModule with build.MillPublishJavaModule {
if (os.exists(targetFile))
Task.log.info(s"Overwriting existing local Mill binary at ${targetFile}")
os.copy.over(millBin.path, targetFile, createFolders = true)
Task.log.info(s"Published ${build.dist.allPublishModules.size} modules and installed ${targetFile}")
Task.log.info(
s"Published ${build.dist.allPublishModules.size} modules and installed ${targetFile}"
)
targetFile
}

def millBootstrap = Task.Source(Task.workspace / "mill")
def millBootstrapBat = Task.Source(Task.workspace / "mill.bat")

def prepareBootstrapLauncher(bootstrap: os.Path, dest: os.Path, buildVersion: String, fileName: String) = {
def prepareBootstrapLauncher(
bootstrap: os.Path,
dest: os.Path,
buildVersion: String,
fileName: String
) = {
val outputPath = dest / fileName
val millBootstrapGrepPrefix = "(\n *DEFAULT_MILL_VERSION=)"

Expand All @@ -284,7 +293,7 @@ object `package` extends RootModule with build.MillPublishJavaModule {
prepareBootstrapLauncher(millBootstrapBat().path, Task.dest, build.millVersion(), "mill.bat")
}

def examplePathsWithArtifactName:Task[Seq[(os.Path,String)]] = Task.Anon{
def examplePathsWithArtifactName: Task[Seq[(os.Path, String)]] = Task.Anon {
for {
exampleMod <- build.example.exampleModules
path = exampleMod.millSourcePath
Expand All @@ -295,9 +304,8 @@ object `package` extends RootModule with build.MillPublishJavaModule {
}
}


def exampleZips: T[Seq[PathRef]] = Task {
examplePathsWithArtifactName().map{ case (examplePath, exampleStr) =>
examplePathsWithArtifactName().map { case (examplePath, exampleStr) =>
os.copy(examplePath, Task.dest / exampleStr, createFolders = true)
os.write(Task.dest / exampleStr / ".mill-version", build.millLastTag())
os.copy(bootstrapLauncher().path, Task.dest / exampleStr / "mill")
Expand Down
Loading

0 comments on commit 8fdf54e

Please sign in to comment.