Commit Graph

17422 Commits

Author SHA1 Message Date
Martin Duhem d27a1a4ebb Add MiMa exclusion
Changing the return type of is fine because this symbol is private and
internal to sbt.
2023-10-11 20:59:19 +02:00
MINKYU LEE 9f1d2fd4ed
Fix bug of unmanagedResourceDirectories (#7178)
Sort resourceDirectories for copyResourcesTask
2023-10-08 22:56:48 -04:00
eugene yokota 54011d5e74
Merge pull request #434 from xuwei-k/Resolver-sonatypeOssRepos
fix warnings. `Resolver.sonatypeRepo` => `Resolver.sonatypeOssRepos`
2023-10-08 21:07:56 -04:00
xuwei-k 999b881ee7 fix warnings. Resolver.sonatypeRepo => Resolver.sonatypeOssRepos 2023-10-09 07:51:32 +09:00
eugene yokota c48c1f66de
Merge pull request #7399 from xuwei-k/System-runFinalization
catch `NoSuchMethodError` when call `runFinalization`
2023-10-08 13:45:45 -04:00
eugene yokota f1755cdf87
Merge pull request #7398 from xuwei-k/ScriptedLauncher-URL-constructor
avoid deprecated `java.net.URL` constructor
2023-10-08 13:33:46 -04:00
kenji yoshida 32558c9537
catch NoSuchMethodError when call runFinalization 2023-10-08 18:04:06 +09:00
xuwei-k 8d44bbb8a5 avoid deprecated `java.net.URL` constructor
- https://bugs.openjdk.org/browse/JDK-8295949
- 4338f527aa
2023-10-08 17:49:20 +09:00
eugene yokota 5d6d30ed1c
Merge pull request #7396 from mkurz/uri_log_dependencyBrowseTree 2023-10-07 13:03:25 -04:00
Matthias Kurz 5fddf3d741
Include uri in log of dependencyBrowseTree 2023-10-07 12:20:01 +02:00
Domantas Petrauskas bf8e92be74
Fix VM argument passing by .sbtopts file and JAVA_TOOL_OPTIONS environmental variable (#7393)
Fixes #7387

* Fix VM argument passing by .sbtopts file and JAVA_TOOL_OPTIONS environmental variable, improve launcher script integration test setup
* Fix sbt process not exiting in launcher test for --sbt-version
* Fix JAVA_TOOL_OPTIONS in launcher for linux/mac
2023-10-06 12:31:27 -04:00
eugene yokota 8f62b3448f
Merge pull request #7394 from sbt/eed3si9n-patch-1
Update build.properties
2023-10-06 11:36:12 -04:00
eugene yokota ebcab3e120
Update build.properties 2023-10-06 10:33:04 -04:00
eugene yokota e2de6e30e3
Merge pull request #478 from scala-steward/update/coursier-2.1.7
Update coursier, ... to 2.1.7
2023-10-05 10:00:10 -04:00
eugene yokota 36d8fd2569
Merge pull request #7389 from RustedBones/cross-build-external 2023-10-05 08:17:44 -04:00
adpi2 807f4dfdd2
Fix build.sbt 2023-10-04 09:50:24 +02:00
adpi2 d53ccda9c4
Merge branch '1.10.x' into commands-progress 2023-10-04 09:49:05 +02:00
Michel Davit c5fd4f2e6d Support cross-build for external project ref 2023-10-03 16:12:54 +02:00
Martin Duhem f03320047e
Keep logger names in hash set
Previously, the list of logger names that have been created in a given
context with Log4J was being kept in a `Vector`. As a result, subsequent
calls to `logger` on a `Log4JLoggerContext` with the same logger name
would introduce duplicates in the list. Note that Log4J's logger
configuration would not allow duplicates, and only one configuration
object for a given logger name will exist. The duplicates in the list of
logger names are therefore unnecessary.

With this patch, the logger names will be kept in a `HashSet`.

Since the logger names are only used to remove the logger configurations
after the logger context is closed, and the logger configurations
contain no duplicates, removing duplicate logger names should not cause
any issue.
2023-09-25 17:40:12 +02:00
eugene yokota 397c7a634a
Merge pull request #7352 from adpi2/bsp-javacoptions
[BSP] Implement `buildTarget/javacOptions`
2023-09-21 13:54:31 -04:00
eugene yokota 76fad81522
Merge pull request #7383 from mdedetrich/document-scriptedSbt
Document scriptedSbt
2023-09-20 09:47:57 -04:00
eugene yokota aa090bdb25
Merge pull request #433 from rtyley/avoid-repeating-version-in-eviction-warning
Avoid repeating versions in Eviction warning message
2023-09-17 22:31:11 -04:00
Roberto Tyley fdb519b9e2 Avoid repeating versions in Eviction warning message
As with https://github.com/sbt/librarymanagement/pull/386, which dealt
with Eviction *errors*, this fixes the way Eviction *warnings* report
the list of evicted versions - removing duplicate versions - and does a
refactor so that both `EvictionError` & `EvictionWarning` are using the
same logic to generate the revision string.

The logic for the revisions string is moved to the new field
`EvictionPair.evictedRevs`.

Without this fix, we see Eviction warnings like this:

```
* org.scala-lang.modules:scala-java8-compat_2.13:1.0.2 is selected over {1.0.0, 1.0.0}
```
2023-09-16 13:09:07 +01:00
Matthew de Detrich 8ce5f2e336 Document scriptedSbt 2023-09-15 20:49:39 +02:00
Eugene Yokota ef8652f93a sbt 1.9.6 2023-09-15 11:57:17 -04:00
eugene yokota 8b2c9f2050
Merge pull request #7381 from eed3si9n/wip/zinc_revert
Zinc 1.9.5
2023-09-15 11:03:21 -04:00
Eugene Yokota 4701bf7677 Zinc 1.9.5 2023-09-15 10:35:54 -04:00
Eugene Yokota c532d7e69f sbt 1.9.5 2023-09-14 00:56:37 -04:00
eugene yokota 36f7635f10
Merge pull request #7379 from eed3si9n/wip/zinc
Zinc 1.9.4
2023-09-13 23:51:52 -04:00
Eugene Yokota c551c0fbcd Zinc 1.9.4 2023-09-13 23:29:11 -04:00
eugene yokota 8f6de15dd8
Merge pull request #7378 from mdedetrich/remove-invalid-test
Remove invalid test
2023-09-13 21:40:04 -04:00
Matthew de Detrich 47344d264d
Remove invalid test 2023-09-13 22:34:41 +02:00
eugene yokota f7025eff6a
Merge pull request #7087 from mdedetrich/increase-socket-backlog-for-server-client
Set socket backlog to default size of 50
2023-09-13 11:07:44 -04:00
eugene yokota a3637713eb
Merge pull request #428 from mdedetrich/add-allModuleReports-to-updateReportExtra
Add allModuleReports to UpdateReport
2023-09-13 10:07:52 -04:00
eugene yokota 8b15b441c9
Merge pull request #7374 from eed3si9n/wip/bridge
Use binary compiler bridge
2023-09-12 10:56:41 -04:00
Eugene Yokota b1e9308ebe Use binary compiler bridge
Problem
-------
Starting Scala 2.13.12, Scala 2 has in-sourced the compiler bridge
implementtion, which hopefully will be kept up to date more than the
ones in Zinc.

Solution
--------
This switches to using the pre-compiled compiler bridge for >=2.13.12.
2023-09-11 23:15:15 -04:00
eugene yokota b47e081c7e
Merge pull request #430 from mdedetrich/add-jdk-17-to-ci
Add JDK 17 to CI
2023-09-11 12:27:29 -04:00
eugene yokota c1afff6239
Merge pull request #479 from coursier/dependabot/github_actions/actions/checkout-4
Bump actions/checkout from 3 to 4
2023-09-11 12:25:57 -04:00
eugene yokota 5e662d21bf
Merge pull request #432 from mdedetrich/update-scala213-version
Update Scala 2.13 version
2023-09-11 12:21:15 -04:00
eugene yokota 56b28c50c0
Merge pull request #431 from mdedetrich/update-github-checkout-action
Update github checkout action
2023-09-11 12:20:24 -04:00
eugene yokota edac172780
Merge pull request #7372 from sbt/dependabot/github_actions/actions/checkout-4
Bump actions/checkout from 3 to 4
2023-09-11 12:14:25 -04:00
Matthew de Detrich 47bdf1bcde
Update Scala 2.13 version 2023-09-11 12:02:37 +02:00
Matthew de Detrich 96220355e2
Update github checkout action 2023-09-11 11:17:35 +02:00
Matthew de Detrich 9919feb8a1
Add JDK 17 to CI 2023-09-11 11:11:55 +02:00
dependabot[bot] a5f0b37728
Bump actions/checkout from 3 to 4
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-11 04:39:58 +00:00
dependabot[bot] 80a9d05aaf
Bump actions/checkout from 3 to 4
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-11 01:55:09 +00:00
Matthew de Detrich fd3b33b472
Add allModuleReports to UpdateReport 2023-09-11 00:55:09 +02:00
Scala Steward c75b0acd12
Update coursier, ... to 2.1.7 2023-09-10 13:54:24 +00:00
eugene yokota 8bc8e1316b
Merge pull request #7367 from JD557/patch-1 2023-09-07 09:23:20 -04:00
João Costa bc93eceff7
Fix java opts load order on windows 2023-09-06 16:34:02 +02:00