diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 01badc0..327850c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: matrix: os: [ubuntu-24.04, windows-latest, macos-13, macos-latest] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v5 with: fetch-depth: 0 submodules: true @@ -57,7 +57,7 @@ jobs: - format runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v5 with: fetch-depth: 0 submodules: true @@ -89,7 +89,7 @@ jobs: - format runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v5 with: fetch-depth: 0 submodules: true @@ -118,7 +118,7 @@ jobs: timeout-minutes: 15 runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v5 with: fetch-depth: 0 submodules: true @@ -133,7 +133,7 @@ jobs: timeout-minutes: 15 runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: fetch-depth: 0 submodules: true @@ -151,7 +151,7 @@ jobs: if: github.event_name == 'push' runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v5 with: fetch-depth: 0 submodules: true diff --git a/.mill-version b/.mill-version index 6d7de6e..ee90284 100644 --- a/.mill-version +++ b/.mill-version @@ -1 +1 @@ -1.0.2 +1.0.4 diff --git a/build.mill.scala b/build.mill.scala index 93871e4..493a905 100644 --- a/build.mill.scala +++ b/build.mill.scala @@ -1,6 +1,6 @@ //| mvnDeps: -//| - io.github.alexarchambault.mill::mill-native-image::0.2.0 -//| - io.github.alexarchambault.mill::mill-native-image-upload:0.2.0 +//| - io.github.alexarchambault.mill::mill-native-image::0.2.2 +//| - io.github.alexarchambault.mill::mill-native-image-upload:0.2.2 //| - com.goyeau::mill-scalafix::0.6.0 //| - com.lumidion::sonatype-central-client-requests:0.6.0 package build @@ -25,11 +25,11 @@ import mill.util.{Tasks, VcsVersion} object Versions { def scala = "3.3.6" - def scalaCli = "1.8.4" + def scalaCli = "1.8.5" def graalVmVersion = "22.3.1" def coursier = "2.1.24" - def osLib = "0.11.4" - def uTest = "0.8.9" + def osLib = "0.11.5" + def uTest = "0.9.1" def jline = "3.25.0" def ubuntu = "24.04" } @@ -89,12 +89,12 @@ trait JavaClassNameModule extends ScalaModule with ScalafixModule { override def allMvnDeps: T[Seq[Dep]] = Task { super.allMvnDeps() - .map(_.exclude(jlineDeps.map(d => d.organization -> d.name): _*)) ++ jlineDeps + .map(_.exclude(jlineDeps.map(d => d.organization -> d.name)*)) ++ jlineDeps } override def mvnDeps: T[Seq[Dep]] = super.mvnDeps().map(_.exclude(jlineDeps - .map(d => d.organization -> d.name): _*)) ++ jlineDeps + .map(d => d.organization -> d.name)*)) ++ jlineDeps } object `scala3-graal-processor` extends JavaClassNameModule { diff --git a/mill b/mill index 093a90c..8dc441b 100755 --- a/mill +++ b/mill @@ -39,7 +39,7 @@ if [ "$1" = "--setup-completions" ] ; then fi if [ -z "${DEFAULT_MILL_VERSION}" ] ; then - DEFAULT_MILL_VERSION=1.0.2 + DEFAULT_MILL_VERSION=1.0.4 fi diff --git a/mill.bat b/mill.bat index 457794f..37d5df2 100644 --- a/mill.bat +++ b/mill.bat @@ -34,7 +34,7 @@ rem setlocal seems to be unavailable on Windows 95/98/ME rem but I don't think we need to support them in 2019 setlocal enabledelayedexpansion -if [!DEFAULT_MILL_VERSION!]==[] ( set "DEFAULT_MILL_VERSION=1.0.2" ) +if [!DEFAULT_MILL_VERSION!]==[] ( set "DEFAULT_MILL_VERSION=1.0.4" ) if [!MILL_GITHUB_RELEASE_CDN!]==[] ( set "MILL_GITHUB_RELEASE_CDN=" )