Commit Graph

11987 Commits

Author SHA1 Message Date
mazugrin 4d8bff40dc Update jansi dep to match the one that's included in the jline dep, which also allows sbt to work on ARM64 Windows without needing to specify -Djline.terminal=jline.UnsupportedTerminal 2024-04-18 12:54:31 -04:00
eugene yokota 6678746ef6
Merge pull request #7536 from sbt/eed3si9n-patch-1
Fix typo
2024-04-15 18:18:45 -04:00
eugene yokota 422d9e735f
Fix typo 2024-04-15 10:44:17 -04:00
eugene yokota acf825179b
Merge pull request #7534 from eed3si9n/wip/consistent
Consistent Analysis
2024-04-15 00:19:18 -04:00
Eugene Yokota b1a43f9adc Consistent Analysis
See also https://github.com/sbt/zinc/pull/1326

This adds a new setting `enableConsistentCompileAnalysis`,
which enables the new "Consistent" Analysis format,
which is faster and more repeatable than the status quo.
This is initialized to `true` by default.
It can be opted out either by the setting or using
`-Dsbt.analysis2024=false`.
2024-04-14 23:17:04 -04:00
eugene yokota e254370384
Merge pull request #7533 from eed3si9n/wip/sip51-error-message
Improve the SIP-51 error message
2024-04-14 21:38:23 -04:00
Eugene Yokota b19a54a1ef Improve the SIP-51 error message 2024-04-14 21:18:15 -04:00
adpi2 7064066e6f
Merge pull request #7531 from Philippus/patch-1
Remove superfluous space
2024-04-11 11:08:35 +02:00
Philippus Baalman f89505bb03
Remove superfluous space 2024-04-11 07:21:26 +02:00
eugene yokota 4c642e6d64
Merge pull request #7528 from eed3si9n/wip/zinc
Zinc 1.10.0-RC1
2024-04-08 23:45:17 -04:00
Eugene Yokota f804c28417 Zinc 1.10.0-RC1 2024-04-08 23:07:57 -04:00
eugene yokota ec02bf3dc2
Merge pull request #7480 from lrytz/lib-unfreeze-m
Add support for SIP-51 (unfreezing the Scala library)
2024-04-08 01:10:05 -04:00
eugene yokota 21a4aaa4d6
Merge pull request #7516 from SethTisue/scala-2.12.19
Scala 2.12.19 (was 2.12.18), scala-xml 2.2.0 (was 2.1.0)
2024-03-22 11:56:51 -04:00
Seth Tisue 735214afd0 Scala 2.12.19 (was 2.12.18), scala-xml 2.2.0 (was 2.1.0) 2024-03-16 11:39:55 +01:00
eugene yokota 9bd80cf4d2
Merge pull request #7513 from kubukoz/update-lm 2024-03-15 10:51:33 -04:00
Jakub Kozłowski 4507135564
Update lm-coursier-shaded: 2.1.3 -> 2.1.4 2024-03-15 14:36:38 +01:00
Lukas Rytz 447c2ba5e5 update zinc and sbt-coursier dependencies 2024-02-27 10:56:30 +01:00
Lukas Rytz 4a1ba0c970 tests for standard library unfreezing 2024-02-27 10:56:30 +01:00
Lukas Rytz f0afeff4d9 Set locale for f interpolator decimal character
dependency-graph/toFileSubTask failed for me locally
2024-02-27 10:56:30 +01:00
Lukas Rytz b9375f5e6b Update scala-library in scala-tool configuration for Scala 3
When a macro was compiled against a new scala-library (say 2.13.15),
the runtime classpath of the Scala compiler should not contain an older
scala-library. Otherwise the macro can cause a NoSuchMethodException
during expansion.

This commit updates scala-library in the scalaInstance to the version
on the projects dependency classpath.
2024-02-27 10:56:30 +01:00
Lukas Rytz 951d1c4ae4 Add new `csrSameVersions` setting, use it for Scala artifacts
The `csrSameVersions` setting can be used to keep dependencies at the
same version.

By default it's used for Scala artifacts. They need to be kept at the
same version because the compiler / reflect are built with
cross-artifact inlining enabled.

`csrSameVersions := Seq(Set(scala-library, scala-reflect, scala-compiler, scalap))`

Users can make use of the new setting in the following way:
  - `csrSameVersions += Set[InclExclRule]("com.corp" % "lib", "com.corp" % "lub")`
  - `csrSameVersions += Set[InclExclRule]("com.corp" % "lib-family-*")`
2024-02-27 10:56:30 +01:00
Lukas Rytz 4c74358707 Fail the build if 2.13 scalaVersion < scala artifact on classpath
When expanding a macro compiled against a new Scala library, the
runtime classpath of the compiler should not contain an older library.
Otherwise a NoSuchMethodException can occur.

A similar issue is present when running the Scala repl through sbt.
An input line compiled against a new library could fail to run if
the repl's runtime classpath is on an old version.
2024-02-26 13:49:04 +01:00
Lukas Rytz 35bc07bd9e Use scala library from classpath in sbt run class loader 2024-02-26 13:49:04 +01:00
Lukas Rytz 893997d1b6 Update scala libraries according to dependency graph
There are a couple of settings / configs that affect this, summary
below. The change in this PR seems to be the most narrow.

