From cd6fcf261228ba65f07b7897c33e2822629b2b60 Mon Sep 17 00:00:00 2001 From: "Spindler, Justin" Date: Mon, 13 Jan 2025 10:57:17 -0500 Subject: [PATCH 1/9] Bump sbt and plugins --- .github/workflows/ci.yml | 4 ++-- build.sbt | 14 +++++++------- project/build.properties | 2 +- project/plugins.sbt | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a55719f3..5dc27cbf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,12 +16,12 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - scala: [2.13.6, 2.12.14, 2.11.12] + scala: [2.13.15, 2.12.20, 2.11.12] java: [adopt@1.11, adopt@1.8] experimental: [false] include: - os: ubuntu-latest - scala: 2.13.6 + scala: 2.13.15 java: adopt@1.16 experimental: true runs-on: ${{ matrix.os }} diff --git a/build.sbt b/build.sbt index 669c0adc..45d55e3b 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.15" +crossScalaVersions := Seq("2.11.12", "2.12.20", "2.13.15") // 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..949ad14e 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.2.2") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.12.2") +addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1") \ No newline at end of file From 7362a3bdfab6e84a536af5b901f9ab811af76018 Mon Sep 17 00:00:00 2001 From: "Spindler, Justin" Date: Mon, 13 Jan 2025 11:29:00 -0500 Subject: [PATCH 2/9] disable CI failure on codecov error (temp) --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5dc27cbf..821151e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,4 +62,4 @@ jobs: - name: Codecov uses: codecov/codecov-action@v1 with: - fail_ci_if_error: true + fail_ci_if_error: false From 6e9a16d64b3ca59c003fc09c462630ef4717df57 Mon Sep 17 00:00:00 2001 From: "Spindler, Justin" Date: Mon, 13 Jan 2025 11:46:19 -0500 Subject: [PATCH 3/9] Switch to setup-java --- .github/workflows/ci.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 821151e9..7aad6c79 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.15, 2.12.20, 2.11.12] - java: [adopt@1.11, adopt@1.8] + java: [8, 11] experimental: [false] include: - os: ubuntu-latest @@ -27,15 +27,19 @@ jobs: 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: @@ -56,6 +60,7 @@ jobs: - name: Run tests run: sbt clean coverage test coverageReport + - name: Coverage Aggregate run: sbt coverageAggregate From d8e4b2b34f3e51a208e65bcb4870de82a5ec8cfd Mon Sep 17 00:00:00 2001 From: "Spindler, Justin" Date: Mon, 13 Jan 2025 12:54:09 -0500 Subject: [PATCH 4/9] Add JDK 17 and 21 --- .github/workflows/ci.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7aad6c79..2b75476c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,13 +17,9 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.15, 2.12.20, 2.11.12] - java: [8, 11] + java: [8, 11, 17, 21] experimental: [false] - include: - - os: ubuntu-latest - scala: 2.13.15 - java: adopt@1.16 - experimental: true + runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) From c5afd05ac0089034cc12fb100a3f6d300997d130 Mon Sep 17 00:00:00 2001 From: "Spindler, Justin" Date: Mon, 13 Jan 2025 12:58:18 -0500 Subject: [PATCH 5/9] Compile specific Scala versions --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2b75476c..77757909 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,7 +55,7 @@ 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 From ff8b295937cd9b8634ebc9d32315e91b742dddfd Mon Sep 17 00:00:00 2001 From: Jonathan Ryan Date: Mon, 13 Jan 2025 17:09:16 -0500 Subject: [PATCH 6/9] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 77757909..d9dc0d3a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,7 +55,7 @@ jobs: key: ${{ runner.os }}-sbt-cache-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - name: Run tests - run: sbt ++ ${{matrix.scala}} clean coverage test coverageReport + run: sbt '++ ${{ matrix.scala }}' clean coverage test coverageReport - name: Coverage Aggregate run: sbt coverageAggregate From 4f1d9472763188e266ce5b03946cd37698e0c8d7 Mon Sep 17 00:00:00 2001 From: "Spindler, Justin" Date: Mon, 13 Jan 2025 17:19:24 -0500 Subject: [PATCH 7/9] Downgrade scoverage to support 2.11 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 949ad14e..a722dcfb 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ //addSbtPlugin("com.github.sbt" % "sbteclipse-plugin" % "6.2.0") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.2") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.3") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.12.2") addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1") \ No newline at end of file From 5a3547e94f3ad2137e123a13a14e0d5412da0c2c Mon Sep 17 00:00:00 2001 From: "Spindler, Justin" Date: Mon, 13 Jan 2025 17:32:19 -0500 Subject: [PATCH 8/9] Nix Scala 2.11 --- .github/workflows/ci.yml | 2 +- build.sbt | 2 +- project/plugins.sbt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d9dc0d3a..ce258a91 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - scala: [2.13.15, 2.12.20, 2.11.12] + scala: [2.13.15, 2.12.20] java: [8, 11, 17, 21] experimental: [false] diff --git a/build.sbt b/build.sbt index 45d55e3b..fea73619 100644 --- a/build.sbt +++ b/build.sbt @@ -19,7 +19,7 @@ name := "sirius" version := "2.3.0" scalaVersion := "2.13.15" -crossScalaVersions := Seq("2.11.12", "2.12.20", "2.13.15") // NOTE: keep sync'd with .ci.yml +crossScalaVersions := Seq("2.12.20", "2.13.15") // NOTE: keep sync'd with .ci.yml organization := "com.comcast" diff --git a/project/plugins.sbt b/project/plugins.sbt index a722dcfb..409e0d52 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ //addSbtPlugin("com.github.sbt" % "sbteclipse-plugin" % "6.2.0") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.3") +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 From f4150dd66ea5479e96703c45824ce44ae2d034f8 Mon Sep 17 00:00:00 2001 From: "Spindler, Justin" Date: Mon, 13 Jan 2025 17:35:02 -0500 Subject: [PATCH 9/9] Bump Scala 2.13 version again --- .github/workflows/ci.yml | 2 +- build.sbt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ce258a91..af26a7ba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - scala: [2.13.15, 2.12.20] + scala: [2.13.16, 2.12.20] java: [8, 11, 17, 21] experimental: [false] diff --git a/build.sbt b/build.sbt index fea73619..7766e386 100644 --- a/build.sbt +++ b/build.sbt @@ -18,8 +18,8 @@ name := "sirius" version := "2.3.0" -scalaVersion := "2.13.15" -crossScalaVersions := Seq("2.12.20", "2.13.15") // NOTE: keep sync'd with .ci.yml +scalaVersion := "2.13.16" +crossScalaVersions := Seq("2.12.20", "2.13.16") // NOTE: keep sync'd with .ci.yml organization := "com.comcast"