Skip to content

Commit

Permalink
Bump Scala to 2.13.15
Browse files Browse the repository at this point in the history
  • Loading branch information
Gedochao committed Nov 6, 2024
1 parent 27c080f commit 255444d
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/scripts/build-linux-aarch64-from-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ apt-get install -q -y build-essential libz-dev zlib1g-dev git python3-pip curl z

export PATH="$(pwd)/utils:$PATH"

eval "$(cs java --env --jvm 11 --jvm-index https://github.com/coursier/jvm-index/raw/master/index.json)"
eval "$(cs java --env --jvm temurin:17 --jvm-index https://github.com/coursier/jvm-index/raw/master/index.json)"

git config --global --add safe.directory "$(pwd)"

Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/test-linux-aarch64-from-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ apt-get install -q -y build-essential libz-dev zlib1g-dev git python3-pip curl

export PATH="$(pwd)/utils:$PATH"

eval "$(cs java --env --jvm 11 --jvm-index https://github.com/coursier/jvm-index/raw/master/index.json)"
eval "$(cs java --env --jvm temurin:17 --jvm-index https://github.com/coursier/jvm-index/raw/master/index.json)"

git config --global --add safe.directory "$(pwd)"

Expand Down
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version = "3.8.3"
runner.dialect = scala212
runner.dialect = scala213

align.preset = more
maxColumn = 100
Expand Down
6 changes: 3 additions & 3 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ import mill.scalalib._

import scala.util.Properties

def scalaDefaultVersion = "2.12.20"
def scalaDefaultVersion = "2.13.15"
def coursierVersion = "2.1.15"
def graalVmVersion = "22.1.0"
def utestVersion = "0.8.4"

object `cs-m1` extends JavaModule with NativeImage {
def ivyDeps = super.ivyDeps() ++ Seq(
ivy"io.get-coursier:coursier-cli_2.12:$coursierVersion"
ivy"io.get-coursier:coursier-cli_2.13:$coursierVersion"
)

def nativeImageGraalVmJvmId = T {
Expand Down Expand Up @@ -53,7 +53,7 @@ object `cs-m1` extends JavaModule with NativeImage {
object `cs-m1-tests` extends ScalaModule {
def scalaVersion = scalaDefaultVersion
def ivyDeps = super.ivyDeps() ++ Seq(
ivy"io.get-coursier:cli-tests_2.12:$coursierVersion"
ivy"io.get-coursier:cli-tests_2.13:$coursierVersion"
)
object test extends Tests {
def ivyDeps = super.ivyDeps() ++ Seq(
Expand Down

0 comments on commit 255444d

Please sign in to comment.