From c7963ada6404625f5aaad354015da51c13e8a487 Mon Sep 17 00:00:00 2001 From: Tomasz Godzik Date: Thu, 5 Sep 2024 18:34:58 +0200 Subject: [PATCH] chore: Update versions --- .github/workflows/ci.yml | 10 +++++----- .mill-version | 2 +- build.sc | 16 ++++++++-------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0bd7a46..ebc7ebd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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: @@ -51,8 +51,8 @@ jobs: - uses: coursier/cache-action@v6.4 - uses: coursier/setup-action@v1.3.0 with: - jvm: 8 - apps: scalafmt:3.1.1 + jvm: 17 + apps: scalafmt:3.8.3 - run: scalafmt --check publish: diff --git a/.mill-version b/.mill-version index 56f3151..bd0119f 100644 --- a/.mill-version +++ b/.mill-version @@ -1 +1 @@ -0.9.10 +0.11.12 diff --git a/build.sc b/build.sc index 5066415..4743b40 100644 --- a/build.sc +++ b/build.sc @@ -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) @@ -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" ) @@ -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,