Skip to content

Commit

Permalink
Merge branch 'main' into update/sbt-scoverage-2.0.12
Browse files Browse the repository at this point in the history
  • Loading branch information
bkirwi authored May 12, 2024
2 parents 537cec4 + 96a1172 commit 6c7d063
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 34 deletions.
35 changes: 12 additions & 23 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,42 +22,31 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.12.17, 2.13.10, 3.2.1]
java: [temurin@11]
scala: [2.12.17, 2.13.13, 3.2.1]
java: [temurin@8]
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 (temurin@11)
if: matrix.java == 'temurin@11'
uses: actions/setup-java@v2
- name: Setup Java (temurin@8)
if: matrix.java == 'temurin@8'
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11

- name: Cache sbt
uses: actions/cache@v2
with:
path: |
~/.sbt
~/.ivy2/cache
~/.coursier/cache/v1
~/.cache/coursier/v1
~/AppData/Local/Coursier/Cache/v1
~/Library/Caches/Coursier/v1
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
java-version: 8
cache: sbt

- name: Check that workflows are up to date
run: sbt -mem 4000 ++${{ matrix.scala }} githubWorkflowCheck
run: sbt -mem 4000 '++ ${{ matrix.scala }}' githubWorkflowCheck

- name: Build project
run: sbt -mem 4000 ++${{ matrix.scala }} test
run: sbt -mem 4000 '++ ${{ matrix.scala }}' test

- name: Test Scala-Native
run: sbt -mem 4000 ++${{ matrix.scala }} declineNative/test
run: sbt -mem 4000 '++ ${{ matrix.scala }}' declineNative/test

- name: Report MiMa binary issues
run: sbt -mem 4000 ++${{ matrix.scala }} mimaReportBinaryIssues
run: sbt -mem 4000 '++ ${{ matrix.scala }}' mimaReportBinaryIssues
3 changes: 2 additions & 1 deletion .github/workflows/clean.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- name: Delete artifacts
shell: bash {0}
run: |
# Customize those three lines with your repository and credentials:
REPO=${GITHUB_API_URL}/repos/${{ github.repository }}
Expand All @@ -25,7 +26,7 @@ jobs:
ghapi() { curl --silent --location --user _:$GITHUB_TOKEN "$@"; }
# A temporary file which receives HTTP response headers.
TMPFILE=/tmp/tmp.$$
TMPFILE=$(mktemp)
# An associative array, key: artifact name, value: number of artifacts of that name.
declare -A ARTCOUNT
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ object HelloWorld extends CommandApp(
## About the Project

`decline` is a [Typelevel](https://typelevel.org/projects/) project,
and follows the [Scala Code of Conduct](https://typelevel.org/code_of_conduct.html).
and follows the [Scala Code of Conduct](https://typelevel.org/code-of-conduct).

This project is released under the [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0).

Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ThisBuild / mimaFailOnNoPrevious := false
val mimaPreviousVersion = "2.2.0"

lazy val Scala212 = "2.12.17"
lazy val Scala213 = "2.13.10"
lazy val Scala213 = "2.13.13"
lazy val Scala3 = "3.2.1"

ThisBuild / scalaVersion := Scala212
Expand Down Expand Up @@ -117,7 +117,7 @@ lazy val decline =
.settings(
libraryDependencies ++= {
if (scalaVersion.value.startsWith("2."))
Seq(compilerPlugin("org.typelevel" % "kind-projector" % "0.13.2" cross CrossVersion.full))
Seq(compilerPlugin("org.typelevel" % "kind-projector" % "0.13.3" cross CrossVersion.full))
else
Seq.empty
}
Expand Down
2 changes: 1 addition & 1 deletion doc/src/main/tut/arguments.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ position: 3

# Argument Types

In the [guide](/usage.html), we specified the type of an option's argument like so:
In the [guide](./usage.html), we specified the type of an option's argument like so:

```scala mdoc:to-string
import com.monovore.decline._
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.7.3
sbt.version=1.10.0
10 changes: 5 additions & 5 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
addSbtPlugin("com.47deg" % "sbt-microsites" % "1.3.4")
addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2")
addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.23.0")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.0")
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0")
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.1")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.1")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.7")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.6")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.12")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.14")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.0")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")

0 comments on commit 6c7d063

Please sign in to comment.