Merge pull request #127 from bjaglin/jdk11

make local dev possible with JDK11
scalacenter · Jun 14, 2020 · 644f5ad · 644f5ad
2 parents 3c2bbca + 5538e28
commit 644f5ad
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,6 +18,15 @@ jobs:
       - uses: actions/checkout@v2
       - uses: olafurpg/setup-scala@v7
       - run: sbt ${{ matrix.command }}
+  jdk11:
+    name: JDK11
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: olafurpg/setup-scala@v7
+        with:
+          java-version: adopt@1.11
+      - run: sbt test scripted
   windows:
     name: Windows tests
     runs-on: windows-latest

diff --git a/src/sbt-test/sbt-scalafix/cross-build/build.sbt b/src/sbt-test/sbt-scalafix/cross-build/build.sbt
@@ -22,7 +22,7 @@ lazy val root = project
   )
 
 lazy val scala210 = project.settings(
-  scalaVersion := "2.10.5"
+  scalaVersion := "2.10.7"
 )
 lazy val scala211 = project.settings(
   scalaVersion := Versions.scala211,

diff --git a/src/sbt-test/sbt-scalafix/cross-build/project/ScalafixTestUtility.scala b/src/sbt-test/sbt-scalafix/cross-build/project/ScalafixTestUtility.scala
@@ -7,7 +7,7 @@ object ScalafixTestUtility {
 
     if (expected == obtained) None
     else {
-      def jLinesOf(s: String) = s.lines.toSeq.asJava
+      def jLinesOf(s: String) = s.linesIterator.toSeq.asJava
 
       val expectedLines = jLinesOf(expected)
       val obtainedLines = jLinesOf(obtained)

diff --git a/src/sbt-test/sbt-scalafix/suppress/project/ScalafixTestUtility.scala b/src/sbt-test/sbt-scalafix/suppress/project/ScalafixTestUtility.scala
@@ -7,7 +7,7 @@ object ScalafixTestUtility {
 
     if (expected == obtained) None
     else {
-      def jLinesOf(s: String) = s.lines.toSeq.asJava
+      def jLinesOf(s: String) = s.linesIterator.toSeq.asJava
 
       val expectedLines = jLinesOf(expected)
       val obtainedLines = jLinesOf(obtained)