luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,422 Commits 29 Branches 314 Tags 75 MiB
Commit Graph

17422 Commits

Author SHA1 Message Date
Adrien Piquerez 4251aa3ba0 Add lmIvy dependency to sjsonnew 2024-05-29 13:39:22 +02:00
Adrien Piquerez 1b3d5324bb Use String instead of File as key of stamps 
- regenerate contraband
 2024-05-29 10:37:56 +02:00
Adrien Piquerez e140c80667 Bump sjson-new 2024-05-28 11:11:44 +02:00
Tomasz Godzik 8f7e0de27e
Merge pull request #505 from scala-steward/update/sbt-shading-2.1.5 
Update sbt-shading to 2.1.5
 2024-05-25 17:43:39 +02:00
Scala Steward e8990e2fa5
Update sbt-shading to 2.1.5 2024-05-25 13:35:35 +00:00
Adrien Piquerez 28b5db1465 fix Scala 3 compilation 2024-05-23 17:09:12 +02:00
Adrien Piquerez f8ce2cdef6 Update to Scala 3.3 2024-05-23 17:04:38 +02:00
Adrien Piquerez b3edb6a405 Fix merge 2024-05-23 17:04:26 +02:00
Adrien Piquerez 863004961c Merge remote-tracking branch 'origin/develop' into wip/sbt-2.x 2024-05-23 16:53:23 +02:00
adpi2 586e0a752c
Merge pull request #7568 from adpi2/fix-bsp-internal-dep-configs 
[1.10.x] Fix declaring `Optional` inter-project dependency in BSP
 2024-05-23 08:50:43 +02:00
