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

W-14661042 - Java21 support related changes

Author: looseale

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

Jenkinsfile

@@ -29,7 +29,7 @@ pipeline {
         BUILD_NUMBER = "${env.BUILD_NUMBER}"
         BRANCH_NAME = "${env.BRANCH_NAME}"
         NPM_TOKEN = credentials('npm-mulesoft')
-        CURRENT_VERSION = sh(script:"cat dependencies.properties | grep \"version\" | cut -d '=' -f 2", returnStdout: true)
+        CURRENT_VERSION = sh(script: "cat dependencies.properties | grep \"version\" | cut -d '=' -f 2", returnStdout: true)
     }
     stages {
         stage('Test') {
@@ -57,7 +57,9 @@ pipeline {
         }
         stage('Publish') {
             when {
-                branch 'master'
+                anyOf {
+                    branch 'master'
+                }
             }
             steps {
                 wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'XTerm']) {

build.sbt

@@ -1,9 +1,9 @@
 import sbtcrossproject.CrossPlugin.autoImport.crossProject
 import sbtsonar.SonarPlugin.autoImport.sonarProperties
 
-ThisBuild / version := getVersion(2, 0)
+ThisBuild / version := getVersion(2, 1)
 ThisBuild / scalacOptions ++= Seq("-feature")
-ThisBuild / scalaVersion := "2.12.15"
+ThisBuild / scalaVersion := "2.12.20"
 
 lazy val common = crossProject(JSPlatform, JVMPlatform)
   .in(file("."))
@@ -20,7 +20,8 @@ lazy val common = crossProject(JSPlatform, JVMPlatform)
   )
   .jvmSettings(libraryDependencies += "org.scala-js" %% "scalajs-stubs" % "1.1.0" % "provided")
   .jsSettings(
-    scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.CommonJSModule) }
+      libraryDependencies += "org.scala-js" %%% "scalajs-java-securerandom" % "1.0.0",
+      scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.CommonJSModule) }
   )
   .settings(AutomaticModuleName.settings("org.mulesoft.common"))
 

js/src/main/scala/org/mulesoft/common/io/JsBaseFile.scala

@@ -1,14 +1,16 @@
 package org.mulesoft.common.io
 
 import java.io.IOException
-
 import org.mulesoft.common.js.SysError
 
-import scala.concurrent.Promise
+import scala.concurrent.{ExecutionContext, Promise}
 /**
   * Base File for JS implementation
   */
 private[io] abstract class JsBaseFile(val fileSystem: JsServerFileSystem, val path: String) extends File {
+
+  override val global: ExecutionContext = scala.scalajs.concurrent.JSExecutionContext.queue
+
   private val prefixLength = fileSystem.prefixLength(path)
 
   override def parent: String = {

js/src/test/scala/org/mulesoft/common/io/JsAsyncIoTest.scala

@@ -1,8 +1,13 @@
 package org.mulesoft.common.io
 
+import scala.concurrent.ExecutionContext
+
 /**
   * IO Tests
   */
 class JsAsyncIoTest extends IoAsyncTest {
+
+  override implicit val executionContext: ExecutionContext = scala.scalajs.concurrent.JSExecutionContext.queue
+
   def fs: FileSystem = Fs
 }

jvm/src/main/scala/org/mulesoft/common/io/JvmAsyncFile.scala

@@ -6,7 +6,7 @@ import scala.concurrent.{ExecutionContext, Future}
   * Implementation of a AsyncFile for the JVM
   * * @todo better handling of errors, Real async mode
   */
-protected class JvmAsyncFile(private val syncFile: JvmSyncFile) extends AsyncFile {
+protected class JvmAsyncFile(private val syncFile: JvmSyncFile) extends AsyncFile with JvmBaseFile {
 
   val path: String           = syncFile.path
   val fileSystem: FileSystem = syncFile.fileSystem

jvm/src/main/scala/org/mulesoft/common/io/JvmBaseFile.scala

@@ -0,0 +1,9 @@
+package org.mulesoft.common.io
+
+import scala.concurrent.ExecutionContext
+
+trait JvmBaseFile extends File {
+
+  override val global: ExecutionContext = scala.concurrent.ExecutionContext.Implicits.global
+
+}

jvm/src/main/scala/org/mulesoft/common/io/JvmSyncFile.scala

@@ -7,7 +7,7 @@ import scala.concurrent.ExecutionContext
 /**
   * Implementation of a SyncFile for the JVM
   */
-protected class JvmSyncFile(val fileSystem: FileSystem, val path: String) extends SyncFile {
+protected class JvmSyncFile(val fileSystem: FileSystem, val path: String) extends SyncFile with JvmBaseFile {
 
   private val file = new JFile(path)
 

jvm/src/test/scala/org/mulesoft/common/io/JvmAsyncIoTest.scala

@@ -1,9 +1,14 @@
 package org.mulesoft.common.io
 
+import scala.concurrent.ExecutionContext
+
 /**
   * IO Tests
   */
 class JvmAsyncIoTest extends IoAsyncTest {
+
+  override implicit val executionContext: ExecutionContext = ExecutionContext.Implicits.global
+
   def fs: FileSystem = Fs
 
 }

project/build.properties

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