Skip to content

Commit

Permalink
Scala3/kernel+core (#1192)
Browse files Browse the repository at this point in the history
* Prepare Scala 3 cross-compilation

* Dispatch traits preparation.

* WIP: prepared kernel to scala3.

* Working on coreCE2.

* Updated scalafmt

* Kernel macros finally done.

* CE2 main code prepared for scala3.

* Adopted coreCE2 module and added macro with argument application.

* Added implicit arguments apply.

* WIP: most of macros prepared, working on problem with path dependent types.

* Solved path dependent type problem with asInstanceOf on macro site.

* Finally coreCE2 migration done!!!

* coreCE3 adopt.

* Migrate ZIO2 interop to Scala 3.

* Collect garbage.

* Uncomment early failed test.

* FIxed unused imports.

* Fixed compat.unused.

* Scala fmt tuning and applying..

* Fixed kernel test.

* Setup tpolecat plugin, fix warnings.

* Fix fmt.

* Revert scalafix cfg.

* Fixed typo bug.

* Silenced scala3-migration warnings.

* Fixed cross compile warnings.

* Reverted zio2 logging and fixed build settings.

* Fixed warnings.

* Refactored build.sbt for future.

* Trying to fix mystery bug.

* instanceOf for the instance of God

* fix

* Logback & slf4j version bump.

* Revert cast logger fix error attempt.

* Disable zio2 logging test.

* Disable warnings as fatal errors on docs/mdoc.

* Refactored fatal warnings options.

* Slight Interop refactoring.

* widen, not instance of

* sbt version bump

* ci updated.

* Added sbt-projectmatrix plugin.

* Setup project matrix builds and ci.

* Fixed -Ykind-projector set repeatedly.

* One more warnings fix.

* scala3: fix Do monad inc compilation issues

* Added RepresentableK instances with hand implementation without macros.

* Enable docs generation.

---------

Co-authored-by: dosofredriver <dosofredriver@gmail.com>
Co-authored-by: Vadim Chelyshov <qtankle@gmail.com>
Co-authored-by: Vladislav Ugryumov <wffvlad@yandex.ru>
Co-authored-by: road21 <amtroitskiy@gmail.com>
  • Loading branch information
5 people committed Jan 15, 2024
1 parent f01aab4 commit 2ebd463
Show file tree
Hide file tree
Showing 341 changed files with 2,509 additions and 1,426 deletions.
2 changes: 2 additions & 0 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ pull_request_rules:
- check-success~=Test \(2\.12\.x, 17\)
- check-success~=Test \(2\.13\.x, 8\)
- check-success~=Test \(2\.13\.x, 17\)
- check-success~=Test \(3\.3\.x, 8\)
- check-success~=Test \(3\.3\.x, 17\)
actions:
merge:
method: rebase
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
name: Build and Test
strategy:
matrix:
scala: [2.13.x, 2.12.x]
scala: [2.13, 2.12, 3.3]
java: [8, 17]
runs-on: ubuntu-latest
steps:
Expand All @@ -33,10 +33,10 @@ jobs:
run: sbt scalafmtCheckAll scalafmtSbtCheck

- name: Build project
run: sbt ++${{ matrix.scala }} test
run: sbt "testScoped ${{ matrix.scala }} JVM"

- name: Generate docs
if: matrix.scala == '2.13.x'
if: matrix.scala == '2.13'
run: sbt ++${{ matrix.scala }} docs/mdoc

publish:
Expand All @@ -63,4 +63,4 @@ jobs:
PGP_SECRET: ${{ secrets.PGP_SECRET }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
run: sbt ++2.13.x ci-release
run: sbt +ci-release
2 changes: 1 addition & 1 deletion .scalafix.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ OrganizeImports {
removeUnused = true
groups = ["re:javax?\\.", "scala.", "tofu." "*"]
groupedImports = AggressiveMerge
}
}
10 changes: 9 additions & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,15 @@ maxColumn = 120
includeCurlyBraceInSelectChains = false
align.preset = most
version = "3.7.11"
runner.dialect = scala213
runner.dialect = scala213source3
trailingCommas = preserve
newlines.penalizeSingleSelectMultiArgList = false
newlines.alwaysBeforeMultilineDef = false
fileOverride {
"glob:**/scala-2.12/**.scala" {
runner.dialect = scala212source3
}
"glob:**/scala-3/**.scala" {
runner.dialect = scala3
}
}
Loading

0 comments on commit 2ebd463

Please sign in to comment.