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

Add Mill 0.12.x support #109

Merged
merged 2 commits into from
Oct 28, 2024
Merged

Add Mill 0.12.x support #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1540879
Update Mill to 0.12.0
alexarchambault Oct 28, 2024
07596eb
Add Mill 0.12.x support
alexarchambault Oct 28, 2024
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 .mill-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.10.15
0.12.0
13 changes: 7 additions & 6 deletions build.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.4.0`

import de.tobiasroeser.mill.vcs.version._
import mill._, scalalib._, publish._
import mill.scalalib.api.Util.scalaNativeBinaryVersion
import mill.scalalib.api.ZincWorkerUtil.scalaNativeBinaryVersion

val millVersions = Seq("0.10.12", "0.11.0") // scala-steward:off
val millVersions = Seq("0.10.12", "0.11.0", "0.12.0") // scala-steward:off
val millBinaryVersions = millVersions.map(millBinaryVersion)

def millBinaryVersion(millVersion: String) = scalaNativeBinaryVersion(millVersion)
Expand Down Expand Up @@ -50,10 +50,9 @@ object Scala {
def version = "2.13.12"
}

object plugin extends Cross[PluginModule](millBinaryVersions: _*)
class PluginModule(millBinaryVersion: String)
extends ScalaModule
with MillNativeImagePublishModule {
object plugin extends Cross[PluginModule](millBinaryVersions)
trait PluginModule extends Cross.Module[String] with ScalaModule with MillNativeImagePublishModule {
def millBinaryVersion: String = crossValue
def artifactName = s"mill-native-image_mill$millBinaryVersion"
def millSourcePath = super.millSourcePath / os.up
def scalaVersion = Scala.version
Expand Down Expand Up @@ -118,6 +117,8 @@ def publishSonatype(tasks: mill.main.Tasks[PublishModule.PublishData]) =
readTimeout = timeout.toMillis.toInt,
connectTimeout = timeout.toMillis.toInt,
log = log,
workspace = T.workspace,
env = sys.env,
awaitTimeout = timeout.toMillis.toInt,
stagingRelease = isRelease,
)
Expand Down
2 changes: 1 addition & 1 deletion example/.mill-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.10.15
0.12.0