Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Update Scala 2 versions #781

Merged
merged 2 commits into from
Jun 30, 2023
Merged

chore: Update Scala 2 versions #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
819a736
chore: Update Scala 2 versions
tgodzik Jun 30, 2023
5b7af8b
chore: Add implicit type annotation to avoid irrelevant warning from …
tgodzik Jun 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
with:
node-version: "16"
- uses: olafurpg/setup-scala@v13
- run: sbt '++2.12.17 docs/mdoc'
- run: sbt '++2.12.18 docs/mdoc'
test-windows:
name: "Windows"
runs-on: windows-latest
Expand All @@ -35,7 +35,7 @@ jobs:
- uses: olafurpg/setup-scala@v13
with:
java-version: adopt@1.11
- run: sbt '++2.13.10 test'
- run: sbt '++2.13.11 test'
shell: bash
test:
name: ${{ matrix.command }} ${{ matrix.java }}
Expand All @@ -47,8 +47,8 @@ jobs:
command:
# Test legacy Scala versions, where reporting API changed
- "'++2.12.12! test'"
- "'++2.12.17 test'"
- "'++2.13.10 test'"
- "'++2.12.18 test'"
- "'++2.13.11 test'"
# Minimal supported version
- "'++3.1.3 test'"
- "scripted"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mdoc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
fetch-depth: 0
- uses: olafurpg/setup-scala@v13
- uses: olafurpg/setup-gpg@v3
- run: sbt '++2.12.17 docs/docusaurusPublishGhpages'
- run: sbt '++2.12.18 docs/docusaurusPublishGhpages'
env:
GIT_DEPLOY_KEY: ${{ secrets.GIT_DEPLOY_KEY }}
- name: Check git diff
Expand Down
12 changes: 6 additions & 6 deletions .mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ pull_request_rules:
- check-success=Website
- check-success=Windows
- check-success="'++2.12.12! test' adopt@1.8"
- check-success="'++2.12.17 test' adopt@1.8"
- check-success="'++2.13.10 test' adopt@1.8"
- check-success="'++2.12.18 test' adopt@1.8"
- check-success="'++2.13.11 test' adopt@1.8"
- check-success="'++3.1.3 test' adopt@1.8"
- check-success="scripted adopt@1.8"
- check-success="'++2.12.12! test' adopt@1.11"
- check-success="'++2.12.17 test' adopt@1.11"
- check-success="'++2.13.10 test' adopt@1.11"
- check-success="'++2.12.18 test' adopt@1.11"
- check-success="'++2.13.11 test' adopt@1.11"
- check-success="'++3.1.3 test' adopt@1.11"
- check-success="scripted adopt@1.11"
- check-success="'++2.12.12! test' 17"
- check-success="'++2.12.17 test' 17"
- check-success="'++2.13.10 test' 17"
- check-success="'++2.12.18 test' 17"
- check-success="'++2.13.11 test' 17"
- check-success="'++3.1.3 test' 17"
- check-success=scripted 17
actions:
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import scala.collection.mutable

def scala212 = "2.12.17"
def scala213 = "2.13.10"
def scala212 = "2.12.18"
def scala213 = "2.13.11"
/* This should be kept at 3.1.3 until there is a
* need for change and in that case we should bump to LTS*/
def scala3 = "3.1.3"
Expand Down
4 changes: 2 additions & 2 deletions mdoc-sbt/src/sbt-test/sbt-mdoc/basic/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ThisBuild / scalaVersion := "2.12.17"
ThisBuild / crossScalaVersions := List("2.12.17", "2.13.10", "3.1.3", "3.2.2")
ThisBuild / scalaVersion := "2.12.18"
ThisBuild / crossScalaVersions := List("2.12.18", "2.13.11", "3.1.3", "3.2.2")

