-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into update/sbt-scoverage-2.0.3
- Loading branch information
Showing
2 changed files
with
14 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,18 +24,20 @@ jobs: | |
| matrix: | ||
| os: [ubuntu-latest] | ||
| scala: [2.12.16, 2.13.8, 3.2.0] | ||
| java: [[email protected]] | ||
| java: [temurin@11] | ||
| runs-on: ${{ matrix.os }} | ||
| steps: | ||
| - name: Checkout current branch (full) | ||
| uses: actions/checkout@v2 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Setup Java and Scala | ||
| uses: olafurpg/setup-scala@v13 | ||
| - name: Setup Java (temurin@11) | ||
| if: matrix.java == 'temurin@11' | ||
| uses: actions/setup-java@v2 | ||
| with: | ||
| java-version: ${{ matrix.java }} | ||
| distribution: temurin | ||
| java-version: 11 | ||
|
|
||
| - name: Cache sbt | ||
| uses: actions/cache@v2 | ||
|
|
@@ -78,18 +80,20 @@ jobs: | |
| matrix: | ||
| os: [ubuntu-latest] | ||
| scala: [3.2.0] | ||
| java: [[email protected]] | ||
| java: [temurin@11] | ||
| runs-on: ${{ matrix.os }} | ||
| steps: | ||
| - name: Checkout current branch (full) | ||
| uses: actions/checkout@v2 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Setup Java and Scala | ||
| uses: olafurpg/setup-scala@v13 | ||
| - name: Setup Java (temurin@11) | ||
| if: matrix.java == 'temurin@11' | ||
| uses: actions/setup-java@v2 | ||
| with: | ||
| java-version: ${{ matrix.java }} | ||
| distribution: temurin | ||
| java-version: 11 | ||
|
|
||
| - name: Cache sbt | ||
| uses: actions/cache@v2 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") | ||
| addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2") | ||
| addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.0") | ||
| addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.1") | ||
| addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.3") | ||
| addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.2") | ||
| addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.13.0") | ||
| addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2") | ||
| addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") | ||
| addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10") |