Commit Graph

17940 Commits

Author SHA1 Message Date
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
Tomasz Godzik 5610ce56d6
Merge pull request #509 from scala-steward/update/sbt-1.10.1
Update sbt, scripted-plugin to 1.10.1
2024-07-10 17:47:35 +02:00
Scala Steward 881e0e424e
Update sbt, scripted-plugin to 1.10.1 2024-07-10 14:18:35 +00:00
adpi2 cc3ed470c7
Merge pull request #443 from jtjeferreira/avoid-java-net-URL-3
Avoid java.net.URL
2024-07-09 14:49:31 +02:00
eugene yokota 2fc6b2c477
Merge pull request #506 from scala-steward/update/scalatest-3.2.19
Update scalatest to 3.2.19
2024-07-09 01:42:58 -04:00
eugene yokota 9ffddd01c4
Merge pull request #504 from scala-steward/update/sbt-1.10.0
Update sbt, scripted-plugin to 1.10.0
2024-07-09 00:50:23 -04:00
eugene yokota 1af0e0f2dc
Merge pull request #508 from eed3si9n/wip/scala_2.12
Update to Scala 2.12.19 + 2.13.14
2024-07-09 00:21:58 -04:00
Eugene Yokota ee16e46405 Scala 2.13.14 2024-07-09 00:00:00 -04:00
Eugene Yokota 6757b15acd Update to Scala 2.12.19 2024-07-08 23:55:59 -04:00
eugene yokota 99ab0a8af2
Merge pull request #503 from scala-steward/update/coursier-2.1.10
Update coursier, ... to 2.1.10
2024-07-08 18:47:52 -04:00
eugene yokota 2dba333942
Merge pull request #507 from raboof/resolve-inheritence-in-update-report
Resolve license inheritence in update report
2024-07-08 17:55:48 -04: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 8d71f66997
Merge pull request #445 from eed3si9n/wip/githubactions
Update GitHub Actions
2024-07-06 17:44:35 -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 3b3b155d1a Relax the test 2024-07-06 17:39:32 -04:00
Eugene Yokota 598be45e2c Update GitHub Actions 2024-07-06 17:32:35 -04:00
João Ferreira 765740c066
upgrade sbt-scalafmt (#440)
Co-authored-by: eugene yokota <eed3si9n@gmail.com>
2024-07-06 17:27:19 -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
Arnout Engelen ed2cae987c
Resolve license inheritence in update report
In addition to the unit test, tested by running the scripted
tests on the `use-update` branch of `sbt-license-report` at
https://github.com/sbt/sbt-license-report/pull/123
2024-07-06 21:18:10 +02:00
eugene yokota e63b6cce7d
Merge pull request #444 from desbo/fix-backslash-escaping
Preserve backslashes in `expandMavenSettings`
2024-06-30 21:40:15 -04:00
Sam Desborough 649b6dffc2 Preserve backslashes in `expandMavenSettings`
We use `expandMavenSettings` to turn environment variable expressions
in `settings.xml` into their actual values.

Before this change, if an environment variable value contained
backslashes, they would have been treated as escape characters by
`Regex.replaceAllIn` and removed from the returned string. This caused
an issue when using backslashes for Windows paths.
2024-06-28 15:03:17 +01:00
Scala Steward e132554133
Update scalatest to 3.2.19 2024-06-24 12:53:55 +00: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
João Ferreira 861b8aa792 remove a few more java.net.URL 2024-06-17 22:18:05 +01:00
João Ferreira cd393bb318 ModuleInfo 2024-06-17 22:18:05 +01:00
João Ferreira b00e242744 ScmInfo 2024-06-17 22:18:05 +01:00
João Ferreira 03f0288ae6 Developer 2024-06-17 22:18:05 +01:00
João Ferreira d078dc4772 Artifact 2024-06-17 22:18:05 +01: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
eugene yokota f4f3467401
Merge pull request #3 from eed3si9n/wip/pr1
Merge wip/sbt-2.x-temp and origin/main into wip/sbt-2.x, take 2
2024-06-09 15:19:01 -04:00
Eugene Yokota 8f5d03b5a7 Comment out tests 2024-06-09 15:13:52 -04:00
Eugene Yokota 26fe5efeb1 Skip mima 2024-06-09 15:09:25 -04:00
Adrien Piquerez 3ec8bd2269 Fix fetching Scala 2.13.12 bridges 2024-06-06 17:41:20 +02:00
Adrien Piquerez c7bd9ffc63 Fix shading 2024-06-06 10:44:45 +02:00