Skip to content

Commit 1ce95b1

Browse files
authored
Merge pull request #27 from AVSystem/remove-2.12-scala-version
remove scala 2.12 cross-compiling
2 parents 2bf1801 + bc16874 commit 1ce95b1

File tree

2 files changed

+1
-14
lines changed

2 files changed

+1
-14
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
matrix:
2525
os: [ubuntu-latest]
26-
scala: [2.13.11, 2.12.18]
26+
scala: [2.13.11]
2727
java: [temurin@11]
2828
runs-on: ${{ matrix.os }}
2929
steps:
@@ -111,16 +111,6 @@ jobs:
111111
tar xf targets.tar
112112
rm targets.tar
113113
114-
- name: Download target directories (2.12.18)
115-
uses: actions/download-artifact@v2
116-
with:
117-
name: target-${{ matrix.os }}-2.12.18-${{ matrix.java }}
118-
119-
- name: Inflate target directories (2.12.18)
120-
run: |
121-
tar xf targets.tar
122-
rm targets.tar
123-
124114
- env:
125115
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
126116
PGP_SECRET: ${{ secrets.PGP_SECRET }}

build.sbt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ name := "scex"
33
inThisBuild(Seq(
44
organization := "com.avsystem.scex",
55
scalaVersion := "2.13.11",
6-
crossScalaVersions := Seq(scalaVersion.value, "2.12.18"),
76

87
githubWorkflowTargetTags ++= Seq("v*"),
98
githubWorkflowJavaVersions := Seq(JavaSpec.temurin("11")),
@@ -23,7 +22,6 @@ inThisBuild(Seq(
2322
val CompileAndTest = "compile->compile;test->test"
2423

2524
val parserCombinatorsVersion = "1.1.2"
26-
val collectionCompatVersion = "2.8.1"
2725
val avsCommonsVersion = "2.10.0"
2826
val jettyVersion = "9.4.51.v20230217" // Tests only
2927
val vaadinVersion = "6.8.18" // Tests only
@@ -130,7 +128,6 @@ lazy val `scex-core` = project.dependsOn(`scex-macros` % CompileAndTest)
130128
"org.scala-lang" % "scala-reflect" % scalaVersion.value,
131129
"org.scala-lang" % "scala-compiler" % scalaVersion.value,
132130
"org.scala-lang.modules" %% "scala-parser-combinators" % parserCombinatorsVersion,
133-
"org.scala-lang.modules" %% "scala-collection-compat" % collectionCompatVersion,
134131
"com.avsystem.commons" %% "commons-core" % avsCommonsVersion,
135132
"org.slf4j" % "slf4j-api" % slf4jVersion,
136133
"commons-codec" % "commons-codec" % commonsCodecVersion,

0 commit comments

Comments
 (0)