Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump coursier to 2.1.15 & Scala to 2.13.15 #112

Merged
merged 2 commits into from
Nov 6, 2024
Merged

Bump coursier to 2.1.15 & Scala to 2.13.15 #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27c080f
Bump `coursier` to 2.1.15
Gedochao Nov 6, 2024
255444d
Bump Scala to 2.13.15
Gedochao Nov 6, 2024
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
2 changes: 1 addition & 1 deletion .github/scripts/build-linux-aarch64-from-docker.sh
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
8 changes: 4 additions & 4 deletions build.sc
View file
Open in desktop
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 coursierVersion = "2.1.14"
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
Loading