Skip to content

Commit

Permalink
Merge pull request #4 from lewisjkl/update-versions
Browse files Browse the repository at this point in the history
update versions, improve JDK version compatibility
  • Loading branch information
lewisjkl authored Dec 17, 2024
2 parents 65fc8ca + 91eb89f commit 8854bc8
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .mill-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.11.1
0.11.13
19 changes: 13 additions & 6 deletions build.sc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import $file.plugins.MDocModule
import MDocModule.{MDocModule => MDoc}
import $ivy.`com.lihaoyi::mill-contrib-bloop:`
import $ivy.`io.chris-kipp::mill-ci-release::0.1.9`
import $ivy.`io.chris-kipp::mill-ci-release::0.1.10`
import $ivy.`io.github.davidgregory084::mill-tpolecat::0.3.5`
import $ivy.`de.tototec::de.tobiasroeser.mill.integrationtest::0.7.1`
import de.tobiasroeser.mill.integrationtest._
Expand All @@ -25,7 +25,7 @@ trait BaseScalaModule
with BaseModule
with ScalafmtModule
with CiReleaseModule {
def scalaVersion = T.input("2.13.8")
def scalaVersion = T.input("2.13.15")

def segmentsName = millModuleSegments.parts.mkString("-")

Expand All @@ -42,13 +42,20 @@ trait BaseScalaModule
developers =
Seq(Developer(id = "lewisjkl", name = "Jeff Lewis", url = "lewisjkl.com"))
)

// Copied from lefou's plugins to keep compatible with older java versions
override def javacOptions = {
(if (scala.util.Properties.isJavaAtLeast(9)) Seq("--release", "8")
else Seq("-source", "1.8", "-target", "1.8")) ++
Seq("-encoding", "UTF-8", "-deprecation")
}
}

object Dependencies {
val osLib = ivy"com.lihaoyi::os-lib:0.8.1"
val osLib = ivy"com.lihaoyi::os-lib:0.11.3"
val mill = Agg(
ivy"com.lihaoyi::mill-main:0.11.1",
ivy"com.lihaoyi::mill-main-api:0.11.1"
ivy"com.lihaoyi::mill-main:0.11.13",
ivy"com.lihaoyi::mill-main-api:0.11.13"
)
}

Expand All @@ -66,7 +73,7 @@ object `mill-plugin` extends BaseScalaModule {
s"_mill0.11_${artifactScalaVersion()}"

object itest extends MillIntegrationTestModule {
def millTestVersion = "0.11.1"
def millTestVersion = "0.11.13"
def pluginsUnderTest = Seq(`mill-plugin`)
}
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/MDocModule.sc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import os.Path
// adapted from https://github.com/atooni/mill-mdoc
trait MDocModule extends ScalaModule {

def scalaMdocVersion: T[String] = T("2.3.7")
def scalaMdocVersion: T[String] = T("2.6.2")

def scalaMdocDep: T[Dep] = T(ivy"org.scalameta::mdoc:${scalaMdocVersion()}")

Expand Down

0 comments on commit 8854bc8

Please sign in to comment.