`scalaModuleInfo.value.overrideScalaVersion` in sbt
  - affects how sbt to sets coursier's `forceScalaVersion` (see below)
  - used by librarymanagement.ivy. If true, add a OverrideScalaMediator
    See sbt/sbt#2634. Probably not relevant when using coursier.

`autoScalaLibrary` setting in sbt
  - automatically add `scala-library` (or `scala3-library`) as a project
    dependency
  - also used for `forceScalaVersion` (see below)

`CoursierConfiguration.autoScalaLibrary`
  - if `true` then Coursier `ResolutionParams.forceScalaVersion` is set
    to to `true`
  - initialized by sbt to
    `autoScalaLibrary.value &&
     !ScalaArtifacts.isScala3(sv) &&
     !Classpaths.isScala213(sv) &&        // added in this commit
     scalaModuleInfo.forall(_.overrideScalaVersion)`

coursier `ResolutionParams.forceScalaVersion`
  - if true, `scala-library` / `scala-reflect` / `scala-compiler` /
    `scalap` are forced to the scala version, not actually resolved
  - for Scala 3, the `scala3-library` and `scala3-compiler` versions
    are forced
2024-02-26 13:49:04 +01:00
Lukas Rytz d8d2b02e7e Use the ordinary compiler classpath for scala-library
No longer pass `-bootclasspath /path/to/scala-library.jar` to the Scala
compiler, put the library on the ordinary classpath.
2024-02-26 13:49:04 +01:00
adpi2 48c23761dc
Merge pull request #7499 from hagay3/1.10.x
upgrade lm-coursier-shaded to 2.1.3
2024-02-19 09:48:13 +01:00
Hagai Ovadia 0f4be2405e upgrade lm-coursier-shaded tp 2.1.3 2024-02-18 16:00:22 +02:00
adpi2 a1599c98c7
Merge pull request #7496 from adpi2/bsp-noop-compilation
[1.x] add noOp field in BSP compile report
2024-02-15 16:23:14 +01:00
Adrien Piquerez 02df82840a add noOp field in BSP compile report 2024-02-15 15:50:02 +01:00
eugene yokota f08032af26
Merge pull request #7478 from sbt/dependabot/github_actions/actions/cache-4
Bump actions/cache from 3 to 4
2024-01-21 23:55:06 -05:00
dependabot[bot] de4caf2631
Bump actions/cache from 3 to 4
Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-22 04:14:49 +00:00
eugene yokota ed84b9f7e9
Merge pull request #7475 from Tammo0987/fix/usage-of-publisher-interface
Use the publisher interface for publishing as default
2024-01-21 00:41:18 +05:30
Tammo Steffens 053c7cc8bd Use the publisher interface for publishing as default 2024-01-17 21:39:39 +01:00
eugene yokota cfe0fc8e2e
Merge pull request #7470 from Friendseeker/packageSrc-managed-source
Include `managedSources` in `packageSrc`
2024-01-02 00:41:28 -05:00
friendseeker e4ab56e444 Include managedSources in packageSrc 2024-01-01 20:58:39 -08:00
eugene yokota 4151f4e6c0
Merge pull request #7471 from Friendseeker/stamps-followup
Fix compile error in `VirtualFileValueCache`
2024-01-01 23:54:42 -05:00
friendseeker eadb5b3786
fix compile error in VirtualFileValueCache 2024-01-01 19:47:08 -08:00
eugene yokota 2f2a098742
Merge pull request #7466 from eed3si9n/wip/version
Bump the version number
2023-12-20 14:16:03 -05:00
Eugene Yokota 78a8af3d7f Bump the version number 2023-12-20 10:51:54 -05:00
eugene yokota 34933827d1
Merge pull request #7453 from eed3si9n/wip/lock2
Lock only issues
2023-12-11 18:55:32 -05:00
Eugene Yokota becf4ec66f Lock only issues 2023-12-11 18:54:05 -05:00
eugene yokota 420508c755
Merge pull request #7449 from eed3si9n/wip/bump-zinc-m2
Zinc 1.10.0-M2
2023-12-11 18:51:10 -05:00
eugene yokota c4293af403
Merge pull request #7452 from eed3si9n/wip/lock
Lock thread after 365d of inactivity
2023-12-11 18:42:52 -05:00
Eugene Yokota 556bd94b16 Lock thread after 365d of inactivity 2023-12-11 18:40:36 -05:00
eugene yokota 23a864c7c9
Merge pull request #7450 from sbt/dependabot/github_actions/actions/setup-python-5
Bump actions/setup-python from 4 to 5
2023-12-11 02:49:26 -05:00
dependabot[bot] ef6fc89075
Bump actions/setup-python from 4 to 5
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-11 04:24:57 +00:00
Eugene Yokota e5e3d2832a Zinc 1.10.0-M2 2023-12-09 05:45:03 -05:00
eugene yokota 2d974be268
Merge pull request #7447 from mkurz/more_logger_methods
[1.9.x] Add missing logger methods that take Java Supplier
2023-12-05 10:56:35 -05:00
Matthias Kurz 2d7f087753
Add missing logger methods that take Java Supplier 2023-12-05 10:15:51 +01:00
eugene yokota e6f0ed8da7
Merge pull request #7446 from sbt/dependabot/github_actions/actions/setup-java-4
Bump actions/setup-java from 3 to 4
2023-12-04 00:41:42 -05:00