Skip to content

Commit 182e418

Browse files
authored
Merge pull request #55 from kailuowang/scala3_0.23
added support for scala 3 - series/0.23
2 parents 7b86643 + 4117a37 commit 182e418

File tree

4 files changed

+19
-6
lines changed

4 files changed

+19
-6
lines changed

.github/workflows/ci.yml

+15-1
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,17 @@ jobs:
2929
fail-fast: false
3030
matrix:
3131
os: [ubuntu-latest]
32-
scala: [2.12.17, 2.13.10]
32+
scala: [2.12.17, 2.13.10, 3.2.1]
3333
java: [temurin@8, temurin@11, temurin@17]
3434
exclude:
3535
- scala: 2.12.17
3636
java: temurin@11
3737
- scala: 2.12.17
3838
java: temurin@17
39+
- scala: 3.2.1
40+
java: temurin@11
41+
- scala: 3.2.1
42+
java: temurin@17
3943
runs-on: ${{ matrix.os }}
4044
steps:
4145
- name: Checkout current branch (full)
@@ -240,6 +244,16 @@ jobs:
240244
tar xf targets.tar
241245
rm targets.tar
242246
247+
- name: Download target directories (3.2.1)
248+
uses: actions/download-artifact@v2
249+
with:
250+
name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.1
251+
252+
- name: Inflate target directories (3.2.1)
253+
run: |
254+
tar xf targets.tar
255+
rm targets.tar
256+
243257
- name: Import signing key
244258
if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == ''
245259
run: echo $PGP_SECRET | base64 -di | gpg --import

build.sbt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
ThisBuild / tlBaseVersion := "0.23"
2-
ThisBuild / tlMimaPreviousVersions ++= (0 to 11).map(y => s"0.23.$y").toSet
1+
ThisBuild / tlBaseVersion := "0.24"
32
ThisBuild / developers := List(
43
tlGitHubDev("rossabaker", "Ross A. Baker")
54
)
65

76
val Scala213 = "2.13.10"
8-
ThisBuild / crossScalaVersions := Seq("2.12.17", Scala213)
7+
ThisBuild / crossScalaVersions := Seq("2.12.17", Scala213, "3.2.1")
98
ThisBuild / scalaVersion := Scala213
109

1110
lazy val root = project.in(file(".")).aggregate(twirl).enablePlugins(NoPublishPlugin)

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.7.2
1+
sbt.version=1.8.0

project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.14.9")
2-
addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.5.1")
2+
addSbtPlugin("com.typesafe.play" % "sbt-twirl" % "1.6.0-M7")

0 commit comments

Comments
 (0)