Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
176 changes: 2 additions & 174 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -168,177 +168,6 @@ jobs:
run: sbt ";scala3-bootstrapped-new/compile ;scala3-compiler-bootstrapped-new/test"
shell: cmd

community_build_a:
runs-on: [self-hosted, Linux]
container:
image: lampepfl/dotty:2024-10-18
options: --cpu-shares 4096
volumes:
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
- ${{ github.workspace }}/../../cache/general:/root/.cache
if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
|| github.event_name == 'push'
|| github.event_name == 'merge_group'
|| (
github.event_name == 'pull_request'
&& !contains(github.event.pull_request.body, '[skip ci]')
&& !contains(github.event.pull_request.body, '[skip community_build]')
&& !contains(github.event.pull_request.body, '[skip community_build_a]')
)
|| (
github.event_name == 'workflow_dispatch'
&& github.repository == 'scala/scala3'
)"

steps:
##############################################################################################
## WARNING: DO NOT CHANGE THE JAVA VERSION HERE. SCALA 3.8.0+ IS DISTRIBUTED USING JAVA 17. ##
##############################################################################################
- name: Set JDK 17 as default
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
- name: Reset existing repo
run: |
git config --global --add safe.directory $GITHUB_WORKSPACE
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true

- name: Checkout cleanup script
uses: actions/checkout@v5

- name: Cleanup
run: .github/workflows/cleanup.sh

- name: Git Checkout
uses: actions/checkout@v5

- name: Add SBT proxy repositories
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true

- name: Test
run: |
git config --global --add safe.directory $GITHUB_WORKSPACE
git submodule sync
git submodule update --init --recursive --jobs 7
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestA"

- name: Show dependency tracking file
if: ${{ always() }}
run: cat community-build/dotty-community-build-deps || true

community_build_b:
runs-on: [self-hosted, Linux]
container:
image: lampepfl/dotty:2024-10-18
options: --cpu-shares 4096
volumes:
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
- ${{ github.workspace }}/../../cache/general:/root/.cache
if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
|| github.event_name == 'push'
|| github.event_name == 'merge_group'
|| (
github.event_name == 'pull_request'
&& !contains(github.event.pull_request.body, '[skip ci]')
&& !contains(github.event.pull_request.body, '[skip community_build]')
&& !contains(github.event.pull_request.body, '[skip community_build_b]')
)
|| (
github.event_name == 'workflow_dispatch'
&& github.repository == 'scala/scala3'
)"

steps:
##############################################################################################
## WARNING: DO NOT CHANGE THE JAVA VERSION HERE. SCALA 3.8.0+ IS DISTRIBUTED USING JAVA 17. ##
##############################################################################################
- name: Set JDK 17 as default
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
- name: Reset existing repo
run: |
git config --global --add safe.directory $GITHUB_WORKSPACE
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true

- name: Checkout cleanup script
uses: actions/checkout@v5

- name: Cleanup
run: .github/workflows/cleanup.sh

- name: Git Checkout
uses: actions/checkout@v5

- name: Add SBT proxy repositories
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true

- name: Test
run: |
git config --global --add safe.directory $GITHUB_WORKSPACE
git submodule sync
git submodule update --init --recursive --jobs 7
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestB"

- name: Show dependency tracking file
if: ${{ always() }}
run: cat community-build/dotty-community-build-deps || true

community_build_c:
runs-on: [self-hosted, Linux]
container:
image: lampepfl/dotty:2024-10-18
options: --cpu-shares 4096
volumes:
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
- ${{ github.workspace }}/../../cache/general:/root/.cache
if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
|| github.event_name == 'push'
|| github.event_name == 'merge_group'
|| (
github.event_name == 'pull_request'
&& !contains(github.event.pull_request.body, '[skip ci]')
&& !contains(github.event.pull_request.body, '[skip community_build]')
&& !contains(github.event.pull_request.body, '[skip community_build_c]')
)
|| (
github.event_name == 'workflow_dispatch'
&& github.repository == 'scala/scala3'
)"

steps:
##############################################################################################
## WARNING: DO NOT CHANGE THE JAVA VERSION HERE. SCALA 3.8.0+ IS DISTRIBUTED USING JAVA 17. ##
##############################################################################################
- name: Set JDK 17 as default
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
- name: Reset existing repo
run: |
git config --global --add safe.directory $GITHUB_WORKSPACE
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true

