Skip to content

Commit

Permalink
Merge pull request #4 from tgodzik/update-versions
Browse files Browse the repository at this point in the history
chore: Update versions
  • Loading branch information
tgodzik authored Sep 5, 2024
2 parents cf59ced + c7963ad commit aee952d
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ jobs:
fail-fast: false
matrix:
OS: ["ubuntu-latest", "windows-latest", "macos-latest"]
SCALA_VERSION: ["3.1.0"]
SCALA_VERSION: ["3.3.3"]
include:
- OS: "ubuntu-latest"
SCALA_VERSION: "2.12.15"
SCALA_VERSION: "2.12.20"
- OS: "ubuntu-latest"
SCALA_VERSION: "2.13.7"
SCALA_VERSION: "2.13.14"
steps:
- uses: actions/checkout@v3
with:
Expand Down Expand Up @@ -51,8 +51,8 @@ jobs:
- uses: coursier/[email protected]
- uses: coursier/[email protected]
with:
jvm: 8
apps: scalafmt:3.1.1
jvm: 17
apps: scalafmt:3.8.3
- run: scalafmt --check

publish:
Expand Down
2 changes: 1 addition & 1 deletion .mill-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.9.10
0.11.12
16 changes: 8 additions & 8 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import mill.scalalib._

import scala.concurrent.duration.{Duration, DurationInt}

def scala3 = "3.1.0"
def scala213 = "2.13.7"
def scala212 = "2.12.15"
def scala3 = "3.3.3"
def scala213 = "2.13.14"
def scala212 = "2.12.20"
def scalaVersions = Seq(scala3, scala213, scala212)

object library extends Cross[Library](scalaVersions: _*)
object library extends Cross[Library](scalaVersions)

def tmpDirBase =
if (System.getenv("CI") == null)
Expand All @@ -24,15 +24,15 @@ def tmpDirBase =
PathRef(os.home / ".test-data")
}

class Library(val crossScalaVersion: String) extends CrossScalaModule with LibDaemonPublish {
trait Library extends CrossScalaModule with LibDaemonPublish {
def artifactName = "libdaemon"
def javacOptions = super.javacOptions() ++ Seq(
"--release",
"16"
)
object test extends Tests {
object test extends ScalaTests {
def ivyDeps = super.ivyDeps() ++ Seq(
ivy"org.scalameta::munit:0.7.29",
ivy"org.scalameta::munit:1.0.1",
ivy"com.eed3si9n.expecty::expecty:0.15.4",
ivy"com.lihaoyi::os-lib:0.7.8"
)
Expand All @@ -59,7 +59,7 @@ def publishSonatype(tasks: mill.main.Tasks[PublishModule.PublishData]) =
val timeout = 10.minutes
val credentials = sys.env("SONATYPE_USERNAME") + ":" + sys.env("SONATYPE_PASSWORD")
val pgpPassword = sys.env("PGP_PASSPHRASE")
val data = define.Task.sequence(tasks.value)()
val data = T.sequence(tasks.value)()

doPublishSonatype(
credentials = credentials,
Expand Down

0 comments on commit aee952d

Please sign in to comment.