luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,332 Commits 29 Branches 312 Tags 69 MiB
Commit Graph

12332 Commits

Author SHA1 Message Date
Adrien Piquerez 64a8d5ff31 Fix Defaults 2024-06-06 10:36:29 +02:00
Adrien Piquerez 492cd2c091 Fix compilation 2024-06-06 10:36:29 +02:00
Adrien Piquerez 1034fb1859 Bump versions 2024-06-06 10:36:29 +02: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 7529eefda6 IO 1.10.0 2024-05-05 17:21:40 -04: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
Adrien Piquerez 7c51ba2f64 Revert "Use fileConverter in cacheStore" 2024-04-17 09:30:44 +02:00
Adrien Piquerez 1765fde1ba Revert "Fix ActionCacheTest" 
This reverts commit 763383cadb.
 2024-04-17 09:01:29 +02:00
adpi2 771b1d3e84
Merge pull request #7538 from adpi2/sbt2-fix-force-update-period 
[2.x] Fix `dependency-management/force-update-period`
 2024-04-16 16:24:50 +02:00
Adrien Piquerez 1472ac287f [2.x] Fix dependency-management/force-update-period 2024-04-16 15:23:40 +02:00
eugene yokota facd7ab64e
Merge pull request #7525 from eed3si9n/wip/remoteapis 
[2.x] Remote caching support
 2024-04-15 18:28:46 -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
Adrien Piquerez 763383cadb Fix ActionCacheTest 2024-04-15 10:30:38 +02: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
eugene yokota 9bc0ba5f5b Update util-cache/src/main/scala/sbt/util/ActionCacheStore.scala 
Co-authored-by: adpi2 <adrien.piquerez@gmail.com>
 2024-04-14 14:58:13 -04:00
eugene yokota 0e67131beb
Update main/src/main/scala/sbt/Defaults.scala 
Co-authored-by: adpi2 <adrien.piquerez@gmail.com>
 2024-04-11 10:45:51 -04:00
Eugene Yokota 967d4a08b3 More robust against the lack of companion? 2024-04-11 13:55:29 +02:00
Eugene Yokota 33d50e2f47 Success log change fix 2024-04-11 13:55:29 +02:00
Eugene Yokota 86cf7c3a0c Remote caching support 
This implements Bazel-compat remote caching support via a plugin.
 2024-04-11 13:55:29 +02: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
adpi2 a5295ce80e
Merge pull request #7522 from adpi2/sbt2-fix-scripted 
[2.x] fix scripted
 2024-04-10 16:33:59 +02:00
Adrien Piquerez 8865565004 Fix classloader-cache/resources 2024-04-10 15:32:50 +02:00
Adrien Piquerez eda67a05fc Use fileConverter in cacheStore 
Otherwise the store cannot sync files that are not in the out folder.
 2024-04-09 16:09:44 +02:00
Adrien Piquerez 9e6612a3f8 Fix hashing of incrementalCompile 2024-04-09 15:33:22 +02:00
Adrien Piquerez 8870cb6a82 Fix Java 8 compat 2024-04-09 15:33:22 +02:00
Adrien Piquerez ab1aa6d001 Fix todos in actions/compile-clean 2024-04-09 15:33:22 +02:00
Adrien Piquerez e1cf43c6bd Add jar file to compileOutputs 2024-04-09 15:33:22 +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