Commit Graph

16910 Commits

Author SHA1 Message Date
Eugene Yokota 896dc6220d Mark false-error test pending 2024-12-18 00:43:39 -05:00
Eugene Yokota 8e13a43f48 Zinc 2.0.0-M3 2024-12-18 00:26:30 -05:00
eugene yokota 8732d75a03
Merge pull request #7950 from eed3si9n/wip/merge-1.10.x
[2.x] Merge 1.10.x
2024-12-17 12:55:59 -05:00
Eugene Yokota a420db6d6f source-dependencies/false-error 2024-12-16 22:31:29 -05:00
Eugene Yokota 12db63951b Address reviews 2024-12-16 22:22:33 -05:00
Eugene Yokota 5ece24ad53 Port Make credential tests intransitive 2024-12-16 22:15:18 -05:00
Eugene Yokota 3d86f30837 Merge branch '1.10.x' into wip/merge-1.10.x 2024-12-16 03:20:10 -05:00
eugene yokota 8dcdee8732
Merge pull request #7949 from eed3si9n/wip/path-mapper
Add Mapper that returns VirtualFile based mappings, take 2
2024-12-16 01:01:00 -05:00
Eugene Yokota 28331a7444 Remove Mapper alias 2024-12-16 00:31:07 -05:00
Eugene Yokota 0b744c1ded Port MapperTest 2024-12-16 00:22:29 -05:00
João Ferreira a2b046e0c3 translate mapper to use VirtualFile 2024-12-15 21:55:56 -05:00
João Ferreira f4ae48bf72 move Mapper from sbt/io 2024-12-15 21:55:56 -05:00
João Ferreira 4a588c3fe9 Path.directory scripted test 2024-12-15 21:55:56 -05:00
eugene yokota 6d0b43a2b6
Merge pull request #7948 from eed3si9n/wip/java-home
[2.x] fix: Use JDK path, not JRE path
2024-12-15 21:47:57 -05:00
Eugene Yokota e854909592 Use JAVA_HOME when available 2024-12-15 14:59:02 -05:00
Eugene Yokota 0906b2d7ac fix: Use JDK path, not JRE path
**Problem**
There are a few places where javaHome or java path is set,
using java.home system property. The problem is that it points to JRE,
not JDK, so it would break on Java compilation etc.

