Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-24.04, windows-latest, macos-13, macos-latest]
os: [ubuntu-24.04, windows-latest, macos-15-intel, macos-15]
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
with:
fetch-depth: 0
submodules: true
- uses: coursier/cache-action@v6
- uses: coursier/cache-action@v7
- uses: coursier/setup-action@v1
with:
jvm: temurin:17
Expand Down Expand Up @@ -57,11 +57,11 @@ jobs:
- format
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
with:
fetch-depth: 0
submodules: true
- uses: coursier/cache-action@v6
- uses: coursier/cache-action@v7
- uses: coursier/setup-action@v1
with:
jvm: temurin:17
Expand Down Expand Up @@ -89,11 +89,11 @@ jobs:
- format
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
with:
fetch-depth: 0
submodules: true
- uses: coursier/cache-action@v6
- uses: coursier/cache-action@v7
- uses: coursier/setup-action@v1
with:
jvm: temurin:17
Expand All @@ -118,11 +118,11 @@ jobs:
timeout-minutes: 15
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
with:
fetch-depth: 0
submodules: true
- uses: coursier/cache-action@v6
- uses: coursier/cache-action@v7
- uses: coursier/setup-action@v1
with:
jvm: temurin:17
Expand All @@ -133,7 +133,7 @@ jobs:
timeout-minutes: 15
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
with:
fetch-depth: 0
submodules: true
Expand All @@ -151,11 +151,11 @@ jobs:
if: github.event_name == 'push'
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
with:
fetch-depth: 0
submodules: true
- uses: coursier/cache-action@v6
- uses: coursier/cache-action@v7
- uses: coursier/setup-action@v1
with:
jvm: temurin:17
Expand Down
2 changes: 1 addition & 1 deletion .mill-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.4
1.0.6
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.9.9"
version = "3.10.2"

align.preset = more
maxColumn = 100
Expand Down
34 changes: 17 additions & 17 deletions build.mill.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//| mvnDeps:
//| - io.github.alexarchambault.mill::mill-native-image::0.2.2
//| - io.github.alexarchambault.mill::mill-native-image-upload:0.2.2
//| - io.github.alexarchambault.mill::mill-native-image::0.2.3
//| - io.github.alexarchambault.mill::mill-native-image-upload:0.2.3
//| - com.goyeau::mill-scalafix::0.6.0
//| - com.lumidion::sonatype-central-client-requests:0.6.0
package build
Expand All @@ -24,12 +24,12 @@ import mill.scalalib.publish.{Developer, License, PomSettings, VersionControl}
import mill.util.{Tasks, VcsVersion}

object Versions {
def scala = "3.3.6"
def scala = "3.3.7"
def scalaCli = "1.8.5"
def graalVmVersion = "22.3.1"
def coursier = "2.1.24"
def osLib = "0.11.5"
def uTest = "0.9.1"
def coursier = "2.1.25-M19"
def osLib = "0.11.6"
def uTest = "0.9.4"
def jline = "3.25.0"
def ubuntu = "24.04"
}
Expand Down Expand Up @@ -87,22 +87,22 @@ trait JavaClassNameModule extends ScalaModule with ScalafixModule {
)
)

protected def downgradeJline(deps: Seq[Dep]): Seq[Dep] =
deps.map(_.exclude(jlineDeps.map(d => d.organization -> d.name)*)) ++ jlineDeps

override def allMvnDeps: T[Seq[Dep]] = Task {
super.allMvnDeps()
.map(_.exclude(jlineDeps.map(d => d.organization -> d.name)*)) ++ jlineDeps
downgradeJline(super.allMvnDeps())
}

override def mvnDeps: T[Seq[Dep]] =
super.mvnDeps().map(_.exclude(jlineDeps
.map(d => d.organization -> d.name)*)) ++ jlineDeps
override def mvnDeps: T[Seq[Dep]] = downgradeJline(super.mvnDeps())
}

object `scala3-graal-processor` extends JavaClassNameModule {
override def mainClass: T[Option[String]] = Some("scala.cli.graal.CoursierCacheProcessor")

override def mvnDeps: T[Seq[Dep]] = jlineDeps ++ Seq(
mvn"org.virtuslab.scala-cli::scala3-graal:${Versions.scalaCli}"
)
override def mvnDeps: T[Seq[Dep]] = downgradeJline {
super.mvnDeps() ++ Seq(mvn"org.virtuslab.scala-cli::scala3-graal:${Versions.scalaCli}")
}
}

object `java-class-name` extends JavaClassNameModule with JavaMainClassNativeImage
Expand Down Expand Up @@ -130,9 +130,9 @@ object `java-class-name` extends JavaClassNameModule with JavaMainClassNativeIma
cp.split(File.pathSeparator).toSeq.map(p => mill.PathRef(os.Path(p)))
}

override def mvnDeps: T[Seq[Dep]] = super.mvnDeps() ++ jlineDeps ++ Seq(
mvn"org.scala-lang::scala3-compiler:${Versions.scala}"
)
override def mvnDeps: T[Seq[Dep]] = downgradeJline {
super.mvnDeps() ++ Seq(mvn"org.scala-lang::scala3-compiler:${Versions.scala}")
}

override def compileMvnDeps: T[Seq[Dep]] = super.compileMvnDeps() ++ Seq(
mvn"org.graalvm.nativeimage:svm:${Versions.graalVmVersion}"
Expand Down
Loading