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.

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

Compile with Scala 3 #2065

Draft
wants to merge 28 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
11e9c38
Compile with Scala 3
fthomas Apr 6, 2021
e64fdb0
Merge branch 'master' into topic/scala3
fthomas Apr 6, 2021
4b6db78
Fix errors with 2.13
fthomas Apr 6, 2021
93a8e50
Merge branch 'master' into topic/scala3
fthomas Apr 7, 2021
68a1f79
3.0.0-RC3
fthomas Apr 19, 2021
bce93c3
Merge branch 'master' into topic/scala3
fthomas Apr 19, 2021
f0ebe46
Merge branch 'master' into topic/scala3
fthomas May 17, 2021
999e09c
Merge branch 'master' into topic/scala3
fthomas Sep 22, 2021
c951360
Update Scala 3 version
fthomas Sep 22, 2021
85dc360
Do not use CrossVersion.for3Use2_13
fthomas Sep 22, 2021
aeebc56
Merge branch 'master' into topic/scala3
fthomas Oct 4, 2021
464a678
Merge branch 'master' into topic/scala3
fthomas Oct 25, 2021
dbf942c
Merge branch 'master' into topic/scala3
fthomas Nov 6, 2021
51aab67
Scala 3.1.0
fthomas Nov 6, 2021
7fbc6f1
Merge branch 'master' into topic/scala3
fthomas Jan 14, 2022
b9c43cc
Merge branch 'main' into topic/scala3
exoego Aug 11, 2022
b4db465
Update .github/workflows/ci.yml
exoego Aug 11, 2022
81ec6fd
Update Scala 3 to 3.2.1
fthomas Nov 30, 2022
14234a8
Merge branch 'main' into topic/scala3
fthomas Nov 30, 2022
48eb35a
Merge branch 'main' into topic/scala3
fthomas Jan 7, 2023
49e62be
fmt
fthomas Jan 7, 2023
0e1dae2
Remove duplicated crossScalaVersions
fthomas Jan 7, 2023
df026c2
Merge branch 'main' into topic/scala3
fthomas Feb 4, 2023
033fecd
Scala 3.2.2
fthomas Feb 4, 2023
13fb377
Remove duplicated setting
fthomas Feb 4, 2023
859d4a4
crossScalaVersions needs to be set in the project
fthomas Feb 4, 2023
b0798be
Merge branch 'main' into topic/scala3
fthomas Feb 8, 2023
cdd2993
Merge branch 'main' into topic/scala3
fthomas Jan 24, 2024
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
12 changes: 11 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13]
scala: [2.13, 3]
java: [temurin@17, temurin@11]
runs-on: ${{ matrix.os }}
timeout-minutes: 60
Expand Down Expand Up @@ -143,6 +143,16 @@ jobs:
tar xf targets.tar
rm targets.tar

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

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

- name: Publish JARs
env:
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
Expand Down
2 changes: 2 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ pull_request_rules:
- author=scala-steward-dev
- status-success=Build and Test (ubuntu-latest, 2.13, temurin@17)
- status-success=Build and Test (ubuntu-latest, 2.13, temurin@11)
- status-success=Build and Test (ubuntu-latest, 3, temurin@17)
- status-success=Build and Test (ubuntu-latest, 3, temurin@11)
actions:
merge:
method: merge
4 changes: 3 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@ val moduleCrossPlatformMatrix: Map[String, List[Platform]] = Map(
)

val Scala213 = "2.13.12"
val Scala3 = "3.3.1"

/// sbt-typelevel configuration

ThisBuild / crossScalaVersions := Seq(Scala213)
ThisBuild / crossScalaVersions := Seq(Scala213, Scala3)
ThisBuild / githubWorkflowTargetTags ++= Seq("v*")
ThisBuild / githubWorkflowPublishTargetBranches := Seq(
RefPredicate.Equals(Ref.Branch(mainBranch)),
Expand Down Expand Up @@ -115,6 +116,7 @@ lazy val core = myCrossProject("core")
.enablePlugins(BuildInfoPlugin, JavaAppPackaging, DockerPlugin)
.settings(dockerSettings)
.settings(
crossScalaVersions := Seq(Scala213, Scala3),
libraryDependencies ++= Seq(
Dependencies.bcprovJdk15to18,
Dependencies.betterFiles,
Expand Down
Loading