Configure shared and test modules to cross-build scala 3 #676
Conversation
Codecov Report
@@ Coverage Diff @@
## main #676 +/- ##
==========================================
+ Coverage 95.05% 95.21% +0.16%
==========================================
Files 52 51 -1
Lines 1860 1777 -83
Branches 181 175 -6
==========================================
- Hits 1768 1692 -76
+ Misses 92 85 -7
|
RustedBones
force-pushed
the
update-magnolia-scala3
branch
from
2f1aa2c to
d6e4265
Compare
.github/workflows/ci.yml
Outdated
| java: [corretto@11, corretto@8] | ||
| exclude: | ||
| - scala: 3.2.1 |
There was a problem hiding this comment.
looks like this is no longer needed, after Java 8 deprecation PR is merged
There was a problem hiding this comment.
This file is now generated from build.sbt and CI fails if it detects it is not in sync.
When we'll update the branch with changes in main, we'll just need to run sbt githubWorkflowGenerate to have this updated.
|
|
||
| - name: Inflate target directories (3.2.1) | ||
| run: | | ||
| tar xf targets.tar |
There was a problem hiding this comment.
What exactly targets.tar will contain?
build.sbt
Outdated
| // tolerate some nested macro expansion | ||
| "-Ymax-inlines", | ||
| "-Xmax-inlines", |
There was a problem hiding this comment.
Is it related to new Magnolia version?
There was a problem hiding this comment.
yes, those are required by magnolia with scala 3. Some macros are generating too long inlines.
build.sbt
Outdated
| @@ -186,14 +186,15 @@ val commonSettings = Seq( | |||
| tlFatalWarningsInCi := false, | |||
| tlJdkRelease := Some(8), | |||
| tlSkipIrrelevantScalas := true, | |||
| scalacOptions ~= { _.filterNot(_ == "-source:3.0-migration") }, | |||
There was a problem hiding this comment.
can you explain what this option means?
There was a problem hiding this comment.
source:3.0-migration instructs the scala 3 compiler to run in migration mode. This is the default from sbt-typlevel when cross-building with scala 2 (the sources are the same).
However, with this option, the compiler fails on the dedicated scala-3 folder because sources are not in the scala 2 style. See discussion scala/scala3#16720
build.sbt
Outdated
| @@ -296,6 +297,8 @@ lazy val scalacheck = project | |||
| commonSettings, | |||
| moduleName := "magnolify-scalacheck", | |||
| description := "Magnolia add-on for ScalaCheck", | |||
| crossScalaVersions := Seq(scala213, scala212), | |||
There was a problem hiding this comment.
so we still don't want to cross-build with scala3?
There was a problem hiding this comment.
Not all projects yet. Only shared and test
| @@ -0,0 +1,50 @@ | |||
| /* | |||
There was a problem hiding this comment.
all code in scala-2 was just copied?
| package magnolify | ||
|
|
||
| import scala.util.hashing.MurmurHash3 | ||
| import scala.collection.compat.Factory |
There was a problem hiding this comment.
is it really needed in scala3? I thought it is only 2.12 .vs 2.13 issue
There was a problem hiding this comment.
scala 2.13 and scala 3 have the same collection IIRC, but we still need the shim layer to get the code cross-build with scala 2.12. I think this can be removed when we stop 2.12 support.
RustedBones
force-pushed
the
update-magnolia-scala3
branch
5 times, most recently
from
c01656a to
a03e5d5
Compare
RustedBones
force-pushed
the
update-magnolia-scala3
branch
from
a03e5d5 to
a9184f8
Compare
RustedBones
force-pushed
the
update-magnolia-scala3
branch
from
ac71c3b to
cbef5c2
Compare
cross build scala 3 test and shared modules
Some breaking changes:
genunder the type-class companion objectAnnotationType.gen[T]: Annotationtype[T]EnumType.gen[T]: EnumType[T]Thos should probably be merged into a
v0.7.xbranch to get started