- name: Checkout cleanup script
uses: actions/checkout@v5

- name: Cleanup
run: .github/workflows/cleanup.sh

- name: Git Checkout
uses: actions/checkout@v5

- name: Add SBT proxy repositories
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true

- name: Test
run: |
git config --global --add safe.directory $GITHUB_WORKSPACE
git submodule sync
git submodule update --init --recursive --jobs 7
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestC"

- name: Show dependency tracking file
if: ${{ always() }}
run: cat community-build/dotty-community-build-deps || true

publish_release:
permissions:
contents: write # for GH CLI to create a release
Expand All @@ -350,9 +179,8 @@ jobs:
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
- ${{ github.workspace }}/../../cache/general:/root/.cache
needs: [test, community_build_a, community_build_b, community_build_c, build-sdk-package, build-msi-package]
if: "github.event_name == 'push'
&& startsWith(github.event.ref, 'refs/tags/')"
needs: [test, build-sdk-package, build-msi-package]
if: "github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')"

env:
RELEASEBUILD: yes
Expand Down
55 changes: 55 additions & 0 deletions .github/workflows/stdlib.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -599,3 +599,58 @@ jobs:
- uses: sbt/setup-sbt@v1
- name: Run SBT scripted tests
run: ./project/scripts/sbt scala3-bootstrapped-new/scripted

community_build_a:
runs-on: ubuntu-latest
steps:
- name: Checkout cleanup script
uses: actions/checkout@v5
with:
submodules: true
- name: Set up JDK 17
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: 17
cache: 'sbt'
- uses: sbt/setup-sbt@v1
- name: Run Community Build A
run: |
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestA"

community_build_b:
runs-on: ubuntu-latest
steps:
- name: Checkout cleanup script
uses: actions/checkout@v5
with:
submodules: true
- name: Set up JDK 17
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: 17
cache: 'sbt'
- uses: sbt/setup-sbt@v1
- name: Run Community Build B
run: |
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestB"


