Skip to content

Commit

Permalink
[WIP] Adjust to Mill 0.12.x syntax
Browse files Browse the repository at this point in the history
  • Loading branch information
Gedochao committed Oct 25, 2024
1 parent 01c88ad commit 3ac9746
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 4 deletions.
2 changes: 2 additions & 0 deletions build.sc → build.mill
Original file line number Diff line number Diff line change
@@ -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`
Expand Down
2 changes: 2 additions & 0 deletions project/deps.sc → project/deps.mill
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
package build.project

import Deps.Versions
import mill._
import scalalib._
Expand Down
1 change: 1 addition & 0 deletions project/package.mill
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package build.project
4 changes: 3 additions & 1 deletion project/publish.sc → project/publish.mill
Original file line number Diff line number Diff line change
@@ -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._
Expand Down
6 changes: 4 additions & 2 deletions project/settings.sc → project/settings.mill
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions project/utils.sc → project/utils.mill
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
package build.project

import java.util.Locale

lazy val isArmArchitecture: Boolean =
Expand Down
4 changes: 3 additions & 1 deletion project/website.sc → project/website.mill
Original file line number Diff line number Diff line change
@@ -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)
Expand Down

0 comments on commit 3ac9746

Please sign in to comment.