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

Update mill-moduledefs to 0.11.2 #4230

Merged
Merged
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
31 changes: 18 additions & 13 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 @@ -150,7 +150,7 @@ object Deps {
val osLib = ivy"com.lihaoyi::os-lib:0.11.4-M2"
val pprint = ivy"com.lihaoyi::pprint:0.9.0"
val mainargs = ivy"com.lihaoyi::mainargs:0.7.6"
val millModuledefsVersion = "0.11.1"
val millModuledefsVersion = "0.11.2"
val millModuledefsString = s"com.lihaoyi::mill-moduledefs:${millModuledefsVersion}"
val millModuledefs = ivy"${millModuledefsString}"
val millModuledefsPlugin =
Expand All @@ -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
Loading