community_build_c:
runs-on: ubuntu-latest
steps:
- name: Checkout cleanup script
uses: actions/checkout@v5
with:
submodules: true
- name: Set up JDK 17
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: 17
cache: 'sbt'
- uses: sbt/setup-sbt@v1
- name: Run Community Build C
run: |
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestC"
8 changes: 4 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
url = https://github.com/dotty-staging/intent
[submodule "community-build/community-projects/utest"]
path = community-build/community-projects/utest
url = https://github.com/dotty-staging/utest.git
url = https://github.com/dotty-staging/utest-new.git
[submodule "community-build/community-projects/os-lib"]
path = community-build/community-projects/os-lib
url = https://github.com/dotty-staging/os-lib.git
Expand Down Expand Up @@ -90,9 +90,9 @@
[submodule "community-build/community-projects/PPrint"]
path = community-build/community-projects/PPrint
url = https://github.com/dotty-staging/PPrint.git
[submodule "community-build/community-projects/requests-scala"]
path = community-build/community-projects/requests-scala
url = https://github.com/dotty-staging/requests-scala.git
[submodule "community-build/community-projects/requests"]
path = community-build/community-projects/requests
url = https://github.com/dotty-staging/requests.git
[submodule "community-build/community-projects/cats-effect-3"]
path = community-build/community-projects/cats-effect-3
url = https://github.com/dotty-staging/cats-effect.git
Expand Down
2 changes: 1 addition & 1 deletion community-build/community-projects/Monocle
Submodule Monocle updated 173 files
2 changes: 1 addition & 1 deletion community-build/community-projects/cask
Submodule cask updated 130 files
2 changes: 1 addition & 1 deletion community-build/community-projects/fs2
Submodule fs2 updated 342 files
2 changes: 1 addition & 1 deletion community-build/community-projects/os-lib
Submodule os-lib updated 101 files
1 change: 1 addition & 0 deletions community-build/community-projects/requests
Submodule requests added at dd1768
1 change: 0 additions & 1 deletion community-build/community-projects/requests-scala
Submodule requests-scala deleted from 8e4a40
2 changes: 1 addition & 1 deletion community-build/community-projects/scala-collection-compat
Submodule scala-collection-compat updated 83 files
+3 −0 .git-blame-ignore-revs
+6 −0 .github/dependabot.yml
+15 −24 .github/workflows/ci.yml
+11 −0 .github/workflows/cla.yml
+6 −3 .github/workflows/release.yml
+1 −1 .scalafmt.conf
+3 −3 NOTICE
+10 −10 README.md
+1 −1 binary-compat/new/src/main/scala/org.example/Lib.scala
+1 −1 binary-compat/old/src/main/scala/org.example/Lib.scala
+1 −1 binary-compat/test/src/test/scala/BinaryCompaTest.scala
+22 −5 build.sbt
+1 −1 compat/jsNative/src/main/scala-2.11_2.12/scala/jdk/OptionConverters.scala
+1 −1 compat/jvm/src/main/scala-2.11_2.12/scala/jdk/OptionConverters.scala
+1 −1 compat/jvm/src/main/scala-2.11_2.12/scala/jdk/OptionShape.scala
+1 −1 compat/src/main/scala-2.11/scala/annotation/nowarn.scala
+1 −1 compat/src/main/scala-2.11/scala/collection/compat/package.scala
+1 −1 compat/src/main/scala-2.11/scala/jdk/javaapi/CollectionConverters.scala
+269 −237 compat/src/main/scala-2.11/scala/util/Using.scala
+1 −1 compat/src/main/scala-2.11_2.12/scala/annotation/unused.scala
+1 −1 compat/src/main/scala-2.11_2.12/scala/collection/compat/BuildFrom.scala
+1 −1 compat/src/main/scala-2.11_2.12/scala/collection/compat/CompatImpl.scala
+2 −2 compat/src/main/scala-2.11_2.12/scala/collection/compat/PackageShared.scala
+1 −1 compat/src/main/scala-2.11_2.12/scala/collection/compat/RandomExtensions.scala
+1 −1 compat/src/main/scala-2.11_2.12/scala/collection/compat/StringParsers.scala
+1 −1 compat/src/main/scala-2.11_2.12/scala/collection/compat/immutable/ArraySeq.scala
+1 −1 compat/src/main/scala-2.11_2.12/scala/collection/compat/immutable/LazyList.scala
+1 −1 compat/src/main/scala-2.11_2.12/scala/jdk/CollectionConverters.scala
+1 −1 compat/src/main/scala-2.11_2.12/scala/util/ChainingOps.scala
+1 −1 compat/src/main/scala-2.11_2.12/scala/util/control/compat/ControlThrowable.scala
+1 −1 compat/src/main/scala-2.11_2.12/scala/util/matching/compat/package.scala
+1 −1 compat/src/main/scala-2.12/scala/collection/compat/package.scala
+1 −1 compat/src/main/scala-2.12/scala/jdk/javaapi/CollectionConverters.scala
+269 −237 compat/src/main/scala-2.12/scala/util/Using.scala
+1 −1 compat/src/main/scala-2.13/scala/collection/compat/immutable/package.scala
+1 −1 compat/src/main/scala-2.13/scala/collection/compat/package.scala
+1 −1 compat/src/main/scala-2.13/scala/util/control/compat/package.scala
+1 −1 compat/src/main/scala-2.13/scala/util/matching/compat/package.scala
+12 −0 compat/src/test/scala-2.11_2.12/test/scala/collection/ToConserveTest.scala
+12 −0 compat/src/test/scala-js/test/scala/jdk/OptionConvertersTest.scala
+1 −1 compat/src/test/scala-jvm/test/scala/collection/LazyListGCTest.scala
+12 −0 compat/src/test/scala-jvm/test/scala/collection/StringParsersJVMTest.scala
+12 −0 compat/src/test/scala-jvm/test/scala/jdk/OptionConvertersJVMTest.scala
+12 −0 compat/src/test/scala-jvm/test/scala/jdk/javaapi/CollectionConvertersTest.java
+12 −0 compat/src/test/scala-jvm/test/scala/jdk/javaapi/TestObjects.scala
+169 −218 compat/src/test/scala-jvm/test/scala/util/UsingTest.scala
+1 −1 compat/src/test/scala/scala/jdk/CollectionConvertersTest.scala
+1 −1 compat/src/test/scala/scala/util/ChainingOpsTest.scala
+1 −1 compat/src/test/scala/scala/util/control/compat/ControlThrowableTest.scala
+1 −1 compat/src/test/scala/scala/util/matching/compat/RegexOpsTest.scala
+1 −1 compat/src/test/scala/test/scala/collection/ArraySeqTest.scala
+1 −1 compat/src/test/scala/test/scala/collection/AssertThrown.scala
+1 −1 compat/src/test/scala/test/scala/collection/BuildFromTest.scala
+1 −1 compat/src/test/scala/test/scala/collection/CollectionTest.scala
+1 −1 compat/src/test/scala/test/scala/collection/FactoryTest.scala
+1 −1 compat/src/test/scala/test/scala/collection/LazyListLazinessTest.scala
+1 −1 compat/src/test/scala/test/scala/collection/LazyListTest.scala
+1 −1 compat/src/test/scala/test/scala/collection/LazyZipTest.scala
+1 −1 compat/src/test/scala/test/scala/collection/MapTest.scala
+1 −1 compat/src/test/scala/test/scala/collection/MinMaxOptionTest.scala
+1 −1 compat/src/test/scala/test/scala/collection/NoImportTest.scala
+1 −1 compat/src/test/scala/test/scala/collection/OptionTest.scala
+1 −1 compat/src/test/scala/test/scala/collection/QueueTest.scala
+1 −1 compat/src/test/scala/test/scala/collection/SortedTest.scala
+1 −1 compat/src/test/scala/test/scala/collection/StreamTest.scala
+12 −0 compat/src/test/scala/test/scala/collection/StringParsersTest.scala
+1 −1 compat/src/test/scala/test/scala/collection/ViewTest.scala
+1 −1 compat/src/test/scala/test/scala/util/RandomTest.scala
+1 −1 project/build.properties
+7 −4 project/plugins.sbt
+1 −1 scalafix/data/src/main/scala/fix/conversions/JavaConversionsDataSrc.scala
+1 −1 scalafix/output213-failure/src/main/scala/fix/CanBuildFromNegSrc213Failure.scala
+1 −1 scalafix/rules/src/main/scala/scala/fix/collection/Breakout.scala
+1 −1 scalafix/rules/src/main/scala/scala/fix/collection/CanBuildFrom.scala
+1 −1 scalafix/rules/src/main/scala/scala/fix/collection/Collection213CrossCompat.scala
+1 −1 scalafix/rules/src/main/scala/scala/fix/collection/Collection213Experimental.scala
+1 −1 scalafix/rules/src/main/scala/scala/fix/collection/Collection213Roughly.scala
+1 −1 scalafix/rules/src/main/scala/scala/fix/collection/Collection213Upgrade.scala
+1 −1 scalafix/rules/src/main/scala/scala/fix/collection/PlaygroundRule.scala
+1 −1 scalafix/rules/src/main/scala/scala/fix/collection/Stable212Base.scala
+1 −1 scalafix/rules/src/main/scala/scala/fix/collection/TypeMatcher.scala
+1 −1 scalafix/rules/src/main/scala/scala/fix/collection/package.scala
+1 −1 scalafix/tests/src/test/scala/fix/ScalafixTests.scala
2 changes: 1 addition & 1 deletion community-build/community-projects/spire
Submodule spire updated 62 files
+22 −0 .git-blame-ignore-revs
+224 −97 .github/workflows/ci.yml
+1 −1 .scalafmt.conf
+0 −6 CODE_OF_CONDUCT.md
+34 −33 benchmark/src/main/scala/spire/benchmark/ComplexAddBenchmarks.scala
+69 −54 benchmark/src/main/scala/spire/benchmark/SelectionBenchmarks.scala
+12 −45 benchmark/src/main/scala/spire/benchmark/SieveBenchmark.scala
+137 −90 benchmark/src/main/scala/spire/benchmark/SortingBenchmarks.scala
+19 −43 build.sbt
+10 −7 core/src/main/scala-2/spire/syntax/Syntax.scala
+10 −7 core/src/main/scala-3/spire/syntax/Syntax.scala
+2 −2 core/src/main/scala/spire/algebra/free/FreeAbGroup.scala
+2 −2 core/src/main/scala/spire/math/Algebraic.scala
+1 −1 core/src/main/scala/spire/math/FastComplex.scala
+4 −4 core/src/main/scala/spire/math/Interval.scala
+1 −1 core/src/main/scala/spire/math/Merging.scala
+1 −1 core/src/main/scala/spire/math/Quaternion.scala
+5 −4 core/src/main/scala/spire/math/Rational.scala
+1 −1 core/src/main/scala/spire/math/SafeLong.scala
+32 −32 core/src/main/scala/spire/math/Selection.scala
+1 −4 core/src/main/scala/spire/math/poly/Term.scala
+1 −1 core/src/main/scala/spire/optional/Perm.scala
+1 −1 core/src/main/scala/spire/random/Ziggurat.scala
+1 −1 core/src/main/scala/spire/random/rng/Utils.scala
+1 −1 core/src/main/scala/spire/std/bigInteger.scala
+1 −2 core/src/main/scala/spire/std/map.scala
+1 −0 core/src/main/scala/spire/syntax/package.scala
+8 −5 docs/guide.md
+7 −7 docs/index.md
+19 −17 examples/src/main/scala/spire/example/endoring.scala
+1 −1 examples/src/main/scala/spire/example/infset.scala
+7 −6 extras/src/main/scala/spire/math/extras/interval/IntervalSeq.scala
+4 −4 extras/src/main/scala/spire/math/extras/interval/IntervalTrie.scala
+2 −2 laws/src/main/scala/spire/laws/LatticeLaws.scala
+11 −10 laws/src/main/scala/spire/laws/LogicLaws.scala
+2 −5 laws/src/main/scala/spire/laws/RingLaws.scala
+9 −6 laws/src/main/scala/spire/laws/gen.scala
+0 −0 platform/js-native/src/main/scala/spire/Platform.scala
+1 −1 project/build.properties
+0 −1 project/build.sbt
+6 −11 project/plugins.sbt
+6 −6 tests/shared/src/test/scala/spire/SyntaxScalaCheckSuite.scala
+1 −1 tests/shared/src/test/scala/spire/algebra/RingSuite.scala
+3 −1 tests/shared/src/test/scala/spire/laws/LawSuite.scala
+7 −1 tests/shared/src/test/scala/spire/math/AlgebraicScalaCheckSuite.scala
+43 −43 tests/shared/src/test/scala/spire/math/IntervalSyntaxSuite.scala
+8 −8 tests/shared/src/test/scala/spire/math/JetSuite.scala
+10 −4 tests/shared/src/test/scala/spire/math/PolynomialScalaCheckSuite.scala
+5 −5 tests/shared/src/test/scala/spire/math/PolynomialSuite.scala
+6 −0 tests/shared/src/test/scala/spire/math/QuaternionScalaCheckSuite.scala
+6 −0 tests/shared/src/test/scala/spire/math/RationalSuite.scala
+8 −26 tests/shared/src/test/scala/spire/math/RealScalaCheckSuite.scala
+11 −13 tests/shared/src/test/scala/spire/math/SafeLongScalaCheckSuite.scala
+3 −3 tests/shared/src/test/scala/spire/math/SafeLongSuite.scala
+1 −1 tests/shared/src/test/scala/spire/math/extras/FixedPointScalaCheckSuite.scala
+10 −10 tests/shared/src/test/scala/spire/math/extras/interval/IntervalSeqSuite.scala
+2 −2 tests/shared/src/test/scala/spire/math/interval/BoundScalaCheckSuite.scala
+6 −0 tests/shared/src/test/scala/spire/math/prime/FactorsScalaCheckSuite.scala
+0 −13 tests/shared/src/test/scala/spire/syntax/CforSuite.scala
+17 −17 tests/shared/src/test/scala/spire/syntax/LiteralsSuite.scala
+1 −2 tests/shared/src/test/scala/spire/util/OptSuite.scala
+1 −1 util/src/main/scala/spire/util/Opt.scala
2 changes: 1 addition & 1 deletion community-build/community-projects/upickle
Submodule upickle updated 151 files
2 changes: 1 addition & 1 deletion community-build/community-projects/utest
Submodule utest updated 95 files
+17 −25 .github/workflows/actions.yml
+1 −0 .gitignore
+0 −1 .mill-version
+21 −0 LICENSE
+158 −0 build.mill
+0 −133 build.sc
+ docs/Golden.png
+ docs/PrettyPrint.png
+ docs/Splash.png
+314 −30 mill
+374 −168 readme.md
+0 −7 utest/js/test/src-2/test/utest/TestUtil.scala
+0 −7 utest/js/test/src-3/test/utest/TestUtil.scala
+0 −16 utest/jvm/test/src/test/utest/TestUtil.scala
+0 −7 utest/native/test/src-2/test/utest/TestUtil.scala
+0 −7 utest/native/test/src-3/test/utest/TestUtil.scala
+36 −0 utest/src-2-jvm/utest/framework/GoldenSpanMacros.scala
+1 −4 utest/src-2-jvm/utest/framework/PlatformShims.scala
+0 −5 utest/src-2.11/utest/asserts/MacroCompat.scala
+4 −1 utest/src-2/utest/Tests.scala
+16 −15 utest/src-2/utest/asserts/AssertsVersionSpecific.scala
+4 −4 utest/src-2/utest/asserts/ParallelVersionSpecific.scala
+30 −3 utest/src-2/utest/asserts/Tracer.scala
+1 −1 utest/src-3-jvm/utest/framework/EnableReflectiveInstantiation.java
+24 −0 utest/src-3-jvm/utest/framework/GoldenSpanMacros.scala
+2 −5 utest/src-3-jvm/utest/framework/PlatformShims.scala
+49 −2 utest/src-3-jvm/utest/framework/PortableScalaReflectExcerpts.scala
+41 −30 utest/src-3/utest/TestBuilder.scala
+16 −13 utest/src-3/utest/asserts/AssertsVersionSpecific.scala
+0 −21 utest/src-3/utest/asserts/Parallel.scala
+21 −0 utest/src-3/utest/asserts/ParallelVersionSpecific.scala
+39 −10 utest/src-3/utest/asserts/Tracer.scala
+5 −0 utest/src-js/utest/asserts/AssertsPlatformSpecific.scala
+6 −4 utest/src-js/utest/framework/PlatformShims.scala
+9 −0 utest/src-js/utest/framework/TestSuitePlatformSpecific.scala
+65 −0 utest/src-jvm/utest/asserts/AssertsPlatformSpecific.scala
+95 −0 utest/src-jvm/utest/framework/GoldenFix.scala
+4 −3 utest/src-jvm/utest/framework/PlatformShims.scala
+21 −0 utest/src-jvm/utest/framework/TestSuitePlatformSpecific.scala
+5 −0 utest/src-native/utest/asserts/AssertsPlatformSpecific.scala
+6 −12 utest/src-native/utest/framework/PlatformShims.scala
+10 −0 utest/src-native/utest/framework/TestSuitePlatformSpecific.scala
+123 −6 utest/src/utest/Errors.scala
+7 −5 utest/src/utest/TestRunner.scala
+3 −3 utest/src/utest/TestSuite.scala
+27 −1 utest/src/utest/Tests.scala
+4 −3 utest/src/utest/asserts/Asserts.scala
+3 −3 utest/src/utest/asserts/Parallel.scala
+9 −9 utest/src/utest/framework/DefaultFormatters.scala
+70 −46 utest/src/utest/framework/Formatter.scala
+12 −4 utest/src/utest/framework/Model.scala
+3 −0 utest/src/utest/framework/Tree.scala
+0 −49 utest/src/utest/package.scala
+38 −26 utest/src/utest/runner/BaseRunner.scala
+6 −0 utest/src/utest/runner/Fingerprint.scala
+1 −1 utest/src/utest/runner/Framework.scala
+6 −2 utest/src/utest/runner/MasterRunner.scala
+2 −2 utest/src/utest/runner/Task.scala
+0 −927 utest/src/utest/ufansi/Fansi.scala
+0 −22 utest/test/src-2.11/test/utest/Scala211Tests.scala
+14 −2 utest/test/src-2.12-jvm/test/utest/FormatterTests.scala
+3 −3 utest/test/src-2.12/test/utest/LazyValTest.scala
+28 −27 utest/test/src-2/test/utest/AssertsTestsVersionSpecific.scala
+9 −10 utest/test/src-3/test/utest/AssertsTestsVersionSpecific.scala
+0 −0 utest/test/src-js/test/utest/DefaultParamsTests.scala
+0 −0 utest/test/src-js/test/utest/Scheduler.scala
+101 −0 utest/test/src-jvm/test/utest/GoldenFixTests.scala
+152 −0 utest/test/src-jvm/test/utest/LineNumbersTests.scala
+38 −27 utest/test/src-jvm/test/utest/Parallel.scala
+0 −0 utest/test/src-jvm/test/utest/Scheduler.scala
+76 −0 utest/test/src-jvm/test/utest/SelectorTest.scala
+0 −0 utest/test/src-native/test/utest/Scheduler.scala
+1 −1 utest/test/src/test/utest/AfterEachOnFailureTest.scala
+177 −45 utest/test/src/test/utest/AssertsTests.scala
+3 −3 utest/test/src/test/utest/BeforeAfterAllFailureTest.scala
+1 −1 utest/test/src/test/utest/BeforeAfterEachFailureTests.scala
+1 −1 utest/test/src/test/utest/ByNameTests.scala
+1 −1 utest/test/src/test/utest/DisablePrint2Tests.scala
+2 −1 utest/test/src/test/utest/DisablePrintTests.scala
+1 −1 utest/test/src/test/utest/FrameworkAsyncTests.scala
+5 −5 utest/test/src/test/utest/FrameworkTests.scala
+2 −2 utest/test/src/test/utest/FutureCrashTest.scala
+17 −0 utest/test/src/test/utest/FutureTest.scala
+5 −30 utest/test/src/test/utest/Main.scala
+44 −0 utest/test/src/test/utest/MergeTestsTest.scala
+1 −1 utest/test/src/test/utest/QueryTests.scala
+7 −7 utest/test/src/test/utest/RetryTests.scala
+33 −0 utest/test/src/test/utest/TestDiscoveryTests.scala
+2 −2 utest/test/src/test/utest/examples/BeforeAfterAllTest.scala
+1 −1 utest/test/src/test/utest/examples/BeforeAfterEachTests.scala
+26 −17 utest/test/src/test/utest/examples/HelloTests.scala
+1 −1 utest/test/src/test/utest/examples/NestedTests.scala
+1 −1 utest/test/src/test/utest/examples/SeparateSetupTests.scala
+1 −1 utest/test/src/test/utest/examples/SharedFixturesTests.scala
+1 −1 utest/test/src/test/utest/examples/TestPathTests.scala
2 changes: 1 addition & 1 deletion community-build/community-projects/verify
17 changes: 11 additions & 6 deletions community-build/src/scala/dotty/communitybuild/projects.scala
Original file line number Diff line number Diff line change
Expand Up @@ -66,23 +66,26 @@ end CommunityProject
final case class MillCommunityProject(
project: String,
baseCommand: String,
ignoreDocs: Boolean = false
ignoreDocs: Boolean = false,
sourcecodeTestCommand: Boolean = false,
) extends CommunityProject:
override val binaryName: String = "./mill"
override val testCommand = s"$baseCommand.test"
override val testCommand = if sourcecodeTestCommand then s"$baseCommand.test.run" else s"$baseCommand.test"
override val publishCommand = s"$baseCommand.publishLocal"
override val docCommand = null
// uncomment once mill is released
// if ignoreDocs then null else s"$baseCommand.docJar"
override val runCommandsArgs = List("-i", "-D", s"dottyVersion=$compilerVersion")
override val environment = Map.empty

