Skip to content

Commit

Permalink
Added support for Mill 0.10.0-M4
Browse files Browse the repository at this point in the history
  • Loading branch information
lefou committed Nov 13, 2021
1 parent 934c2d5 commit 5ca2a8e
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .mill-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.9.9
0.9.10
56 changes: 22 additions & 34 deletions build.sc
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
// mill plugins
import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version_mill0.9:0.1.1`
import mill.define.{Command, Task, TaskModule}
import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.1.2`
// Run integration tests with mill
import $ivy.`de.tototec::de.tobiasroeser.mill.integrationtest_mill0.9:0.4.1-15-e48bb3`
import $ivy.`de.tototec::de.tobiasroeser.mill.integrationtest::0.4.1-26-70d7c9`
// Generate converage reports
import $ivy.`com.lihaoyi::mill-contrib-scoverage:$MILL_VERSION`
import $ivy.`com.lihaoyi::mill-contrib-scoverage:`

import mill.define.{Command, Task, TaskModule}

import java.nio.file.attribute.PosixFilePermission

Expand Down Expand Up @@ -41,42 +42,29 @@ trait Deps {
val slf4j = ivy"org.slf4j:slf4j-api:1.7.32"
}

object Deps_0_10 extends Deps {
override val millVersion = "0.10.0-M4"
override def millPlatform: String = "0.10.0-M4"
override val scalaVersion = "2.13.7"
override val millTestVersions = Seq(millVersion)
}
object Deps_0_9 extends Deps {
override val millVersion = "0.9.3"
override def millPlatform: String = "0.9"
override val scalaVersion = "2.13.6"
override val millTestVersions = Seq(
"0.9.8",
"0.9.7",
"0.9.6",
"0.9.5",
"0.9.4",
"0.9.3"
)
override val millTestVersions = Seq("0.9.10", "0.9.9", "0.9.8", "0.9.7", "0.9.6", "0.9.5", "0.9.4", millVersion)
}
object Deps_0_7 extends Deps {
override val millVersion = "0.7.0"
override def millPlatform = "0.7"
override val scalaVersion = "2.13.6"
override val millTestVersions = Seq(
"0.8.0",
"0.7.4",
"0.7.3",
"0.7.2",
"0.7.1",
"0.7.0"
)
override val millTestVersions = Seq("0.8.0", "0.7.4", "0.7.3", "0.7.2", "0.7.1", millVersion)
}
object Deps_0_6 extends Deps {
override val millVersion = "0.6.0"
override def millPlatform = "0.6"
override val scalaVersion = "2.12.15"
override val millTestVersions = Seq(
"0.6.3",
"0.6.2",
"0.6.1",
"0.6.0"
)
override val millTestVersions = Seq("0.6.3", "0.6.2", "0.6.1", millVersion)
}

/** Cross build versions */
Expand Down Expand Up @@ -120,13 +108,13 @@ class Core(override val millPlatform: String) extends MillOsgiModule with Scover
val dest = T.dest
val infoClass =
s"""// Generated with mill from build.sc
|package de.tobiasroeser.mill.osgi.internal
|
|object BuildInfo {
| def millOsgiVerison = "${publishVersion()}"
| def millVersion = "${deps.millVersion}"
|}
|""".stripMargin
|package de.tobiasroeser.mill.osgi.internal
|
|object BuildInfo {
| def millOsgiVerison = "${publishVersion()}"
| def millVersion = "${deps.millVersion}"
|}
|""".stripMargin
os.write(dest / "BuildInfo.scala", infoClass)
super.generatedSources() ++ Seq(PathRef(dest))
}
Expand Down Expand Up @@ -187,7 +175,7 @@ class ItestCross(millVersion: String) extends MillIntegrationTestModule {
os.write(
T.dest / "shared.sc",
s"""import $$ivy.`${scov.module.organization.value}::${scov.module.name.value}:${scov.version}`
|""".stripMargin
|""".stripMargin
)
PathRef(T.dest)
}
Expand Down

0 comments on commit 5ca2a8e

Please sign in to comment.