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 all 1.x changes #7850

Draft
wants to merge 111 commits into
base: develop
Choose a base branch
from

Conversation

Friendseeker
Copy link
Member

No description provided.

jroper and others added 30 commits August 26, 2024 13:07
This follows on from sbt#7470, to include all sources, not just managed and
unmanaged, in the source jar, along with all resources (previously only
unmanaged resources were included).

This means that if, for whatever crazy reason, someone does modify the
`sources` task to include additional sources or filter out sources, rather than
using the managed or unmanaged source mechanisms, their changes will still be
reflected in the source jar.
Include ALL sources, and resources in source jar
The BSP server didn't reset old diagnostic messages sent to BSP clients under
certain circumstances. This commit mitigates this edge case and ensures that
diagnostics for files that previously had compilation problems are properly
reset when fresh diagnostics messages are sent.

The culprit was a mismatch of map keys: Files with problems were sometimes recorded
under an absolute path, but later attempted to be retrieved by virtual path.
Fix CI: Zinc default branch is 1.10.x
update ErrorHandling.scala. avoid reference deprecated `ThreadDeath`
**Problem**
Currently scripted does version checking to block sbt 2.x plugins
to be cross published from sbt 1.x.

**Solution**
Remove the sbt version matching.
[1.x] fix: Allow scripted to go through
**Problem**
The extra attribute is a vestige from the days when sbt plugins were published on Ivy repos.

**Solution**
This uses normal suffix system.
Use consistent name for the option. The variable is named `serverIdleTimeout` and this also seems the proper camelcasing of the words.
[1.x] fix: serverIdleTimeOut -> serverIdleTimeout
Bump native image options

Try use Github Action to setup GraalVM

Update native image version

Update java version to be in sync with Native Image Plugin

Try anything

Create the dir to place native image

Try again

Remove Graal setup

Believe in couriser?
add dependabot setting for develop branch
[1.x] Remove `vscode-sbt-scala` from build.sbt
runFinalization is going to be removed
eed3si9n and others added 23 commits October 24, 2024 17:25
[1.x] Delete `.java-version` to not fix java version to 1.8
[1.x] Static link `musl` during x86 Linux Native Image build
[1.x] Throw exception when `sbt new` fails to find template
…sion

[1.x] Use generic early output file name
[1.x] Pass reload action for `watchOnTermination` callback
[1.x] Migrate all usages of `System.console == null`
[1.x] Replace `NNBSP` with standard space
// "--verbose",
"-H:IncludeResourceBundles=jline.console.completer.CandidateListCompletionHandler",
"-H:+ReportExceptionStackTraces",
"-H:-ParseRuntimeOptions",
s"-H:Name=${target.value / "bin" / "sbtn"}",
),
) ++ (if (isLinux && isArmArchitecture)
Seq("-H:PageSize=65536") // Make sure binary runs on kernels with page size set to 4k, 16 and 64k
Copy link
Member Author

@Friendseeker Friendseeker Oct 31, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Somehow -H:PageSize=65536 disappeared from develop branch. Would like to double check whether we do need to add it to develop branch or remove it from both 1.10.x and develop branch.

@Friendseeker Friendseeker force-pushed the merge-into-develop branch 2 times, most recently from a1e48fe to 9813252 Compare October 31, 2024 07:58
@Friendseeker Friendseeker marked this pull request as draft November 1, 2024 02:41
@Friendseeker
Copy link
Member Author

Blocked by Zinc API staticCachedStore API change. Guess we can wait Zinc develop branch to have more commits and then push a Zinc 2.0.0 M2 release.

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.

10 participants