Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added support for scala 3 - series/0.23 #55

Merged
merged 3 commits into from
Dec 13, 2022
Merged

added support for scala 3 - series/0.23 #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a254941
added support for scala 3
kailuowang Dec 10, 2022
6797113
sbt fmt
kailuowang Dec 10, 2022
4117a37
update base version
kailuowang Dec 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,17 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
scala: [2.12.17, 2.13.10]
scala: [2.12.17, 2.13.10, 3.2.1]
java: [temurin@8, temurin@11, temurin@17]
exclude:
- scala: 2.12.17
java: temurin@11
- scala: 2.12.17
java: temurin@17
- scala: 3.2.1
java: temurin@11
- scala: 3.2.1
java: temurin@17
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
Expand Down Expand Up @@ -240,6 +244,16 @@ jobs:
tar xf targets.tar
rm targets.tar

- name: Download target directories (3.2.1)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.1

- name: Inflate target directories (3.2.1)
run: |
tar xf targets.tar
rm targets.tar

- name: Import signing key
if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == ''
run: echo $PGP_SECRET | base64 -di | gpg --import
Expand Down
5 changes: 2 additions & 3 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
ThisBuild / tlBaseVersion := "0.23"
ThisBuild / tlMimaPreviousVersions ++= (0 to 11).map(y => s"0.23.$y").toSet
ThisBuild / tlBaseVersion := "0.24"
ThisBuild / developers := List(
tlGitHubDev("rossabaker", "Ross A. Baker")
)

val Scala213 = "2.13.10"
ThisBuild / crossScalaVersions := Seq("2.12.17", Scala213)
ThisBuild / crossScalaVersions := Seq("2.12.17", Scala213, "3.2.1")
ThisBuild / scalaVersion := Scala213

lazy val root = project.in(file(".")).aggregate(twirl).enablePlugins(NoPublishPlugin)
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.7.2
sbt.version=1.8.0
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.14.9")
addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.5.1")
addSbtPlugin("com.typesafe.play" % "sbt-twirl" % "1.6.0-M7")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this transitively add a jar dependency? With the change in release coordinates, I think this would be a breaking change.

What we could do -- and have done in these integration modules -- is create an 0.24 release against http4s-0.23 core. Then Twirl can stay current without forcing a breaking change to everything.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that this wasn't a problem on #54, because there's no bincompat yet on the 1.x liine.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good. Will do tomorrow. Thanks for the review.

Copy link
Contributor Author

@kailuowang kailuowang Dec 13, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rossabaker I couldn't find an example of the ritual of bumping minor version in regards to mima.
Do we set mimaPreviousArtifacts to Set.empty in this PR and immediately remove the setting after a 0.24.0-M1 release or is there way to let mima automatically skip checking for the first 0.24.x release?