Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
133 commits
Select commit Hold shift + click to select a range
9b62d43
Scala 3
eed3si9n Jan 23, 2022
72f3ed9
Turn off mima
eed3si9n Jan 23, 2022
1cb678f
Run the compiler bridge test on Scala 2.13
eed3si9n Jan 23, 2022
115008a
util 2.0.0-alpha2
eed3si9n Oct 11, 2022
956dd09
util 2.0.0-alpha3
eed3si9n Oct 18, 2022
6329760
sjson-new 0.12.0
eed3si9n Oct 22, 2022
8f159d7
Scala 3.2.0
eed3si9n Oct 22, 2022
198d712
util 2.0.0-alpha4
eed3si9n Oct 31, 2022
549c378
sjson-new 0.13.0
eed3si9n Dec 6, 2022
a8fe9b5
Downgrade scala-xml to 2.13
eed3si9n Dec 8, 2022
50a2888
sjson-new 0.14.0-M1
eed3si9n Nov 26, 2023
52e374c
Add HashedVirtualFileRef
eed3si9n Dec 3, 2023
c5551d1
Add HashUtil.sha256HashStr
eed3si9n Dec 26, 2023
f7c435e
Remove zinc-compile module
eed3si9n Dec 26, 2023
228996c
Fix javadoc heading
adpi2 Mar 6, 2024
0111965
Fix scala3 dependencies
adpi2 Mar 6, 2024
fdab5c6
Disable semanticdb on compilerBridgeJVM2_10
adpi2 Mar 6, 2024
9862de8
Bump snapshot version
adpi2 Mar 6, 2024
72ece2a
Bump utilVersion to "2.0.0-alpha8-SNAPSHOT"
adpi2 Mar 6, 2024
88e5ba0
Update sbt-assembly to 1.2.0
adpi2 Mar 6, 2024
2bb4e00
Update sbt-protobuf
eed3si9n Mar 17, 2024
2a7a2ee
2.0.0-alpha12-SNAPSHOT
eed3si9n Mar 17, 2024
2d65c68
Add sizeBytes
eed3si9n Mar 25, 2024
74a12f2
Fix test
eed3si9n Apr 6, 2024
0db63f2
Update test
eed3si9n Apr 8, 2024
26fdbb9
Downgrade protobuf-java back to 3.24.4
eed3si9n Apr 10, 2024
93edf8c
Merge branch 'develop' into wip/sbt-2.x-merge
eed3si9n May 12, 2024
786789a
Disable scripted tests
adpi2 May 30, 2024
1dbd1ce
fix jobtype 2
adpi2 Jun 3, 2024
6a5d274
Merge pull request #1363 from adpi2/wip/sbt-2.x
adpi2 Jun 4, 2024
9f46d61
Discard analysis after switching to straight-to-jar compilation
adpi2 Jun 26, 2024
7e44315
minor changes
adpi2 Jun 27, 2024
54e9fba
Create output jar if missing after compile
adpi2 Jun 27, 2024
405967a
Merge pull request #1368 from adpi2/2.x-compile-straight-to-jar
adpi2 Jul 1, 2024
1ed6a46
Fix mixed incremental compilation to JAR
adpi2 Jul 3, 2024
71e9cf3
Bump snapshot version
adpi2 Jul 8, 2024
5fd2231
Merge pull request #1376 from adpi2/2.x-fix-mixed-compilation-to-jar
adpi2 Jul 10, 2024
f44fe15
Merge branch 'wip/sbt-2.x' into wip/sbt-2.x-merge
eed3si9n Sep 5, 2024
e2579fa
Merge pull request #1387 from eed3si9n/wip/sbt-2.x-merge
eed3si9n Sep 5, 2024
e66d9ef
Fix GitHub Actions
eed3si9n Sep 6, 2024
fada025
Merge pull request #1389 from eed3si9n/wip/fix_github_actions
eed3si9n Sep 6, 2024
9a5a9b4
Make unit test stricter
eed3si9n Sep 6, 2024
4c190b2
Avoid using ZipError
eed3si9n Sep 6, 2024
6a75537
Merge pull request #1390 from eed3si9n/wip/stricter_test
eed3si9n Sep 6, 2024
c7a7425
Remove the Protocol Buffer usage
eed3si9n Sep 5, 2024
be7073f
Update tests
eed3si9n Sep 5, 2024
8bc656d
Write dummy JAR paths for JAR output
eed3si9n Sep 6, 2024
1899979
Merge pull request #1391 from eed3si9n/wip/zip_error
eed3si9n Sep 6, 2024
1211926
Merge pull request #1388 from eed3si9n/wip/protobuf_removal
eed3si9n Sep 18, 2024
db68d8f
Let benchmark run against target branch
Friendseeker Sep 23, 2024
96aed24
Merge pull request #1407 from Friendseeker/ci-target-branch
eed3si9n Sep 24, 2024
7fa8ede
use CollectionConverters instead of deprecated JavaConverters
xuwei-k Sep 30, 2024
f40a0d3
Merge pull request #1414 from xuwei-k/CollectionConverters-JavaConver…
eed3si9n Oct 1, 2024
31e332d
Fix compile errors
Friendseeker Oct 2, 2024
5534ab4
Merge pull request #1418 from Friendseeker/fix-scripted-compile-errors
eed3si9n Oct 3, 2024
332afec
fix filterKeys and mapValues warnings
xuwei-k Oct 3, 2024
e7a7682
replace deprecated Traversable and TraversableOnce
xuwei-k Oct 3, 2024
240743c
update scalacOptions for Scala 3
xuwei-k Oct 3, 2024
4538499
use iterator instead of deprecated toIterator
xuwei-k Oct 3, 2024
120c669
Merge pull request #1423 from xuwei-k/HouseRules-scala-3
eed3si9n Oct 3, 2024
18b136a
Merge pull request #1424 from xuwei-k/toIterator
eed3si9n Oct 3, 2024
141fb2d
Merge pull request #1422 from xuwei-k/Traversable-TraversableOnce
eed3si9n Oct 3, 2024
21f6ee8
Merge pull request #1421 from xuwei-k/filterKeys-mapValues
eed3si9n Oct 3, 2024
1bcb7b2
avoid deprecated eta-expand syntax
xuwei-k Oct 3, 2024
46356a7
Merge pull request #1425 from xuwei-k/eta-expand
eed3si9n Oct 4, 2024
f8f77c5
deps: Bump util
eed3si9n Oct 4, 2024
6425eb8
Merge pull request #1426 from eed3si9n/wip/bump-util
eed3si9n Oct 4, 2024
1f05eea
Content Hashing
Friendseeker Oct 5, 2024
70b89c1
Handle DependencyByMacroExpansion during serialization
Friendseeker Oct 5, 2024
5b06a38
Add test
Friendseeker Oct 5, 2024
9a7ee51
Address PR feedback
Friendseeker Oct 5, 2024
c57ea64
Merge pull request #1430 from Friendseeker/content-hashing
eed3si9n Oct 6, 2024
2bdc237
Merge pull request #1432 from Friendseeker/fix-consistent-format-bug
eed3si9n Oct 6, 2024
82a6d23
Merge branch '1.10.x' into merge-1-x
Friendseeker Oct 6, 2024
9a6a3a7
avoid deprecated collection.mutable.MultiMap
xuwei-k Oct 6, 2024
fadc1d8
enforce new varargs syntax
xuwei-k Oct 6, 2024
43a74cf
Merge pull request #1439 from xuwei-k/vararg-splice
eed3si9n Oct 6, 2024
040309b
Merge pull request #1438 from xuwei-k/delete-MultiMap
eed3si9n Oct 6, 2024
a37b424
Forward Port #1449
Friendseeker Oct 10, 2024
c60b577
Merge pull request #1452 from Friendseeker/fix-ci-2
SethTisue Oct 10, 2024
ea05935
Merge branch '1.10.x' into merge-1-x
Friendseeker Oct 12, 2024
d318e63
Merge branch 'develop' into merge-1-x
Friendseeker Oct 12, 2024
fce0597
Merge branch '1.10.x' into merge-1-x
Friendseeker Oct 12, 2024
ba8f02e
Clean compile warnings
Friendseeker Oct 13, 2024
2cd1149
Merge pull request #1458 from Friendseeker/clean-compile-warnings
adpi2 Oct 14, 2024
a52cfba
Enable scripted test
Friendseeker Oct 13, 2024
5d7128a
Enable scripted test in CI
Friendseeker Oct 13, 2024
3ffd537
Enable scripted test in run-ci.sh
Friendseeker Oct 13, 2024
6d436ce
Add 25 minute timeout
Friendseeker Oct 14, 2024
fec4db9
Merge pull request #1457 from Friendseeker/enable-scripted-test
adpi2 Oct 15, 2024
7fb75a1
New Implementation for ParallelGzipOutputStream
Ichoran Oct 12, 2024
9641c4e
Remove ExecutionContext passing
Friendseeker Oct 12, 2024
9089fcd
Add unit tests
Friendseeker Oct 14, 2024
048b779
Write header before starting scribe
Friendseeker Oct 15, 2024
d35e028
Remove unused code
Friendseeker Oct 15, 2024
41dd74e
Merge pull request #1456 from Friendseeker/Ichoran-fixed-Gzip-stream
eed3si9n Oct 15, 2024
9e7e953
Merge branch '1.10.x' into merge-1-x
Friendseeker Oct 15, 2024
e145771
Merge branch 'develop' into merge-1-x
Friendseeker Oct 15, 2024
f04147c
Merge branch '1.10.x' into merge-1-x
Friendseeker Oct 15, 2024
58a1ef5
Remove compilerVersionDependentScalacOptions
Friendseeker Oct 18, 2024
e429da3
Bump Scala 3 to 3.3.4
Friendseeker Oct 18, 2024
5a1cd56
Merge branch '1.10.x' into merge-1-x
Friendseeker Oct 18, 2024
f9ca5e7
Merge pull request #1468 from Friendseeker/compiler-version-specfic-c…
eed3si9n Oct 19, 2024
0a010d6
Merge branch '1.10.x' into merge-1-x
Friendseeker Oct 19, 2024
1f88d4d
Merge branch 'develop' into merge-1-x
Friendseeker Oct 19, 2024
c170707
Comment out failing test
Friendseeker Oct 19, 2024
920d07f
Merge branch '1.10.x' into merge-1-x
Friendseeker Oct 19, 2024
7cebe83
Merge pull request #1433 from Friendseeker/merge-1-x
eed3si9n Oct 20, 2024
2357fad
Uncomment AnalysisFormatBenchmark
Friendseeker Oct 20, 2024
e2e2e8d
Merge pull request #1477 from Friendseeker/uncomment
eed3si9n Oct 20, 2024
20dba76
Merge branch 'develop' into bump-scala3-334
eed3si9n Oct 20, 2024
02abfbb
Merge pull request #1469 from Friendseeker/bump-scala3-334
eed3si9n Oct 20, 2024
19fa711
Merge branch '1.10.x' into wip/merge-1.10.x
eed3si9n Dec 16, 2024
a8992c6
Adjust pending
eed3si9n Dec 16, 2024
4984165
Merge pull request #1515 from eed3si9n/wip/merge-1.10.x
eed3si9n Dec 16, 2024
8a6ff75
util 2.0.0-M3
eed3si9n Dec 18, 2024
5b55328
Merge pull request #1519 from eed3si9n/wip/bump-util
eed3si9n Dec 18, 2024
a11be8c
vf in scalacOptions
eed3si9n Apr 6, 2025
cce336a
Merge pull request #1545 from eed3si9n/wip/scalacoptions
eed3si9n Apr 29, 2025
89ff3da
Bump Util
eed3si9n May 1, 2025
90e80fb
Merge pull request #1547 from eed3si9n/wip/bump-util
eed3si9n May 1, 2025
3f12c31
Merge branch '1.10.x' into wip/merge-1.10.x
eed3si9n Aug 4, 2025
3092973
Merge pull request #1563 from eed3si9n/wip/merge-1.10.x
eed3si9n Aug 4, 2025
87aeb7b
Bump util to 2.0.0-M5
eed3si9n Aug 4, 2025
602f8cc
Merge pull request #1564 from eed3si9n/wip/bump-util
eed3si9n Aug 4, 2025
04d05ca
update util version
xuwei-k Aug 19, 2025
886c716
fix: Directory support
eed3si9n Aug 27, 2025
8e13c5d
Merge pull request #1571 from eed3si9n/wip/directory-support
eed3si9n Aug 28, 2025
c35df62
delete scala-reflect dependency
xuwei-k Aug 30, 2025
1e932da
update sbt plugins
xuwei-k Aug 30, 2025
5c5f487
Merge pull request #1575 from xuwei-k/delete-scala-reflect
eed3si9n Aug 30, 2025
f14b5c6
Merge pull request #1576 from xuwei-k/update-sbt-plugins
eed3si9n Aug 30, 2025
1f6e770
Update sbt-assembly to 2.3.1
scala-steward Aug 31, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
if: ${{ matrix.jobtype == 2 }}
shell: bash
run: |
sbt -v -Dfile.encoding=UTF-8 -Dsbt.supershell=never "crossTestBridges" "zincRoot/test" "zincScripted/Test/run"
sbt -v -Dfile.encoding=UTF-8 -Dsbt.supershell=never "Test/compile" "crossTestBridges" "zincRoot/test" "scripted"
- name: Build and test (3)
if: ${{ matrix.jobtype == 3 }}
shell: bash
Expand Down
5 changes: 3 additions & 2 deletions .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version = 3.8.3
runner.dialect = scala212
runner.dialect = scala3

project.git = true
project.excludeFilters = [ /sbt-test/, /input_sources/, /contraband-scala/ ]
Expand Down Expand Up @@ -27,12 +27,13 @@ danglingParentheses.defnSite = true
rewrite.trailingCommas.style = keep

rewrite.scala3.convertToNewSyntax = true
rewrite.scala3.newSyntax.control = false
fileOverride {
"glob:**/internal/compiler-bridge/**" {
rewrite.scala3.convertToNewSyntax = false
runner.dialect = scala213
}
}
runner.dialectOverride.allowSignificantIndentation = false
runner.dialectOverride.allowAsForImportRename = false
runner.dialectOverride.allowStarWildcardImport = false
runner.dialectOverride.allowPostfixStarVarargSplices = false
5 changes: 4 additions & 1 deletion bin/run-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ set -eu
set -o nounset

sbt -Dfile.encoding=UTF-8 \
mimaReportBinaryIssues \
-J-XX:ReservedCodeCacheSize=512M \
-J-Xms1024M -J-Xmx2048M -J-server \
scalafmtCheckAll \
scalafmtSbtCheck \
Test/compile \
doc \
crossTestBridges \
Expand Down
Loading
Loading