enablePlugins(MdocPlugin)
mdocJS := Some(jsapp)
Expand Down
4 changes: 2 additions & 2 deletions mdoc-sbt/src/sbt-test/sbt-mdoc/basic/test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
> ++2.12.17 mdoc
> ++2.12.18 mdoc
> check
> ++2.13.10 mdoc
> ++2.13.11 mdoc
> check
> ++3.1.3 mdoc
> check
Expand Down
2 changes: 1 addition & 1 deletion mdoc-sbt/src/sbt-test/sbt-mdoc/extra-arguments/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ThisBuild / scalaVersion := "2.13.10"
ThisBuild / scalaVersion := "2.13.11"

enablePlugins(MdocPlugin)
4 changes: 2 additions & 2 deletions mdoc-sbt/src/sbt-test/sbt-mdoc/scalajs-1.7/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ThisBuild / scalaVersion := "2.12.17"
ThisBuild / crossScalaVersions := List("2.12.17", "2.13.10", "3.0.1")
ThisBuild / scalaVersion := "2.12.18"
ThisBuild / crossScalaVersions := List("2.12.18", "2.13.11", "3.0.1")

enablePlugins(MdocPlugin)
mdocJS := Some(jsapp)
Expand Down
4 changes: 2 additions & 2 deletions mdoc-sbt/src/sbt-test/sbt-mdoc/scalajs-1.7/test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
> ++2.12.17 mdoc
> ++2.12.18 mdoc
> check
> ++2.13.10 mdoc
> ++2.13.11 mdoc
> check
> ++3.1.3 mdoc
> check
Expand Down
30 changes: 15 additions & 15 deletions tests/unit/src/test/scala/tests/markdown/NestSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,22 +159,22 @@ class NestSuite extends BaseMarkdownSuite {
"implicit-ok".tag(SkipScala3),
"""
|```scala mdoc
|implicit val x = 1
|implicit val x: Int = 1
|```
|```scala mdoc:nest
|implicit val x = 1
|implicit val x: Int = 1
|```
|```scala mdoc
|implicitly[Int]
|```
""".stripMargin,
"""|
|```scala
|implicit val x = 1
|implicit val x: Int = 1
|// x: Int = 1
|```
|```scala
|implicit val x = 1
|implicit val x: Int = 1
|// x: Int = 1
|```
|```scala
Expand Down Expand Up @@ -219,10 +219,10 @@ class NestSuite extends BaseMarkdownSuite {
"reset".tag(SkipScala3),
"""
|```scala mdoc
|implicit val x = 1
|implicit val x: Int = 1
|```
|```scala mdoc:nest
|implicit val x = 1
|implicit val x: Int = 1
|```
|```scala mdoc:reset
|implicitly[Int]
Expand Down Expand Up @@ -302,28 +302,28 @@ class NestSuite extends BaseMarkdownSuite {
"multi-reset".tag(SkipScala3),
"""
|```scala mdoc
|implicit val x = 1
|implicit val x: Int = 1
|```
|```scala mdoc:nest
|implicit val x = 1
|implicit val x: Int = 1
|```
|```scala mdoc:nest
|implicit val x = 1
|implicit val x: Int = 1
|```
|```scala mdoc:nest
|implicit val x = 1
|implicit val x: Int = 1
|```
|```scala mdoc:reset
|implicitly[Int]
|```
|```scala mdoc:nest
|implicit val x = 1
|implicit val x: Int = 1
|```
|```scala mdoc:nest
|implicit val x = 1
|implicit val x: Int = 1
|```
|```scala mdoc:nest
|implicit val x = 1
|implicit val x: Int = 1
|```
|```scala mdoc:reset
|implicitly[Int]
Expand All @@ -345,10 +345,10 @@ class NestSuite extends BaseMarkdownSuite {
"implicit-nok".tag(SkipScala3),
"""
|```scala mdoc
|implicit val x = 1
|implicit val x: Int = 1
|```
|```scala mdoc:nest
|implicit val y = 1
|implicit val y: Int = 1
|```
|```scala mdoc
|implicitly[Int]
Expand Down