Commit Graph

12418 Commits

Author SHA1 Message Date
Eugene Yokota 860e170b6c sbt 1.10.1 2024-08-07 23:52:33 -04:00
eugene yokota d7cbd259b8
Merge branch '1.10.x' into allow-spaces-in-build-properties 2024-08-07 18:51:44 -04:00
eugene yokota d5a4382e68
Merge pull request #7605 from SlowBrainDude/use-common-scala2-version-for-sbtn 2024-07-20 11:22:04 -04:00
eugene yokota 50f6659a08
Merge pull request #7606 from SlowBrainDude/dev-doc-update 2024-07-20 11:21:15 -04:00
SlowBrainDude 242b8686e8 Note in DEV docs on supported build time JDK dependency 2024-07-20 01:20:45 +02:00
SlowBrainDude 317e991b87 Using common Scala 2.12 version for the sbtn subproject
The old, hardcoded Scala 2.12 version previously used for the sbtn
project (as a kind of workaround?) was no longer supported by Scala IDE tooling.
But sbtn builds just fine when using the current global setting for the Scala 2.12
version, so this commit removes the hardcoded version.
2024-07-19 23:30:32 +02:00
eugene yokota 1d4f7257a4
Merge pull request #7598 from eed3si9n/wip/bump_launcher
Launcher 1.4.3
2024-07-07 17:45:53 -04:00
Eugene Yokota c42766a123 Launcher 1.4.3 2024-07-07 17:23:25 -04:00
eugene yokota 334ac55c85
Merge pull request #7597 from eed3si9n/wip/bump_lm
Bump to lm 1.10.1
2024-07-07 16:30:58 -04:00
Eugene Yokota d7a0db2334 Lm 1.10.1 2024-07-07 15:50:55 -04:00
eugene yokota af127c6630
Merge pull request #7596 from eed3si9n/wip/bump_zinc
Zinc 1.10.1
2024-07-07 15:18:19 -04:00
Eugene Yokota c2009716e1 Zinc 1.10.1 2024-07-07 14:22:47 -04:00
eugene yokota 0d1dc762a7
Merge pull request #7595 from eed3si9n/wip/sjson-new
sjson-new 0.10.1
2024-07-06 17:40:55 -04:00
Eugene Yokota 70b829ec54 sbt 1.10.0 2024-07-06 16:43:13 -04:00
Eugene Yokota e32618529d Scala 2.13.14 2024-07-06 16:42:53 -04:00
Eugene Yokota a0e4d22a6c sjson-new 0.10.1 2024-07-06 16:24:28 -04:00
Michael Sesterhenn 087770f5e0 Use built-in bash string trimming instead of sed. 2024-06-21 11:21:15 -05:00
Michael Sesterhenn 678fe9d204 Trim spaces around k and v in build.properties to be more forgiving. 2024-06-20 13:07:44 -05:00
Eugene Yokota 3711d9000b 2.0.0-alpha11-SNAPSHOT 2024-06-16 14:00:08 -04:00
eugene yokota e6db18f5c4
Merge pull request #7554 from sbt/wip/merge-1.10.x
[2.x] merge 1.10.x
2024-06-09 22:38:04 -04:00
Eugene Yokota 40d7c59c54 Fix scripted tests 2024-06-09 22:21:25 -04:00
Eugene Yokota 862f4c4bca macos-12 2024-06-09 18:00:27 -04:00
Eugene Yokota 4752e180fd Update lm 2024-06-09 17:56:17 -04:00
Adrien Piquerez 3ec8bd2269 Fix fetching Scala 2.13.12 bridges 2024-06-06 17:41:20 +02:00
Adrien Piquerez 299f7b4543 Fix ResponseTest 2024-06-06 10:36:29 +02:00
Adrien Piquerez 8b691f942e Fix BuildServerTest 2024-06-06 10:36:29 +02:00
Adrien Piquerez 68f787c474 Disable twirl tests in BuildServerTest 2024-06-06 10:36:29 +02:00
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
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
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
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