diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0976fb2..95e836a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.16] - java: [temurin@17, temurin@21] + java: [temurin@17, temurin@21, temurin@25] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -48,6 +48,14 @@ jobs: java-version: 21 cache: sbt + - name: Setup Java (temurin@25) + if: matrix.java == 'temurin@25' + uses: actions/setup-java@v5 + with: + distribution: temurin + java-version: 25 + cache: sbt + - name: Setup sbt uses: sbt/setup-sbt@v1 @@ -98,6 +106,14 @@ jobs: java-version: 21 cache: sbt + - name: Setup Java (temurin@25) + if: matrix.java == 'temurin@25' + uses: actions/setup-java@v5 + with: + distribution: temurin + java-version: 25 + cache: sbt + - name: Setup sbt uses: sbt/setup-sbt@v1 diff --git a/build.sbt b/build.sbt index 3ff0827..4ecf9b0 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ inThisBuild(Seq( organization := "com.avsystem.scex", scalaVersion := "2.13.16", githubWorkflowTargetTags ++= Seq("v*"), - githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17"), JavaSpec.temurin("21")), + githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17"), JavaSpec.temurin("21"), JavaSpec.temurin("25")), githubWorkflowPublishTargetBranches := Seq(RefPredicate.StartsWith(Ref.Tag("v"))), githubWorkflowPublish := Seq(WorkflowStep.Sbt( @@ -84,7 +84,9 @@ lazy val subprojectSettings = Seq( Test / javaOptions += "-Xmx1G", Test / outputStrategy := Some(LoggedOutput(new Logger { def log(level: Level.Value, message: => String): Unit = () + def success(message: => String): Unit = () + def trace(t: => Throwable): Unit = () })), libraryDependencies ++= Seq( diff --git a/scex-core/src/test/scala/com/avsystem/scex/compiler/CompilationTest.scala b/scex-core/src/test/scala/com/avsystem/scex/compiler/CompilationTest.scala index 63c7633..bd48744 100644 --- a/scex-core/src/test/scala/com/avsystem/scex/compiler/CompilationTest.scala +++ b/scex-core/src/test/scala/com/avsystem/scex/compiler/CompilationTest.scala @@ -11,13 +11,8 @@ import com.avsystem.scex.validation.SymbolValidator.MemberAccessSpec import com.avsystem.scex.validation.{SymbolValidator, SyntaxValidator} import org.scalatest.{BeforeAndAfterAll, Suite} -import scala.reflect.io.AbstractFile import scala.util.control.NonFatal -/** - * Created: 18-11-2013 - * Author: ghik - */ trait CompilationTest extends BeforeAndAfterAll { this: Suite => val compiler = createCompiler @@ -28,11 +23,8 @@ trait CompilationTest extends BeforeAndAfterAll { this: Suite => new DefaultJavaScexCompiler(settings) } - override protected def beforeAll() = { - val classfileDir = AbstractFile.getDirectory(compiler.settings.classfileDirectory.value) - if (classfileDir != null) { - classfileDir.delete() - } + override protected def beforeAll(): Unit = { + compiler.settings.resolvedClassfileDir.foreach(_.delete()) } def catchAndPrint(code: => Any): Unit =