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.

Sign up for GitHub

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

Jump to bottom

Added support for mill 0.10.0-M2 #37

Merged
merged 6 commits into from
Sep 17, 2021
Merged

Added support for mill 0.10.0-M2 #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
334d4cc
Added support for mill 0.10.0-M2
lefou Sep 17, 2021
947d049
Download mill 0.10.0-M2 from Maven Central
lefou Sep 17, 2021
fdb64b0
Updated Download Matrix
lefou Sep 17, 2021
ef5c37f
.
lefou Sep 17, 2021
ac3cc42
Fixed typo in build.sc
lefou Sep 17, 2021
ac75d74
Update mill-integrationtest version to 0.4.1-16-63f11c
lefou Sep 17, 2021
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
9 changes: 7 additions & 2 deletions README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ Please make sure to use the correct _mill platform suffix_ matching your used mi
[options="header"]
|===
| mill version | mill platform | suffix | example
| 0.9.3 - | 0.9 | `_mill0.9` | ```$ivy.`de.tototec::de.tobiasroeser.mill.vcs.version_mill0.9:{version}````
| 0.10.0-M2 | 0.10.0-M2 | `_mill0.10.0-M2` | ```$ivy.`de.tototec::de.tobiasroeser.mill.vcs.version_mill0.10.0-M2:{version}````
| 0.9.3 - 0.9.9 | 0.9 | `_mill0.9` | ```$ivy.`de.tototec::de.tobiasroeser.mill.vcs.version_mill0.9:{version}````
| 0.7.0 - 0.8.0 | 0.7 | `_mill0.7` | ```$ivy.`de.tototec::de.tobiasroeser.mill.vcs.version_mill0.7:{version}````
| 0.6.0 - 0.6.3 | 0.6 | `_mill0.6` | ```$ivy.`de.tototec::de.tobiasroeser.mill.vcs.version_mill0.6:{version}````
|===
Expand Down Expand Up @@ -106,7 +107,11 @@ Contributing::

== Releases / Changelog

=== mill-vsc-version 0.1.1 - 2020-01-21
=== main

* Added support for mill 0.10.0-M2

=== mill-vsc-version 0.1.1 - 2021-01-21

* Fixed handling of repos without any (previous) tag

Expand Down
31 changes: 15 additions & 16 deletions build.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// mill plugins
import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version_mill0.9:0.1.1`
import $ivy.`de.tototec::de.tobiasroeser.mill.integrationtest_mill0.9:0.4.1`
import $ivy.`de.tototec::de.tobiasroeser.mill.integrationtest_mill0.9:0.4.1-16-63f11c`
import $ivy.`com.lihaoyi::mill-contrib-scoverage:$MILL_VERSION`
import mill._
import mill.contrib.scoverage.ScoverageModule
Expand Down Expand Up @@ -30,26 +30,32 @@ trait Deps {
val slf4j = ivy"org.slf4j:slf4j-api:1.7.25"
}

object Deps_0_10_0_M2 extends Deps {
override def millPlatform = "0.10.0-M2"
override def millVersion = "0.10.0-M2" // scala-steward:off
override def scalaVersion = "2.13.6"
override def testWithMill = Seq(millVersion)
}
object Deps_0_9 extends Deps {
override def millPlatform = "0.9"
override def millVersion = "0.9.3" // scala-steward:off
override def scalaVersion = "2.13.6"
override def testWithMill = Seq("0.9.8", "0.9.7", "0.9.6", "0.9.5", "0.9.4", "0.9.3")
override def testWithMill = Seq("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 def millPlatform = "0.7"
override def millVersion = "0.7.0" // scala-steward:off
override def scalaVersion = "2.13.6"
override def testWithMill = Seq("0.8.0", "0.7.4", "0.7.3", "0.7.2", "0.7.1", "0.7.0")
override def testWithMill = Seq("0.8.0", "0.7.4", "0.7.3", "0.7.2", "0.7.1", millVersion)
}
object Deps_0_6 extends Deps {
override def millPlatform = "0.6"
override def millVersion = "0.6.0" // scala-steward:off
override def scalaVersion = "2.12.15"
override def testWithMill = Seq("0.6.3", "0.6.2", "0.6.1", "0.6.0")
override def testWithMill = Seq("0.6.3", "0.6.2", "0.6.1", millVersion)
}

val crossDeps = Seq(Deps_0_9, Deps_0_7, Deps_0_6)
val crossDeps = Seq(Deps_0_10_0_M2, Deps_0_9, Deps_0_7, Deps_0_6)
val millApiVersions = crossDeps.map(x => x.millPlatform -> x)
val millItestVersions = crossDeps.flatMap(x => x.testWithMill.map(_ -> x))

Expand Down Expand Up @@ -103,9 +109,8 @@ class CoreCross(override val millApiVersion: String) extends BaseModule {
deps.millScalalib
)

object test extends Tests {
object test extends Tests with TestModule.ScalaTest {
override def ivyDeps = Agg(deps.scalaTest)
def testFrameworks = Seq("org.scalatest.tools.Framework")
}
}

Expand Down Expand Up @@ -146,17 +151,11 @@ class ItestCross(millItestVersion: String) extends MillIntegrationTestModule {
}

override def perTestResources = T.sources { Seq(generatedSharedSrc()) }
def generatedSharedSrc = T{
def generatedSharedSrc = T {
os.write(
T.dest / "shared.sc",
s"""import $$ivy.`${
deps.scoverageRuntime.dep.module.organization.value
}::${
deps.scoverageRuntime.dep.module.name.value
}:${
deps.scoverageRuntime.dep.version
}`
|""".stripMargin
s"""import $$ivy.`${deps.scoverageRuntime.dep.module.organization.value}::${deps.scoverageRuntime.dep.module.name.value}:${deps.scoverageRuntime.dep.version}`
|""".stripMargin
)
PathRef(T.dest)
}
Expand Down