Skip to content

Commit

Permalink
Merge branch 'master' into update/sbt-scalafix-0.9.34
Browse files Browse the repository at this point in the history
  • Loading branch information
pnerg authored Mar 11, 2024
2 parents cd9cf50 + cf2b41e commit eed1f8a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/scala.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ jobs:
test-and-coverage:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2.4.0
- uses: actions/checkout@v3.3.0
- name: Run cross-version tests
run: sbt +test
- name: Run coverage
run: sbt coverage test
- name: Coverage Report
run: sbt coverageReport
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v2.1.0
uses: codecov/codecov-action@v3.1.1
with:
fail_ci_if_error: true
# lint:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v2.4.0
# - uses: actions/checkout@v3.3.0
# - name: Formatting
# run: sbt scalafmtSbtCheck scalafmtCheck test:scalafmtCheck
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name := "java-scala-utils-converter"
organization := "org.dmonix.functional"
version := "1.2.0"

scalaVersion := "2.12.15"
crossScalaVersions := Seq("2.11.12", "2.12.15", "2.13.7")
scalaVersion := "2.12.17"
crossScalaVersions := Seq("2.11.12", "2.12.17", "2.13.7")

scalacOptions ++= Seq("-deprecation", "-unchecked", "-feature", "-language:implicitConversions", "-language:higherKinds", "-target:jvm-1.8")
scalacOptions in (Compile, doc) ++= Seq("-doc-title", "Java Scala Utils Converter API")
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.2")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.7")

addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.1")

addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21")

addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.34")

0 comments on commit eed1f8a

Please sign in to comment.