diff --git a/build.sc b/build.mill similarity index 99% rename from build.sc rename to build.mill index 811d015c4c..e8751b9527 100644 --- a/build.sc +++ b/build.mill @@ -1,3 +1,5 @@ +package build + import $ivy.`com.lihaoyi::mill-contrib-bloop:$MILL_VERSION` import $ivy.`io.get-coursier::coursier-launcher:2.1.13` import $ivy.`io.github.alexarchambault.mill::mill-native-image-upload:0.1.26` diff --git a/project/deps.sc b/project/deps.mill similarity index 99% rename from project/deps.sc rename to project/deps.mill index 67f97f17ca..82614f65ee 100644 --- a/project/deps.sc +++ b/project/deps.mill @@ -1,3 +1,5 @@ +package build.project + import Deps.Versions import mill._ import scalalib._ diff --git a/project/package.mill b/project/package.mill new file mode 100644 index 0000000000..5aa711479c --- /dev/null +++ b/project/package.mill @@ -0,0 +1 @@ +package build.project diff --git a/project/publish.sc b/project/publish.mill similarity index 98% rename from project/publish.sc rename to project/publish.mill index 4a305fe2a5..3c147137cb 100644 --- a/project/publish.sc +++ b/project/publish.mill @@ -1,6 +1,8 @@ +package build.project + import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.4.0` import $ivy.`org.eclipse.jgit:org.eclipse.jgit:6.8.0.202311291450-r` -import $file.settings, settings.{PublishLocalNoFluff, workspaceDirName} +import $file.project.settings, settings.{PublishLocalNoFluff, workspaceDirName} import de.tobiasroeser.mill.vcs.version._ import mill._, scalalib._ diff --git a/project/settings.sc b/project/settings.mill similarity index 99% rename from project/settings.sc rename to project/settings.mill index b28ed46f4d..56ce920a2e 100644 --- a/project/settings.sc +++ b/project/settings.mill @@ -1,9 +1,11 @@ +package build.project + import $ivy.`com.goyeau::mill-scalafix::0.3.1` import $ivy.`io.github.alexarchambault.mill::mill-native-image::0.1.26` -import $file.deps, +import $file.project.deps, deps.{Deps, Docker, alpineVersion, buildCsVersion, buildCsM1Version, libsodiumVersion} -import $file.utils, utils.isArmArchitecture +import $file.project.utils, utils.isArmArchitecture import com.goyeau.mill.scalafix.ScalafixModule import de.tobiasroeser.mill.vcs.version.VcsVersion diff --git a/project/utils.sc b/project/utils.mill similarity index 85% rename from project/utils.sc rename to project/utils.mill index bedd500dda..ab6beaca16 100644 --- a/project/utils.sc +++ b/project/utils.mill @@ -1,3 +1,5 @@ +package build.project + import java.util.Locale lazy val isArmArchitecture: Boolean = diff --git a/project/website.sc b/project/website.mill similarity index 95% rename from project/website.sc rename to project/website.mill index 9bffdec43b..5cbf883fa1 100644 --- a/project/website.sc +++ b/project/website.mill @@ -1,4 +1,6 @@ -import $file.deps, deps.Scala +package build.project + +import $file.project.deps, deps.Scala private def lastTableLine(path: os.Path, colCount: Int): Seq[String] = { val content = os.read(path)