Skip to content

Commit 429af2b

Browse files
authored
Remove redundant code in Mill build configuration (#3713)
1 parent 9e634a3 commit 429af2b

File tree

2 files changed

+5
-29
lines changed

2 files changed

+5
-29
lines changed

build.mill.scala

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import settings.{
1313
CliLaunchers,
1414
FormatNativeImageConf,
1515
HasTests,
16-
Licenses,
1716
LocalRepo,
1817
PublishLocalNoFluff,
1918
ScalaCliCrossSbtModule,
@@ -25,13 +24,12 @@ import settings.{
2524
projectFileName,
2625
workspaceDirName
2726
}
28-
import build.project.deps
2927
import deps.customRepositories
3028
import deps.alpineVersion
3129
import build.project.website
3230
import coursier.Repository
3331

34-
import java.io.{File, InputStream}
32+
import java.io.File
3533
import java.net.URL
3634
import java.nio.charset.Charset
3735
import java.util.Locale
@@ -43,10 +41,8 @@ import scalalib.{publish => _, _}
4341
import mill.contrib.bloop.Bloop
4442
import mill.testrunner.TestResult
4543
import os.{CommandResult, Path}
46-
import upickle.default.read
4744

4845
import _root_.scala.util.{Properties, Using}
49-
import _root_.scala.annotation.unused
5046

5147
// Tell mill modules are under modules/
5248
implicit def millModuleBasePath: define.Ctx.BasePath =
@@ -329,9 +325,9 @@ trait BuildMacros extends ScalaCliCrossSbtModule
329325
val base = Task.workspace / "modules" / "build-macros" / "src"
330326
val negativeTests = Seq(
331327
"MismatchedLeft.scala" -> Seq(
332-
"Found\\: +EE1".r,
333-
"Found\\: +EE2".r,
334-
"Required\\: +E2".r
328+
"Found: +EE1".r,
329+
"Found: +EE2".r,
330+
"Required: +E2".r
335331
)
336332
)
337333

@@ -906,7 +902,7 @@ trait Cli extends CrossSbtModule with ProtoBuildModule with CliLaunchers
906902
(
907903
"https://raw.githubusercontent.com/scala-cli/default-workflow/main/.github/workflows/ci.yml",
908904
os.sub / "workflows" / "default.yml",
909-
transformWorkflow _
905+
transformWorkflow
910906
),
911907
(
912908
"https://raw.githubusercontent.com/scala-cli/default-workflow/main/.gitignore",

project/deps/package.mill.scala

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ package build.project.deps
22
import mill._
33
import scalalib._
44

5-
import scala.annotation.unused
6-
75
object Cli {
86
def runnerLegacyVersion = "1.7.1" // last runner version to support pre-LTS Scala 3 versions
97
}
@@ -32,7 +30,6 @@ object Scala {
3230
val allScala3 = Seq(scala3Lts, scala3Next, scala3NextAnnounced, scala3NextRc).distinct
3331
val all = (allScala2 ++ allScala3 ++ defaults).distinct
3432
val scala3MainVersions = (defaults ++ allScala3).distinct
35-
val mainVersions = (Seq(scala213) ++ scala3MainVersions).distinct
3633
val runnerScalaVersions = runnerScala3 +: allScala2
3734
val testRunnerScalaVersions = (runnerScalaVersions ++ allScala3).distinct
3835

@@ -80,22 +77,6 @@ object Scala {
8077
def maxAmmoniteScala3LtsVersion = "3.3.5"
8178
lazy val listMaxAmmoniteScalaVersion: Seq[String] =
8279
Seq(maxAmmoniteScala212Version, maxAmmoniteScala213Version, maxAmmoniteScala3Version)
83-
lazy val listAllAmmonite: Seq[String] = {
84-
import coursier.core.Version
85-
val max212 = Version(maxAmmoniteScala212Version)
86-
val max213 = Version(maxAmmoniteScala213Version)
87-
val max3 = Version(maxAmmoniteScala3Version)
88-
listAll.filter { v =>
89-
if (v.startsWith("3."))
90-
Version(v).compareTo(max3) <= 0
91-
else if (v.startsWith("2.13."))
92-
Version(v).compareTo(max213) <= 0
93-
else if (v.startsWith("2.12."))
94-
Version(v).compareTo(max212) <= 0
95-
else
96-
true
97-
}
98-
}
9980
}
10081

10182
object Java {
@@ -135,7 +116,6 @@ object Deps {
135116
def coursierCli = coursierDefault
136117
def coursierM1Cli = coursierDefault
137118
def jmh = "1.37"
138-
def jsoniterScala = "2.23.2"
139119
def jsoniterScalaJava8 = "2.13.5.2"
140120
def jsoup = "1.20.1"
141121
def scalaMeta = "4.13.6"

0 commit comments

Comments
 (0)