**Solution**
If the path ends with jre, go up one directory.
2024-12-15 02:47:35 -05:00
eugene yokota 58446a3cdc
Merge pull request #7941 from eed3si9n/wip/bump-scala
[2.x] ci: Update to Scala 3.6.2
2024-12-11 03:12:14 -05:00
Eugene Yokota 9c124d0b10 Update to Scala 3.6.2 2024-12-10 23:45:01 -05:00
eugene yokota ebee3a86d9
[2.x] fix: concurrency control around Scala 3 compiler (#7938)
**Problem**
Early initialization thread throws ConcurrentModificationException.

**Solution**
This puts wraps it in Retry.
2024-12-10 08:30:17 -05:00
eugene yokota f61100fe87
Merge pull request #7933 from eed3si9n/bport/exists
[1.x] feat: Support glob expressions in scripted
2024-12-09 02:55:22 -05:00
eugene yokota 35eda2e40e
Merge pull request #7932 from eed3si9n/wip/exists
[2.x] feat: Support glob expressions in scripted
2024-12-09 02:55:07 -05:00
Eugene Yokota c4aebf5744 feat: Support glob expressions in scripted
**Problem**
It's currently not easy to write a scripted test that works on
both sbt 1.x and 2.x when you want to write exists test under target.

**Solution**
Since we can only use the file system (and not evaluate Scala version etc)
1. this implements glob expression support in `exists`, `absent`, and `delete`.
2. this also introduces `||` operator that would mean a or b.
2024-12-08 23:40:27 -05:00
Eugene Yokota d21b2d250a feat: Support glob expressions in scripted
**Problem**
It's currently not easy to write a scripted test that works on
both sbt 1.x and 2.x when you want to write exists test under target.

**Solution**
Since we can only use the file system (and not evaluate Scala version etc)
1. this implements glob expression support in `exists`, `absent`, and `delete`.
2. this also introduces `||` operator that would mean a or b.
2024-12-08 23:38:00 -05:00
eugene yokota ffb6770bde
Merge pull request #7930 from jtjeferreira/aggregate-lmCoursierShadedPublishing
add lmCoursierShadedPublishing to allProjects
2024-12-08 17:29:56 -05:00
João Ferreira 3d634804b6
add lmCoursierShadedPublishing to allProjects 2024-12-06 18:12:47 +00:00
eugene yokota fdc03b782a
Merge pull request #7927 from eed3si9n/wip/uri
[2.x] Avoid the use of URL + Replace tuple with proper record type for licenses
2024-12-05 23:37:51 -05:00
Eugene Yokota 0fd2a356b5 inline def apply 2024-12-05 23:21:34 -05:00
eugene yokota f996ad1a01
Merge pull request #7929 from eed3si9n/bport/cla
[1.x] New Scala CLA URL
2024-12-05 22:53:52 -05:00
eugene yokota 36083c9536
Merge branch 'develop' into wip/uri 2024-12-05 22:53:37 -05:00
Eugene Yokota ff4e6d90af New Scala CLA URL 2024-12-05 22:51:16 -05:00
eugene yokota 7f878aa00f
Merge pull request #7928 from eed3si9n/wip/cla
[2.x] New Scala CLA URL
2024-12-05 22:50:41 -05:00
Eugene Yokota 29183c1bdd New Scala CLA URL 2024-12-05 22:49:36 -05:00
Eugene Yokota 11b0231b17 url returns java.net.URI 2024-12-05 01:16:04 -05:00
Eugene Yokota 8bf9ecaba3 Add conversion for backward compatibility 2024-12-05 01:00:06 -05:00
Matthew de Detrich eea840be2c Replace tuple with proper record type for licenses 2024-12-05 00:56:39 -05:00
Eugene Yokota 02c7cf309d Avoid the use of URL
**Problem**
`java.net.URL` calls out to the network to perform `equals`,
so we should remove that from anywhere that can be involved in caching etc.

**Solution**
This changes java.net.URL to java.net.URI in Keys.
2024-12-04 22:12:54 -05:00
eugene yokota 0075b2fd0e
Merge pull request #7925 from eed3si9n/wip/fix-projectref
[2.x] fix: Fix root project detection
2024-12-04 01:32:17 -05:00
Eugene Yokota ac4ba55e9e fix: Fix root project detection
**Problem**
Whether a subproject is root or not is currently detected by
comparing getCanonicalFile against the build base directory.
Problem is that often the root project uses "." as the directory,
and getting the canonical file works ok for the current build,
but it breaks when loading `ProjectRef`.
There might be other bugs related to the root project detection.

**Solution**
This factors out `isRootPath` function that's aware of the build base.

This PR adds the repro test prepared by xuwei-k.
2024-12-02 03:15:35 -05:00
eugene yokota bc69030e58
Merge pull request #7924 from eed3si9n/wip/remove-wconf-cat
[2.x] fix: Remove -Wconf:cat=unused-nowarn:s
2024-12-01 20:00:58 -05:00
Eugene Yokota 56e83977e9 fix: Remove -Wconf:cat=unused-nowarn:s
**Problem**
Currently the following warning shows up while compiling metabuild:

[warn] Failed to parse `-Wconf` configuration: cat=unused-nowarn:s
[warn] unknown category: unused-nowarn

-Wconf:cat=unused-nowarn in general was added as a Scala 2.12 of
falsely warning about pure expression not doing anything in the macro.

**Solution**
We should be able to remove the -Wconf flag in sbt 2.x.
2024-12-01 18:09:38 -05:00
eugene yokota 88f900e522
Merge pull request #7923 from xuwei-k/unused-Dependencies
[2.x] ci: Remove unused dependencies in project/Dependencies.scala
2024-12-01 18:05:47 -05:00
kenji yoshida 0e7ab570bd
remove unused dependencies in project/Dependencies.scala 2024-12-02 07:51:16 +09:00
Eugene Yokota 1b7d451d2a sbt 1.10.6 2024-11-30 01:24:29 -05:00
eugene yokota 8bdcb380f1
Merge pull request #7922 from eed3si9n/wip/bump-zinc
[1.x] Update to Zinc 1.10.5
2024-11-30 01:02:32 -05:00
Eugene Yokota 111eb123fa Call store.clearCache() 2024-11-30 00:51:20 -05:00
Eugene Yokota efe2a83c73 Zinc 1.10.5 2024-11-30 00:05:26 -05:00
eugene yokota 52cf06d80e
Merge pull request #7921 from eed3si9n/wip/bump-io
IO 1.10.2
2024-11-29 21:50:51 -05:00
eugene yokota b7e03605cd
Merge pull request #7920 from eed3si9n/wip/bump-coursier
lm-coursier 2.1.6
2024-11-29 21:48:55 -05:00
Eugene Yokota fc5758d05c IO 1.10.2 2024-11-29 21:39:42 -05:00
Eugene Yokota 57d134829b Mark ignoreScalaLibrary pending 2024-11-29 21:37:27 -05:00