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

Fix some hardcoded scala versions #2768

Merged
merged 4 commits into from
Sep 20, 2023
Merged

Fix some hardcoded scala versions #2768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c8f31be
Fix some hardcoded scala versions
lefou Sep 19, 2023
15f6250
Merge branch 'main' into fix-hardcoded
lefou Sep 19, 2023
3eae2d6
Exclude one more message
lefou Sep 20, 2023
05f7618
Cleanup
lefou Sep 20, 2023
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
4 changes: 2 additions & 2 deletions build.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,14 +521,14 @@ object main extends MillStableScalaModule with BuildInfo {
trait CaseModule extends ScalaModule with Cross.Module[String] {
def caseName = crossValue
object external extends ScalaModule {
def scalaVersion = "2.13.10"
def scalaVersion = Deps.scalaVersion
}

def moduleDeps = Seq(external)

val Array(prefix, suffix, rest) = caseName.split("-", 3)
def millSourcePath = super.millSourcePath / prefix / suffix / rest
def scalaVersion = "2.13.10"
def scalaVersion = Deps.scalaVersion
def ivyDeps = T {
if (!caseName.contains("realistic") && !caseName.contains("sourcecode")) super.ivyDeps()
else Agg(
Expand Down
1 change: 1 addition & 0 deletions integration/feature/watch-source-input/test/src/WatchSourceInputTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ object WatchSourceInputTests extends IntegrationTestSuite {
val res = f(expectedOut, expectedErr, expectedShows)
val (shows, out) = res.out.linesIterator.toVector.partition(_.startsWith("\""))
val err = res.err.linesIterator.toVector
.filter(!_.contains("Compiling compiler interface..."))
.filter(!_.contains("Watching for changes"))
.filter(!_.contains("[info] compiling"))
.filter(!_.contains("[info] done compiling"))
Expand Down
4 changes: 2 additions & 2 deletions runner/src/mill/runner/MillBuildRootModule.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import coursier.Repository
import mill._
import mill.api.{PathRef, Result, internal}
import mill.define.{Discover, Task}
import mill.scalalib.{BoundDep, Dep, DepSyntax, Lib, ScalaModule}
import mill.scalalib.{Dep, DepSyntax, Lib, ScalaModule}
import mill.util.CoursierSupport
import mill.util.Util.millProjectModule
import mill.scalalib.api.Versions
Expand Down Expand Up @@ -41,7 +41,7 @@ class MillBuildRootModule()(implicit
override def millSourcePath = millBuildRootModuleInfo.projectRoot / os.up / "mill-build"
override def intellijModulePath: os.Path = millSourcePath / os.up

override def scalaVersion: T[String] = "2.13.10"
override def scalaVersion: T[String] = BuildInfo.scalaVersion

/**
* All script files (that will get wrapped later)
Expand Down