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

Scala3/kernel+core #1192

Merged
merged 51 commits into from
Jan 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
c0487b9
Prepare Scala 3 cross-compilation
DoSOfRedRiver May 29, 2023
be02b88
Dispatch traits preparation.
dos65 Jul 11, 2023
0127f32
WIP: prepared kernel to scala3.
Gryum Jul 11, 2023
658f0d9
Working on coreCE2.
dos65 Jul 31, 2023
55ee0d1
Updated scalafmt
Grryum Sep 11, 2023
a42ab44
Kernel macros finally done.
Grryum Sep 11, 2023
324df9e
CE2 main code prepared for scala3.
Grryum Sep 11, 2023
0a8c130
Adopted coreCE2 module and added macro with argument application.
Grryum Sep 13, 2023
442049f
Added implicit arguments apply.
Grryum Sep 19, 2023
146313d
WIP: most of macros prepared, working on problem with path dependent …
Grryum Sep 24, 2023
8f350ac
Solved path dependent type problem with asInstanceOf on macro site.
dos65 Nov 1, 2023
e8c594c
Finally coreCE2 migration done!!!
Grryum Nov 1, 2023
186759f
coreCE3 adopt.
Grryum Nov 2, 2023
6284e2e
Migrate ZIO2 interop to Scala 3.
Grryum Nov 7, 2023
d9c3600
Collect garbage.
Grryum Nov 7, 2023
8d4a577
Uncomment early failed test.
Grryum Nov 8, 2023
bbd942c
FIxed unused imports.
Grryum Nov 17, 2023
fa7803a
Fixed compat.unused.
Grryum Nov 18, 2023
1d7f2b2
Scala fmt tuning and applying..
Grryum Nov 18, 2023
5ac1787
Fixed kernel test.
Grryum Nov 19, 2023
0f3d2bd
Setup tpolecat plugin, fix warnings.
Grryum Nov 20, 2023
e195750
Fix fmt.
Grryum Nov 20, 2023
fdd1c2a
Revert scalafix cfg.
Grryum Nov 20, 2023
1428ce9
Fixed typo bug.
Grryum Nov 21, 2023
d89d8aa
Silenced scala3-migration warnings.
Grryum Nov 21, 2023
c212520
Fixed cross compile warnings.
Grryum Nov 22, 2023
ea26dbe
Reverted zio2 logging and fixed build settings.
Grryum Nov 22, 2023
77424f2
Fixed warnings.
Grryum Nov 22, 2023
db23143
Refactored build.sbt for future.
Grryum Nov 22, 2023
79fc2ae
Trying to fix mystery bug.
Grryum Nov 22, 2023
c327f77
instanceOf for the instance of God
road21 Nov 22, 2023
8d2eb06
fix
road21 Nov 22, 2023
e88a1c9
Logback & slf4j version bump.
Grryum Nov 22, 2023
49b3eb4
Revert cast logger fix error attempt.
Grryum Nov 22, 2023
c074819
Disable zio2 logging test.
Grryum Nov 22, 2023
7d105eb
Disable warnings as fatal errors on docs/mdoc.
Grryum Nov 22, 2023
3f9f8cb
Merge pull request #1 from road21/scala3/kernel+core-instance-of-fix
Grryum Nov 23, 2023
9e4b74f
Refactored fatal warnings options.
Grryum Nov 23, 2023
9ea59d3
Slight Interop refactoring.
Grryum Nov 23, 2023
95ea831
widen, not instance of
road21 Nov 23, 2023
5573a4d
Merge pull request #2 from road21/scala3/kernel+core-widen
Grryum Nov 23, 2023
29d07a3
sbt version bump
Grryum Nov 24, 2023
1fb0e66
ci updated.
Grryum Nov 24, 2023
dc60aa2
Added sbt-projectmatrix plugin.
Grryum Nov 25, 2023
dfdc886
Setup project matrix builds and ci.
Grryum Nov 27, 2023
82e0454
Fixed -Ykind-projector set repeatedly.
Grryum Nov 27, 2023
3a51e77
One more warnings fix.
Grryum Nov 27, 2023
2f3c425
scala3: fix Do monad inc compilation issues
dos65 Nov 27, 2023
c3adf17
Merge pull request #4 from Grryum/scala3/ci
Grryum Nov 28, 2023
bd1411b
Added RepresentableK instances with hand implementation without macros.
Grryum Dec 4, 2023
5afa3de
Enable docs generation.
Grryum Dec 11, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
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
Loading