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

[2.x] Merge 1.x branch into 2.x #1433

Merged
merged 97 commits into from
Oct 20, 2024
Merged

[2.x] Merge 1.x branch into 2.x #1433

merged 97 commits into from
Oct 20, 2024

Conversation

Friendseeker
Copy link
Member

@Friendseeker Friendseeker commented Oct 6, 2024

Contains changes up to 0787c42

eed3si9n and others added 30 commits September 6, 2024 14:45
Copy bytes directly instead of using `scala.reflect.io.Streamable`
Probably not needed anymore but better safe than sorry
Update sbt, util-control, util-interface, ... to 1.10.2
[1.x] Run `AnalysisFormatBenchmark` during CI
[1.x] Add missing condition for `AnalysisFormatBenchmark` CI run
Zinc does not provide a way to surface list of all problems present in a
codebase.

This PR builds SourceInfos in Analysis Callback and in `handleErrors`,
the compiler bridge then throws an exception containing the SourceInfos
so build tools like sbt can access the informations.

Closes sbt#932
[1.x] Emit `SourceInfos` when incremental compilation fails
[1.x] Use `hashCode` instead of XOR hash in `extraHash` computation
…-fast-pass-2

[1.x] Refine early return condition in `invalidateAfterInternalCompilation`
[1.x] Add log for third class invalidation
[1.x] ask Scala Steward not to update `jgit` version
@Friendseeker Friendseeker requested a review from adpi2 October 15, 2024 23:36
Friendseeker and others added 23 commits October 16, 2024 10:53
…ckport

[1.x] Backport dummy output jar handling for Consistent Analysis Format
…t#1462)

Ref sbt#1284
Fixes sbt#1461
Fixes sbt#1420
Also fixes com-lihaoyi/mill#3748 downstream

Not sure if there's a better way to fix this? Just opening this to spark discussion

The original bugs are fine, but the solution seems incorrect, and is both overly conservative (invalidating everything based on whitespace?) and not conservative enough (doesn't handle cycles with length > 2?).
[1.x] avoid deprecated collection.mutable.MultiMap
…ashmap

[1.x] avoid deprecated `mutable.OpenHashMap`
@eed3si9n
Copy link
Member

I want to get this merged to 2.x. Could we comment out the failing benchmark?

@Friendseeker
Copy link
Member Author

I want to get this merged to 2.x. Could we comment out the failing benchmark?

Done!

@eed3si9n eed3si9n merged commit 7cebe83 into sbt:develop Oct 20, 2024
9 checks passed
@Friendseeker Friendseeker deleted the merge-1-x branch October 20, 2024 00:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants