diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a55719f3..af26a7ba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,26 +16,26 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - scala: [2.13.6, 2.12.14, 2.11.12] - java: [adopt@1.11, adopt@1.8] + scala: [2.13.16, 2.12.20] + java: [8, 11, 17, 21] experimental: [false] - include: - - os: ubuntu-latest - scala: 2.13.6 - java: adopt@1.16 - experimental: true + runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v12 + - name: Setup JDK + uses: actions/setup-java@v4 with: + distribution: temurin java-version: ${{ matrix.java }} + - name: Setup sbt launcher + uses: sbt/setup-sbt@v1 + - name: Cache ivy2 uses: actions/cache@v1 with: @@ -55,11 +55,12 @@ jobs: key: ${{ runner.os }}-sbt-cache-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - name: Run tests - run: sbt clean coverage test coverageReport + run: sbt '++ ${{ matrix.scala }}' clean coverage test coverageReport + - name: Coverage Aggregate run: sbt coverageAggregate - name: Codecov uses: codecov/codecov-action@v1 with: - fail_ci_if_error: true + fail_ci_if_error: false diff --git a/build.sbt b/build.sbt index 669c0adc..7766e386 100644 --- a/build.sbt +++ b/build.sbt @@ -18,8 +18,8 @@ name := "sirius" version := "2.3.0" -scalaVersion := "2.13.6" -crossScalaVersions := Seq("2.11.12", "2.12.14", "2.13.6") // NOTE: keep sync'd with .travis.yml +scalaVersion := "2.13.16" +crossScalaVersions := Seq("2.12.20", "2.13.16") // NOTE: keep sync'd with .ci.yml organization := "com.comcast" @@ -95,11 +95,11 @@ publishTo := sonatypePublishToBundle.value pomIncludeRepository := { _ => false } -publishArtifact in Test := false +Test / publishArtifact := false -testOptions in Test += Tests.Argument("-oD") +Test / testOptions += Tests.Argument("-oD") -scoverage.ScoverageKeys.coverageMinimum := 75 +scoverage.ScoverageKeys.coverageMinimumStmtTotal := 75 scoverage.ScoverageKeys.coverageFailOnMinimum := true @@ -115,8 +115,8 @@ lazy val root = (project in file(".")) val binDir = packageDir / "bin" // Move artifact and dependencies into lib directory in test package - val compilePackageBin = (packageBin in Compile).value - val compileDependencyClasspath = (dependencyClasspath in Compile).value + val compilePackageBin = (Compile / packageBin).value + val compileDependencyClasspath = (Compile / dependencyClasspath).value val files = compilePackageBin +: (for (dep <- compileDependencyClasspath) yield dep.data) for (file <- files) { IO.copyFile(file, libDir / file.getName) diff --git a/project/build.properties b/project/build.properties index 67d27a1d..73df629a 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.3 +sbt.version=1.10.7 diff --git a/project/plugins.sbt b/project/plugins.sbt index b3577016..409e0d52 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.4") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.8.2") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8.1") -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1") \ No newline at end of file +//addSbtPlugin("com.github.sbt" % "sbteclipse-plugin" % "6.2.0") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.3.0") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.12.2") +addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1") \ No newline at end of file