This repository has been archived by the owner on Jan 13, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 116
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into update/logback-classic-1.4.8
- Loading branch information
Showing
3 changed files
with
18 additions
and
18 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 |
|---|---|---|
|
|
@@ -23,7 +23,7 @@ jobs: | |
| with: | ||
| fetch-depth: 0 | ||
| - name: Setup Scala and Java | ||
| uses: olafurpg/setup-scala@v10 | ||
| uses: olafurpg/setup-scala@v14 | ||
| - name: Cache scala dependencies | ||
| uses: coursier/cache-action@v5 | ||
| - name: Lint code | ||
|
|
@@ -34,15 +34,15 @@ jobs: | |
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| java: ['adopt@1.8', 'adopt@1.11'] | ||
| java: ['openjdk@1.11.0', 'openjdk@1.17.0'] | ||
| scala: ['2.12.18', '2.13.10'] | ||
| steps: | ||
| - name: Checkout current branch | ||
| uses: actions/[email protected] | ||
| with: | ||
| fetch-depth: 0 | ||
| - name: Setup Scala and Java | ||
| uses: olafurpg/setup-scala@v10 | ||
| uses: olafurpg/setup-scala@v14 | ||
| with: | ||
| java-version: ${{ matrix.java }} | ||
| - name: Cache scala dependencies | ||
|
|
@@ -57,7 +57,7 @@ jobs: | |
| - name: Checkout current branch | ||
| uses: actions/[email protected] | ||
| - name: Setup Scala and Java | ||
| uses: olafurpg/setup-scala@v13 | ||
| uses: olafurpg/setup-scala@v14 | ||
| - name: Cache scala dependencies | ||
| uses: coursier/cache-action@v6 | ||
| - name: Check Document Generation | ||
|
|
@@ -73,7 +73,7 @@ jobs: | |
| with: | ||
| fetch-depth: 0 | ||
| - name: Setup Scala and Java | ||
| uses: olafurpg/setup-scala@v10 | ||
| uses: olafurpg/setup-scala@v14 | ||
| - name: Cache scala dependencies | ||
| uses: coursier/cache-action@v5 | ||
| - name: Release artifacts | ||
|
|
||
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,4 +1,4 @@ | ||
| version = "3.7.11" | ||
| version = "3.7.17" | ||
| maxColumn = 120 | ||
| align.preset = most | ||
| continuationIndent.defnSite = 2 | ||
|
|
||
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,12 +1,12 @@ | ||
| addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2") | ||
| addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") | ||
| addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0") | ||
| addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.5") | ||
| addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") | ||
| addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8") | ||
| addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.9") | ||
| addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") | ||
| addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.3.1") | ||
| addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.0") | ||
| addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.4") | ||
| addSbtPlugin("dev.zio" % "zio-sbt-website" % "0.3.10") | ||
| addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2") | ||
| addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") | ||
| addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") | ||
| addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.5") | ||
| addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") | ||
| addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8") | ||
| addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.9") | ||
| addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") | ||
| addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.3.1") | ||
| addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1") | ||
| addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.0") | ||
| addSbtPlugin("dev.zio" % "zio-sbt-website" % "0.3.10") |