final case class SbtCommunityProject(
project: String,
sbtTestCommand: String,
extraSbtArgs: List[String] = Nil,
sbtPublishCommand: String = null,
sbtDocCommand: String = null,
scalacOptions: List[String] = SbtCommunityProject.scalacOptions
scalacOptions: List[String] = SbtCommunityProject.scalacOptions,
override val environment: Map[String, String] = Map.empty,
) extends CommunityProject:
override val binaryName: String = "sbt"

Expand Down Expand Up @@ -145,7 +148,8 @@ object projects:
lazy val sourcecode = MillCommunityProject(
project = "sourcecode",
baseCommand = s"sourcecode.jvm[$compilerVersion]",
ignoreDocs = true
ignoreDocs = true,
sourcecodeTestCommand = true,
)

lazy val oslib = MillCommunityProject(
Expand Down Expand Up @@ -202,8 +206,8 @@ object projects:
)

lazy val requests = MillCommunityProject(
project = "requests-scala",
baseCommand = s"requests[$compilerVersion]",
project = "requests",
baseCommand = s"requests.jvm[$compilerVersion]",
)

lazy val cask = MillCommunityProject(
Expand Down Expand Up @@ -634,6 +638,7 @@ object projects:
).mkString("; "),
sbtPublishCommand = "coreJVM/publishLocal; coreJS/publishLocal",
scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Wsafe-init"),
environment = Map("GITHUB_ACTIONS" -> "false"),
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the project uses sbt-typelevel so it detects that we are running inside GitHub actions and enables fatal warnings.

)

lazy val libretto = SbtCommunityProject(
Expand Down
Loading
Loading