Skip to content

Commit 8efb4a2

Browse files
ddworakddworak
committed
Drop Scala 2.12 support
1 parent 59ea63b commit 8efb4a2

File tree

49 files changed

+42
-182
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+42
-182
lines changed

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
strategy:
2525
matrix:
2626
os: [ubuntu-latest]
27-
scala: [2.13.11, 2.12.18]
27+
scala: [2.13.11]
2828
java: [temurin@11, temurin@17]
2929
runs-on: ${{ matrix.os }}
3030
steps:

‎benchmark/js/fullopt-2.12.html renamed to ‎benchmark/js/fullopt-2.13.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</head>
66
<body>
77
<div id="body">Loading...</div>
8-
<script type="text/javascript" src="target/scala-2.12/commons-benchmark-jsdeps.min.js"></script>
9-
<script type="text/javascript" src="target/scala-2.12/commons-benchmark-opt.js"></script>
8+
<script type="text/javascript" src="target/scala-2.13/commons-benchmark-jsdeps.min.js"></script>
9+
<script type="text/javascript" src="target/scala-2.13/commons-benchmark-opt.js"></script>
1010
</body>
1111
</html>

‎benchmark/jvm/src/main/scala-2.11/com/avsystem/commons/benchmark/CrossRedisBenchmark.scala

Whitespace-only changes.

‎core/jvm/src/main/scala/com/avsystem/commons/jiop/ScalaJDoubleStream.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ package com.avsystem.commons
22
package jiop
33

44
import java.util.DoubleSummaryStatistics
5-
6-
import scala.collection.compat._
5+
import scala.collection.Factory
76

87
final class ScalaJDoubleStream(private val jStream: JDoubleStream) extends AnyVal {
98
def asJava: JDoubleStream = jStream

‎core/jvm/src/main/scala/com/avsystem/commons/jiop/ScalaJIntStream.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ package com.avsystem.commons
22
package jiop
33

44
import java.util.IntSummaryStatistics
5-
6-
import scala.collection.compat._
5+
import scala.collection.Factory
76

87
final class ScalaJIntStream(private val jStream: JIntStream) extends AnyVal {
98
def asJava: JIntStream = jStream

‎core/jvm/src/main/scala/com/avsystem/commons/jiop/ScalaJLongStream.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ package com.avsystem.commons
22
package jiop
33

44
import java.util.LongSummaryStatistics
5-
6-
import scala.collection.compat._
5+
import scala.collection.Factory
76

87
final class ScalaJLongStream(private val jStream: JLongStream) extends AnyVal {
98
def asJava: JLongStream = jStream

‎core/jvm/src/main/scala/com/avsystem/commons/jiop/ScalaJStream.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.avsystem.commons
22
package jiop
33

44
import scala.annotation.unchecked.{uncheckedVariance => uV}
5-
import scala.collection.compat._
5+
import scala.collection.Factory
66

77
final class ScalaJStream[+A](private val jStream: JStream[A@uV]) extends AnyVal {
88
def asJava[B >: A]: JStream[B] =

‎core/jvm/src/test/scala/com/avsystem/commons/jiop/JavaInteropTest.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package com.avsystem.commons
22
package jiop
33

4-
import java.util.stream.{Collectors, DoubleStream, IntStream, LongStream}
5-
64
import com.avsystem.commons.jiop.GuavaInterop._
75
import com.google.common.util.concurrent.{MoreExecutors, SettableFuture}
86
import org.scalatest.funsuite.AnyFunSuite
97

10-
import scala.collection.compat._
8+
import java.util.stream.{Collectors, DoubleStream, IntStream, LongStream}
119
import scala.concurrent.Await
1210
import scala.concurrent.duration.Duration
1311

‎core/src/main/scala-2.12/com/avsystem/commons/collection/crossBuilders.scala

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎core/src/main/scala-2.12/com/avsystem/commons/jiop/CompatAsJavaScalaExtensions.scala

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)