-
Notifications
You must be signed in to change notification settings - Fork 149
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
Support Scala3 #349
Merged
Merged
Support Scala3 #349
Changes from 3 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
9636290
EnumMacros
cchantep 201247d
ValueEnumMacros
cchantep d7d07ac
Update coreJVMTests
cchantep 9dc1974
Update build & tests
cchantep 94a2589
Fix scalacheck for Scala 3
cchantep 1a8942b
Update more modules for Scala3 compatibility
cchantep 51e8f84
Update play modules
cchantep e96bf14
Update doobie/quill
cchantep ba6803b
Fix
cchantep 44d1fd3
Disable Slick
cchantep c907f6c
Disable JSON4S
cchantep bb5e42e
Fix test dependencies
cchantep 79aeb2a
Review
cchantep ee55e85
Review & rebase
cchantep 3ae11c4
* Use match instead of straight cast
lloydmeta f826d23
Add Scala3 mention in Readme
lloydmeta File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,15 +13,18 @@ jobs: | |
- java: 11 | ||
scala: 2.11.12 | ||
- java: 11 | ||
scala: 2.12.14 | ||
scala: 2.12.16 | ||
- java: 11 | ||
scala: 2.13.6 | ||
scala: 2.13.8 | ||
- java: 11 | ||
scala: 3.2.1-RC1 | ||
runs-on: ubuntu-latest | ||
env: | ||
SCALAJS_TEST_OPT: full | ||
# define Java options for both official sbt and sbt-extras | ||
JAVA_OPTS: -Xms6G -Xmx6G -Xss4M -XX:ReservedCodeCacheSize=256M -XX:MaxMetaspaceSize=1G -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -Dfile.encoding=UTF-8 | ||
JVM_OPTS: -Xms6G -Xmx6G -Xss4M -XX:ReservedCodeCacheSize=256M -XX:MaxMetaspaceSize=1G -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -Dfile.encoding=UTF-8 | ||
SBT_OPTS: -Denumeratum.useLocalVersion | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v1 | ||
|
@@ -39,26 +42,23 @@ jobs: | |
sbt -v ++${{ matrix.scala }} scalafmtCheck scalafmtSbtCheck scala_2_11/test:compile scala_2_11/test:doc | ||
sbt -v ++${{ matrix.scala }} scala_2_11/test | ||
;; | ||
2.12.14) | ||
2.12.16) | ||
sbt -v ++${{ matrix.scala }} test:compile test:doc | ||
sbt -v ++${{ matrix.scala }} coverage test coverageReport | ||
sbt -v ++${{ matrix.scala }} coverageAggregate | ||
;; | ||
2.13.6) | ||
*) | ||
sbt -v ++${{ matrix.scala }} test:compile test:doc | ||
sbt -v ++${{ matrix.scala }} test | ||
;; | ||
*) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No need to fail there, SBT will anyway check whether the version selected by the CI is supported (and it avoid to hard code more cases) |
||
echo unknown Scala Version ${{ matrix.scala }} | ||
exit 1 | ||
esac | ||
rm -rf "$HOME/.ivy2/local" || true | ||
find $HOME/Library/Caches/Coursier/v1 -name "ivydata-*.properties" -delete || true | ||
find $HOME/.ivy2/cache -name "ivydata-*.properties" -delete || true | ||
find $HOME/.cache/coursier/v1 -name "ivydata-*.properties" -delete || true | ||
find $HOME/.sbt -name "*.lock" -delete || true | ||
find $HOME/Library/Caches/Coursier/v1 -name "ivydata-*.properties" -delete || true | ||
find $HOME/.ivy2/cache -name "ivydata-*.properties" -delete || true | ||
find $HOME/.cache/coursier/v1 -name "ivydata-*.properties" -delete || true | ||
find $HOME/.sbt -name "*.lock" -delete || true | ||
- name: Upload coverage to Codecov | ||
if: ${{ matrix.scala == '2.12.14' }} | ||
if: ${{ matrix.scala == '2.12.16' }} | ||
uses: codecov/codecov-action@v2 | ||
with: | ||
fail_ci_if_error: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,10 @@ | ||
version = 3.0.0-RC6 | ||
version = 3.5.8 | ||
runner.dialect = Scala213Source3 | ||
style = defaultWithAlign | ||
maxColumn = 100 | ||
|
||
fileOverride { | ||
"glob:**/src/*/scala-3/**/*.scala" { | ||
runner.dialect = scala3 | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Update covered scala versions