Merge pull request #81 from aml-org/java21-2024

W-14661042 - Java21 support related changes

Dockerfile

@@ -1 +1 @@
-FROM ghcr.io/aml-org/amf-ci-tools-base-image:1.3.4
+FROM ghcr.io/aml-org/amf-ci-tools-base-image:1.4.0

build.sbt

@@ -1,14 +1,17 @@
 import sbt.Keys.{libraryDependencies, resolvers}
 import sbtcrossproject.CrossPlugin.autoImport.crossProject
 
-ThisBuild / version := getVersion(2, 0)
-ThisBuild / scalaVersion := "2.12.15"
+ThisBuild / version := getVersion(2, 1)
+ThisBuild / scalaVersion := "2.12.20"
+
+val scalaCommonVersion     = "2.1.102"
+val scalaCommonTestVersion = "0.2.15"
 
 val settings = Common.settings ++ Common.publish ++ Seq(
     organization := "org.mule.syaml",
     name := "syaml",
     libraryDependencies ++= Seq(
-        "org.mule.common" %%% "scala-common-test" % "0.1.13" % Test
+        "org.mule.common" %%% "scala-common-test" % scalaCommonTestVersion % Test
     ),
     resolvers ++= List(Common.releases, Common.snapshots, Resolver.mavenLocal),
     credentials ++= Common.credentials()
@@ -20,8 +23,6 @@ lazy val workspaceDirectory: File =
     case _       => Path.userHome / "mulesoft"
   }
 
-val scalaCommonVersion = "2.0.99"
-
 lazy val scalaCommonJVMRef = ProjectRef(workspaceDirectory / "scala-common", "commonJVM")
 lazy val scalaCommonJSRef  = ProjectRef(workspaceDirectory / "scala-common", "commonJS")
 lazy val scalaCommonLibJVM = "org.mule.common" %% "scala-common" % scalaCommonVersion

project/build.properties

@@ -1 +1 @@
-sbt.version=1.7.3
+sbt.version=1.10.4

project/plugins.sbt

@@ -1,5 +1,5 @@
-addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0")
-addSbtPlugin("org.scala-js"       % "sbt-scalajs"              % "1.6.0")
-addSbtPlugin("org.scoverage"      % "sbt-scoverage"            % "2.0.4")
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
+addSbtPlugin("org.scala-js"       % "sbt-scalajs"              % "1.17.0")
+addSbtPlugin("org.scoverage"      % "sbt-scoverage"            % "2.2.2")
 addSbtPlugin("com.eed3si9n"       % "sbt-sriracha"             % "0.1.0")
 addSbtPlugin("com.sonar-scala"    % "sbt-sonar"                % "2.3.0")