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

Update mill-scalalib to 0.11.0-M10 #64

Merged
merged 2 commits into from
May 27, 2023
Merged
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
4 changes: 2 additions & 2 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import de.tobiasroeser.mill.vcs.version.VcsVersion
import io.kipp.mill.ci.release.CiReleaseModule
import io.kipp.mill.ci.release.SonatypeHost

val millVersions = Seq("0.10.12", "0.11.0-M8")
val millVersions = Seq("0.10.12", "0.11.0-M10")
val scala213 = "2.13.10"
val pluginName = "mill-ci-release"

Expand Down Expand Up @@ -53,7 +53,7 @@ class Plugin(millVersion: String)
ivy"com.lihaoyi::mill-scalalib:${millVersion}"
)
override def ivyDeps = super.ivyDeps() ++ Agg(
ivy"de.tototec::de.tobiasroeser.mill.vcs.version_mill${millBinaryVersion(millVersion)}::0.3.1"
ivy"de.tototec::de.tobiasroeser.mill.vcs.version_mill${millBinaryVersion(millVersion)}::0.3.1-8-37c08a"
)
override def scalacOptions = Seq("-Ywarn-unused", "-deprecation")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ package io.kipp.mill.ci.release

import mill.main.EvaluatorScopt

private[release] object Reader {
private[release] object Discover {
implicit def millScoptEvaluatorReads[A]: EvaluatorScopt[A] =
new EvaluatorScopt[A]()

def apply[T] = mill.define.Discover[T]
}
9 changes: 9 additions & 0 deletions plugin/src-mill0.10/io/kipp/mill/ci/release/Eval.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package io.kipp.mill.ci.release

import mill.eval.Evaluator

private[release] object Eval {

def evalOrThrow(ev: Evaluator) = Evaluator.evalOrThrow(ev)

}
5 changes: 5 additions & 0 deletions plugin/src-mill0.11/io/kipp/mill/ci/release/Discover.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package io.kipp.mill.ci.release

private[release] object Discover {
def apply[T] = mill.define.Discover[T]
}
9 changes: 9 additions & 0 deletions plugin/src-mill0.11/io/kipp/mill/ci/release/Eval.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package io.kipp.mill.ci.release

import mill.eval.Evaluator

private[release] object Eval {

def evalOrThrow(ev: Evaluator) = ev.evalOrThrow()

}
6 changes: 0 additions & 6 deletions plugin/src-mill0.11/io/kipp/mill/ci/release/Reader.scala

This file was deleted.

5 changes: 2 additions & 3 deletions plugin/src/io/kipp/mill/ci/release/CiReleaseModule.scala
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ object ReleaseModule extends ExternalModule {
val stagingReleases = uris.map(_._3).toSet

val allPomSettings = modules.map { m =>
Evaluator.evalOrThrow(ev)(m.pomSettings)
Eval.evalOrThrow(ev)(m.pomSettings)
}

def mustBeUniqueMsg[T](value: String, values: Set[T]): String = {
Expand Down Expand Up @@ -225,6 +225,5 @@ object ReleaseModule extends ExternalModule {
private def releaseModules(ev: Evaluator) =
ev.rootModule.millInternal.modules.collect { case m: CiReleaseModule => m }

import Reader._
lazy val millDiscover = mill.define.Discover[this.type]
lazy val millDiscover: mill.define.Discover[this.type] = Discover[this.type]
}