Merge upstream changes #50
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
I'm in a situation where I want to generate bloop files for all projects for all scala variants.
Unfortunately, if we have the following project graph
```
lazy val a = project.settings(crossScalaVersions := List("2.13.0", "3.0.0"))
lazy val b = project.settings(crossScalaVersions := List("2.13.0")).dependsOn(a)
```
and then `+bloopInstall` may fail for `b` when generating for scala `3.0.0`, because it'll then use the `3.0.0` version of `a` and `2.13.0` of `b`.
I have seen errors like this:
```
[error] Modules were resolved with conflicting cross-version suffixes in ProjectRef...:
[error] org.scala-lang.modules:scala-collection-compat _3, _2.13
[error] com.lihaoyi:sourcecode _2.13, _3
[error] org.typelevel:simulacrum-scalafix-annotations _2.13, _3
[error] org.typelevel:cats-kernel _2.13, _3
[error] com.lihaoyi:fansi _3, _2.13
[error] org.typelevel:cats-core _2.13, _3
```
Continue if `bloopGenerate` fails for a project
…0.4.3 Support Scala Native 0.4.3+
Turns out Zinc brings in log4j, and despite it all working locally (so no actual way to exploit it), it might cause issues if a company proxy blocks log4j older versions.
Force newest log4j version
…-1.0.6 Update coursier-interface to 1.0.6
Implementation is based on build-server-protocol/build-server-protocol#249 (comment).
chore: bump sbt version
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2.5.1 to 3. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](actions/setup-node@v2.5.1...v3) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>
…b_actions/actions/setup-node-3 build(deps): bump actions/setup-node from 2.5.1 to 3
…#1699) Related PR can be found here scalacenter/scala-debug-adapter#198
…calacenter#1695) Build client can use information about the test framework of tests to provide better UX when running/debugging tests. More information can be found at build-server-protocol/build-server-protocol#296 (comment).
alexarchambault
force-pushed
the
master
branch
2 times, most recently
from
dbbf0f9 to
979d8cf
Compare
Previously, we removed both generatedClassFile and rebasedClassFile from invalidations, but we only did it for rebased product files such as `.tasty`. Now we do it for both I am not 100% sure why sometimes invalidations happen for rebased and sometimes for generated files, but that can happen according to the comment above. What happened here is that the generated files existed, but the rebased one was in the invalidation list, so later on we would skip it.
Fix copying tasty files on incremental compilation
"Dicord" -> "Discord"
Fixing typo in README.md
Conflicts: build.sbt
Conflicts: .github/workflows/ci.yml build.sbt
Conflicts: build.sbt project/build.sbt
Conflicts: .gitmodules benchmark-bridge bin/run-benchmarks.sh integrations/maven-bloop/src/test/scala/bloop/integrations/maven/MavenConfigGenerationSuite.scala
Conflicts: bin/install.py bin/run-benchmarks.sh docs/performance-guide.md integrations/gradle-bloop/src/test/scala/bloop/integrations/gradle/ConfigGenerationSuite.scala launcher-test/src/test/scala/bloop/launcher/LauncherSpec.scala project/ReleaseUtils.scala
Conflicts: .github/workflows/ci.yml
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.