Skip to content

Commit 8f5224e

Browse files
Fix 2.13 build
1 parent 915412d commit 8f5224e

File tree

4 files changed

+19
-4
lines changed

4 files changed

+19
-4
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ jobs:
5555
"frontend/testOnly bloop.ScalaVersionsSpec" \
5656
"frontend/testOnly -bloop.ScalaVersionsSpec" \
5757
"jsBridge06/test" \
58-
"jsBridge1/test"
58+
"jsBridge1/test" &&\
59+
./bin/sbt-ci.sh \
60+
"+test:compile"
5961
shell: bash
6062
launcher-test:
6163
runs-on: ${{ matrix.os }}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package bloop.bloopgun.util
2+
3+
object Helper {
4+
import Ordering.Implicits.seqDerivedOrdering
5+
def seqIntOrdering: Ordering[Seq[Int]] =
6+
seqDerivedOrdering[Seq, Int]
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package bloop.bloopgun.util
2+
3+
object Helper {
4+
import Ordering.Implicits.seqOrdering
5+
def seqIntOrdering: Ordering[Seq[Int]] =
6+
seqOrdering[Seq, Int]
7+
}

bloopgun-core/src/main/scala/bloop/bloopgun/Bloopgun.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import bloop.bloopgun.core.AvailableWithCommand
1111
import bloop.bloopgun.core.ListeningAndAvailableAt
1212
import bloop.bloopgun.core.ServerStatus
1313
import bloop.bloopgun.core.ResolvedAt
14+
import bloop.bloopgun.util.Helper.seqIntOrdering
1415
import bloopgun.internal.build.BloopgunInfo
1516

1617
import java.io.PrintStream
@@ -521,15 +522,13 @@ class BloopgunCli(
521522
val jvmOpts = Environment.detectJvmOptionsForServer(found, serverArgs, logger)
522523
val stringClasspath = classpath.map(_.normalize.toAbsolutePath).mkString(delimiter)
523524
val isBloopFork = {
524-
import Ordering.Implicits.seqDerivedOrdering
525525
val ver = bloopVersion
526526
.split('.')
527527
.toSeq
528528
.map(s => scala.util.Try(s.toInt).toOption)
529529
.takeWhile(_.nonEmpty)
530530
.flatten
531-
val ord = seqDerivedOrdering[Seq, Int]
532-
ord.compare(ver, Seq(1, 4, 13)) >= 0
531+
seqIntOrdering.compare(ver, Seq(1, 4, 13)) >= 0
533532
}
534533
val mainClass = if (isBloopFork) "bloop.Bloop" else "bloop.Server"
535534
val cmd = javaBinary ++ finalJvmOpts(jvmOpts) ++ List(

0 commit comments

Comments
 (0)