Skip to content

Commit

Permalink
Support Mill 0.11.0-M11 (#116)
Browse files Browse the repository at this point in the history
Removed some unnecessary token readers, hence the binary
incompatibility.

Pull request: #116
  • Loading branch information
lefou authored Jun 5, 2023
1 parent e006111 commit 979c3eb
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 15 deletions.
12 changes: 8 additions & 4 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import mill.scalalib.publish._
import de.tobiasroeser.mill.integrationtest._
import de.tobiasroeser.mill.vcs.version._
import com.github.lolgab.mill.mima.Mima
import scala.util.Try
import scala.util.{Properties, Try}

val baseDir = build.millSourcePath

Expand All @@ -38,8 +38,8 @@ class Deps_latest(override val millVersion: String) extends Deps {
override def mimaPreviousVersions = Seq()
}
object Deps_0_11 extends Deps {
override def millPlatform = "0.11.0-M10" // only valid for exact milestones!
override def millVersion = "0.11.0-M10"
override def millPlatform = "0.11.0-M11" // only valid for exact milestones!
override def millVersion = "0.11.0-M11"
override def testWithMill = Seq(millVersion)
override def mimaPreviousVersions = super.mimaPreviousVersions.reverse.takeWhile(_ != "0.3.0").reverse
}
Expand Down Expand Up @@ -111,7 +111,11 @@ trait BaseModule extends CrossScalaModule with PublishModule with ScoverageModul
.map(p => PathRef(millSourcePath / s"src-${p}"))
}

override def javacOptions = Seq("-source", "1.8", "-target", "1.8", "-encoding", "UTF-8", "-deprecation")
override def javacOptions = {
(if (Properties.isJavaAtLeast(9)) Seq("--release", "8") else Seq("-source", "1.8", "-target", "1.8")) ++
Seq("-encoding", "UTF-8", "-deprecation")
}

override def scalacOptions = Seq("-target:jvm-1.8", "-encoding", "UTF-8", "-deprecation")

def pomSettings = T {
Expand Down

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion core/src/de/tobiasroeser/mill/vcs/version/VcsVersion.scala
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,6 @@ trait VcsVersion extends Module {

}

object VcsVersion extends ExternalModule with VcsVersion with VcsVersionPlatformCompanion {
object VcsVersion extends ExternalModule with VcsVersion {
lazy val millDiscover = Discover[this.type]
}

0 comments on commit 979c3eb

Please sign in to comment.