Update flexmark-all to latest 0.64.8 (#809)

* Update flexmark-all to latest 0.64.8 * Remove java 8 from CI workflows. * Remove references to java8 in .mergify.yml. * Remove references to java 8 in `build.sbt`. * Use `-release 8` for scala 2.12. Co-authored-by: Tomasz Godzik <[email protected]> --------- Co-authored-by: Tomasz Godzik <[email protected]>
scalameta · Oct 19, 2023 · 7a650e1 · 7a650e1
1 parent c859db1
commit 7a650e1
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 20 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 11
           distribution: adopt
       - run: ./bin/scalafmt --test
   docs:
@@ -27,7 +27,7 @@ jobs:
           node-version: "16"
       - uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 11
           distribution: adopt
       - run: sbt '++2.12.18 docs/mdoc'
   test-windows:
@@ -50,7 +50,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [8, 11, 17]
+        java: [11, 17]
         command:
           # Test legacy Scala versions, where reporting API changed
           - "'++2.12.12! test'"

diff --git a/.github/workflows/mdoc.yml b/.github/workflows/mdoc.yml
@@ -15,7 +15,7 @@ jobs:
           node-version: "16"
       - uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 11
           distribution: adopt
       - uses: olafurpg/setup-gpg@v3
       - run: sbt '++2.12.18 docs/docusaurusPublishGhpages'

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
           node-version: "16"
       - uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 11
           distribution: adopt
       - uses: olafurpg/setup-gpg@v3
       - name: Publish ${{ github.ref }}

diff --git a/.mergify.yml b/.mergify.yml
@@ -5,11 +5,6 @@ pull_request_rules:
       - check-success=Scalafmt
       - check-success=Website
       - check-success=Windows
-      - check-success="'++2.12.12! test' [email protected]"
-      - check-success="'++2.12.18 test' [email protected]"
-      - check-success="'++2.13.12 test' [email protected]"
-      - check-success="'++3.3.0 test' [email protected]"
-      - check-success="scripted [email protected]"
       - check-success="'++2.12.12! test' [email protected]"
       - check-success="'++2.12.18 test' [email protected]"
       - check-success="'++2.13.12 test' [email protected]"

diff --git a/build.sbt b/build.sbt
@@ -103,20 +103,14 @@ lazy val sharedSettings = List(
   scalacOptions ++= crossSetting(
     scalaVersion.value,
     if2 = List("-Yrangepos", "-deprecation"),
-    if213 = List("-release", "8"),
-    if212 = List("-Xexperimental", "-target:jvm-1.8"),
+    if213 = List("-release", "11"),
+    if212 = List("-Xexperimental", "-release", "8"),
     if3 = List("-language:implicitConversions", "-Ximport-suggestion-timeout", "0")
   )
 )
 
 lazy val sharedJavaSettings = List(
-  javacOptions ++= {
-    val version = System.getProperty("java.version")
-    if (version.startsWith("1.8"))
-      Seq()
-    else
-      Seq("--release", "8")
-  }
+  javacOptions ++= Seq("--release", "11")
 )
 
 val V = new {
@@ -185,7 +179,7 @@ lazy val cli = project
     crossScalaVersions := allScalaVersions,
     libraryDependencies ++= List(
       "io.get-coursier" % "interface" % V.coursier,
-      "com.vladsch.flexmark" % "flexmark-all" % "0.62.2",
+      "com.vladsch.flexmark" % "flexmark-all" % "0.64.8",
       "com.lihaoyi" %% "pprint" % V.pprint,
       "com.geirsson" %% "metaconfig-typesafe-config" % V.metaconfig
     ),