adpi2 29d6912754
Merge pull request #7567 from adpi2/backport-7538 
[1.10.x] Fix `dependency-management/force-update-period` (backport of #7538)
 2024-05-23 08:49:48 +02:00
Adrien Piquerez 71f996df6e Fix scripted project/internal-dependency-configuration 2024-05-22 10:25:45 +02:00
Adrien Piquerez 9a3c4a6f53 Fix dependency-management/force-update-period 2024-05-21 16:54:14 +02:00
Adrien Piquerez f990bd2d8d [BSP] Fix importing Optional project dependency 2024-05-21 15:56:37 +02:00
eugene yokota b27c7253b1
Merge pull request #7565 from sbt/dependabot/github_actions/scalacenter/sbt-dependency-submission-3 
Bump scalacenter/sbt-dependency-submission from 2 to 3
 2024-05-20 12:24:53 -04:00
dependabot[bot] 78296a9128
Bump scalacenter/sbt-dependency-submission from 2 to 3 
Bumps [scalacenter/sbt-dependency-submission](https://github.com/scalacenter/sbt-dependency-submission) from 2 to 3.
- [Release notes](https://github.com/scalacenter/sbt-dependency-submission/releases)
- [Commits](https://github.com/scalacenter/sbt-dependency-submission/compare/v2...v3)

---
updated-dependencies:
- dependency-name: scalacenter/sbt-dependency-submission
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-05-20 04:22:26 +00:00
Eugene Yokota 4f108dfc80 Merge branch 'develop' into wip/sbt-2.x-merge 2024-05-13 00:13:46 -04:00
adpi2 4e46a331d9
Merge pull request #7555 from mkurz/upgrade_sbt_plugins 
Upgrade sbt plugins to avoid deprecated repo.scala-sbt.org
 2024-05-08 12:27:27 +02:00
Matthias Kurz c810383daf
Upgrade sbt plugins to avoid deprecated repo.scala-sbt.org 2024-05-08 11:59:00 +02:00
Tomasz Godzik deef324a11
Merge pull request #497 from scala-steward/update/sbt-shading-2.1.4 
Update sbt-shading to 2.1.4
 2024-05-07 18:57:48 +02:00
Scala Steward 4e7e8e8f71
Update sbt, scripted-plugin to 1.10.0 2024-05-07 16:29:46 +00:00
Scala Steward 0736e78f72
Update sbt-shading to 2.1.4 2024-05-07 16:29:32 +00:00
Scala Steward eead6532a4
Update coursier, ... to 2.1.10 2024-05-07 16:29:29 +00:00
Eugene Yokota c81d269ed2 Merge branch '1.10.x' into wip/merge-1.10.x 2024-05-07 04:39:25 -04:00
Eugene Yokota 0a17062645 sbt 1.10.0 2024-05-05 23:19:24 -04:00
eugene yokota d56e17b72b
Merge pull request #7551 from eed3si9n/wip/bump 
Zinc 1.10.0 + universal macOS sbtn binary
 2024-05-05 22:54:29 -04:00
Eugene Yokota bc4d5830e9 Banner for sbt 1.10.0 2024-05-05 22:38:05 -04:00
Eugene Yokota ae1f829f9f Include universal macOS sbtn 2024-05-05 22:34:58 -04:00
Eugene Yokota b8bb5e33fb Zinc 1.10.0 2024-05-05 20:11:32 -04:00
eugene yokota 8ab867dcd2
Merge pull request #439 from eed3si9n/wip/bump 
Util 1.10.0
 2024-05-05 17:59:36 -04:00
Eugene Yokota dc460527b4 Util 1.10.0 2024-05-05 17:53:08 -04:00
Eugene Yokota 7529eefda6 IO 1.10.0 2024-05-05 17:21:40 -04:00
Tomasz Godzik bbfcda84f1
Merge pull request #501 from scala-steward/update/sbt-scalafix-0.12.1 
Update sbt-scalafix to 0.12.1
 2024-05-05 14:37:39 +02:00
Scala Steward a6a4c99520
Update sbt-scalafix to 0.12.1 2024-05-05 06:42:42 +00:00
eugene yokota 542f11bab6
Merge pull request #7550 from eed3si9n/wip/dotty_plugin 
Fix old Dotty plugin compat
 2024-05-04 23:30:59 -07:00
Eugene Yokota aac79df4a3 Fix old Dotty plugin compat 
**Problem**
https://github.com/scala/scala3/pull/20157 identified that
`sbt-dotty/dotty-knowledge.i17` scripted test fails on sbt 1.10.0-RC2.
The regression happened in https://github.com/sbt/sbt/pull/7480/files#diff-6d9589bfb3f1247d2eace99bab7e928590337680d1aebd087d9da286586fba77L739-L740
where global setting was removed, and moved to project level.

**Solution**
This restores the global setting that is apparently referenced by
now defunct Dotty plugin.
 2024-05-05 01:55:32 -04:00
eugene yokota 8fe6e4e876
Merge pull request #7548 from szeiger/wip/fix-string-logging 
Fix logging of raw strings
 2024-05-04 22:34:41 -07:00
eugene yokota 26cdfa8b0f
Merge branch '1.10.x' into wip/fix-string-logging 2024-05-04 22:19:44 -07:00
eugene yokota 1c7c62135b
Merge pull request #7549 from eed3si9n/wip/mac 
Fix CI
 2024-05-04 22:19:21 -07:00
Eugene Yokota a6bdf9dc2e Fix CI 
It seems like the latest macOS image no longer supports JDK 8.
 2024-05-05 01:02:19 -04:00
Stefan Zeiger da79479ff7 Fix logging of raw strings 
sbt passes raw string messages in `ConsoleAppenderFromLog4J` to `StringFormatterMessageFactory`. This is wrong because these strings are pre-formatted and should not be processed again for formatting. There is no way to pass parameters to them anyway. This causes problems when the raw strings contain characters that `StringFormatterMessageFactory` wants to interpret.

For example, when using `-Ystatistics`:

```
ERROR StatusConsoleListener Unable to format msg:   nscprofiling                : 1 spans, ()7.543ms (0.3%)
java.util.UnknownFormatConversionException: Conversion = ')'
at java.base/java.util.Formatter.checkText(Formatter.java:2732)
at java.base/java.util.Formatter.parse(Formatter.java:2718)
at java.base/java.util.Formatter.format(Formatter.java:2655)
at java.base/java.util.Formatter.format(Formatter.java:2609)
at java.base/java.lang.String.format(String.java:2938)
at org.apache.logging.log4j.message.StringFormattedMessage.formatMessage(StringFormattedMessage.java:121)
at org.apache.logging.log4j.message.StringFormattedMessage.getFormattedMessage(StringFormattedMessage.java:89)
at sbt.internal.util.Appender.$anonfun$appendMessage$1(ConsoleAppender.scala:522)
...
```
 2024-05-02 18:31:23 +02:00
adpi2 01d009d354
Merge pull request #7539 from adpi2/sbt2-check-cached-file 
[2.x] Report error if output file of a cached task is not in the output directory
 2024-04-29 16:09:33 +02:00
Adrien Piquerez 1f07c9cff7 Rolling back to macos-12 runner 2024-04-29 13:39:08 +02:00
Adrien Piquerez 2e439cab1e [2.x] report cache errors 
Report a cache error if the output file of a task is not cacheable
 2024-04-24 10:41:56 +02:00
eugene yokota 0c6d7b8f30
Merge pull request #7545 from mazugrin/1.10.x 
Update jansi dep to match the one that's included in the jline dep
 2024-04-18 18:36:21 -04:00
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
Tomasz Godzik 909de1de13
Merge pull request #500 from scala-steward/update/scala-xml-2.3.0 
Update scala-xml to 2.3.0
 2024-04-18 08:51:43 +02:00
Tomasz Godzik 6df7b74ffe
Merge branch 'main' into update/scala-xml-2.3.0 2024-04-17 17:25:51 +02:00
Tomasz Godzik 7dd79a4ff9
Merge pull request #499 from scala-steward/update/scala-collection-compat-2.12.0 
Update scala-collection-compat to 2.12.0
 2024-04-17 17:11:11 +02:00
Scala Steward 9af025d757
Update scala-xml to 2.3.0 2024-04-17 14:24:19 +00:00