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

Updates #1434

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Updates #1434

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
./mill -i '__['"$SV"'].publishLocal'
done
./mill -i __.publishLocal
./mill -i ci.publishSonatype __.publishArtifacts
./mill -i ci.publishSonatype --tasks __.publishArtifacts
shell: bash
env:
PGP_PASSWORD: ${{ secrets.PUBLISH_SECRET_KEY_PASSWORD }}
Expand Down
2 changes: 1 addition & 1 deletion .mill-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.11.7
0.12.1
4 changes: 2 additions & 2 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ trait Examples extends SbtModule {
private def examplesScalaVersion = "2.12.19"
private def baseRepoRoot = os.sub / "out" / "repo"
def scalaVersion = ScalaVersions.scala3Latest
object test extends SbtModuleTests {
object test extends SbtTests {
def testFramework = "munit.Framework"
def ivyDeps = T {
super.ivyDeps() ++ Agg(
Expand Down Expand Up @@ -570,7 +570,7 @@ trait Integration extends SbtModule {
Deps.testUtil
)

object test extends SbtModuleTests with TestCommand {
object test extends SbtTests with TestCommand {
object helper extends ScalaModule {
def scalaVersion = ScalaVersions.scala3Latest
def scala213 = T {
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/dev-from-sources.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Once done building, this should print the path to the kernel launcher, like

Optionally, pass a Scala version, like
```text
$ ./mill dev.launcherFast 2.12.13
$ ./mill dev.launcherFast --scalaVersion 2.12.13
```

You can then run that launcher to install it on your system:
Expand Down
2 changes: 1 addition & 1 deletion project/deps.sc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import mill._
import mill.scalalib._

object Versions {
def ammonite = "3.0.0-M2-30-486378af"
def ammonite = "3.0.0-2-6342755f"
def caseApp = "2.1.0-M26"
def coursier = "2.1.14"
def jsoniterScala = "2.13.5"
Expand Down
6 changes: 3 additions & 3 deletions project/settings.sc
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ trait CrossSbtModule extends mill.scalalib.SbtModule with mill.scalalib.CrossMod
PathRef(millSourcePath / "src" / "main" / s"scala-$s")
)
}
trait CrossSbtModuleTests extends SbtModuleTests {
trait CrossSbtModuleTests extends SbtTests {
override def millSourcePath = outer.millSourcePath
def sources = T.sources {
super.sources() ++ scalaVersionDirectoryNames.map(s =>
Expand Down Expand Up @@ -275,7 +275,7 @@ trait AlmondTestModule
sysProps = props,
outputPath = outputPath,
colored = T.log.colored,
testCp = compile().classes.path,
testCp = Seq(compile().classes.path),
home = T.home,
globSelectors = globSelectors()
)
Expand Down Expand Up @@ -808,7 +808,7 @@ trait TestCommand extends TestModule {
sysProps = props,
outputPath = outputPath,
colored = T.log.colored,
testCp = compile().classes.path,
testCp = Seq(compile().classes.path),
home = T.home,
globSelectors = globSelectors
)
Expand Down
Loading