Skip to content
Open
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
8 changes: 4 additions & 4 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
JDK_JAVA_OPTIONS: -XX:+PrintCommandLineFlags -Xss10M # JDK_JAVA_OPTIONS is _the_ env. variable to use for modern Java
JVM_OPTS: -XX:+PrintCommandLineFlags -Xss10M # for Java 8 only (sadly, it is not modern enough for JDK_JAVA_OPTIONS)
scala_212_version: "2.12.20"
scala_213_version: "2.13.16"
scala_213_version: "2.13.17"
scala_3_version: "3.3.6"
SonatypeUrl: "https://finos.sonatype.app/platform/"
SonatypeAppId: morphir-jvm
Expand All @@ -38,7 +38,7 @@ jobs:
fail-fast: false
matrix:
java: ["11", "17"]
scala: ["2.12.20", "2.13.16", "3.3.6"]
scala: ["2.12.20", "2.13.17", "3.3.6"]
node-version: ["20.x"]
steps:
- name: Checkout current branch
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
fail-fast: false
matrix:
java: ["17"] # Note there is no need ro actually run this for multiple JVM versions for JS
scala: ["2.12.20", "2.13.16", "3.3.6"]
scala: ["2.12.20", "2.13.17", "3.3.6"]
steps:
- name: Checkout current branch
uses: actions/checkout@v4
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:
fail-fast: false
matrix:
java: ["11"] # Note there is no need ro actually run this for multiple JVM versions for native
scala: ["2.12.20", "2.13.16", "3.3.6"]
scala: ["2.12.20", "2.13.17", "3.3.6"]
steps:
- name: Checkout current branch
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions mill-build/src/millbuild/deps.scala
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ object Deps {
}

case object slf4j {
val `slf4j-api` = ivy"org.slf4j:slf4j-api:${Versions.slf4j}"
val `slf4j-api` = ivy"org.slf4j:slf4j-api:${Versions.slf4j}"
val `slf4j-simple` = ivy"org.slf4j:slf4j-simple:${Versions.slf4j}"
}

Expand Down Expand Up @@ -283,7 +283,7 @@ object ScalaVersions {
import DevMode._
val all = if (devMode) Seq(scala3x) else Seq(scala213, scala3x)
def scala212 = "2.12.20"
def scala213 = "2.13.16"
def scala213 = "2.13.17"
def scala3x = "3.3.6"

def scalaJSVersion = "1.17.0"
Expand Down
2 changes: 1 addition & 1 deletion mill-build/src/millbuild/settings/ScalaSettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ object ScalaSettings {
implicit val rw: upickle.default.ReadWriter[ScalaSettings] = upickle.default.macroRW

val defaultScala212Version = "2.12.20"
val defaultScala213Version = "2.13.16"
val defaultScala213Version = "2.13.17"
val defaultScala3xVersion = "3.3.6"
val defaultCrossScalaVersions: List[String] =
if (devMode) List(defaultScala3xVersion)
Expand Down
Loading