diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a033843..f35eb1c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: build: strategy: matrix: - maven: [ '3.8.9', '3.9.16' ] + maven: [ '3.9.16', '3.10.0' ] java: [ '17', '21', '25' ] os: [ 'ubuntu-latest', 'windows-latest' ] runs-on: ${{ matrix.os }} diff --git a/pom.xml b/pom.xml index 6107d7c..4e6c3de 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ under the License. UTF-8 UTF-8 - 3.9.16 + 3.10.0 3.16.0 4.0.0 2.1.0 diff --git a/src/it/test_skip_configured/validate.groovy b/src/it/test_skip_configured/validate.groovy index ec0b4e0..6383947 100644 --- a/src/it/test_skip_configured/validate.groovy +++ b/src/it/test_skip_configured/validate.groovy @@ -1,15 +1,17 @@ try { def logFile = new File(basedir, "build.log") - def lines = logFile.readLines() - assert lines.contains("[INFO] Skipping Scoverage execution as configured") - assert !lines.contains("Generating \"SCoverage\" report") + def logText = logFile.text + + assert logText.contains("[INFO] Skipping Scoverage execution as configured") + assert !logText.contains("Generating \"SCoverage\" report") // let's check main code is also not compiled - def scalaMainSourcesCompilerInfoIndex = lines.findIndexOf { it ==~ /.*:compile \(default-sbt-compile\).*/ } + 1 - def scalaMainSourcesCompilerInfo = lines.get(scalaMainSourcesCompilerInfoIndex) - def expectedInfo = "[INFO] Not compiling main sources" - assert scalaMainSourcesCompilerInfo.contains(expectedInfo) : "Expected '$expectedInfo' but got: '$scalaMainSourcesCompilerInfo'" + def sbtCompileSection = logText.split("--- ").find { it.contains(":compile (default-sbt-compile)") } + assert sbtCompileSection != null : "Did not find scala:compile (default-sbt-compile) in build.log" + assert sbtCompileSection.contains("[INFO] Not compiling main sources") + + assert !new File(basedir, "target/classes").exists() return true