conflict-resolve

Author: rochala

.github/workflows/ci.yaml

@@ -232,6 +232,10 @@ jobs:
           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:
@@ -275,6 +279,10 @@ jobs:
           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:
@@ -318,6 +326,10 @@ jobs:
           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
+
   community_build_forward_compat:
     runs-on: [self-hosted, Linux]
     container:

.gitignore

@@ -65,6 +65,7 @@ compiler/after-pickling.txt
 bench/compile.txt
 
 community-build/scala3-bootstrapped.version
+community-build/sbt-injected-plugins
 community-build/sbt-dotty-sbt
 community-build/sbt-scalajs-sbt
 community-build/dotty-community-build-deps

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "community-build/community-projects/algebra"]
-	path = community-build/community-projects/algebra
-	url = https://github.com/dotty-staging/algebra
 [submodule "community-build/community-projects/betterfiles"]
 	path = community-build/community-projects/betterfiles
 	url = https://github.com/dotty-staging/better-files
@@ -250,3 +247,6 @@
 [submodule "community-build/community-projects/scalacheck-forward-compat"]
 	path = community-build/community-projects/scalacheck-forward-compat
 	url = https://github.com/dotty-staging/scalacheck
+[submodule "community-build/community-projects/http4s"]
+	path = community-build/community-projects/http4s
+	url = https://github.com/dotty-staging/http4s.git

bench/profiles/projects.yml

@@ -26,7 +26,7 @@ charts:
 
 scripts:
     dotty:
-        - measure -with-compiler $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java)
+        - measure -feature -deprecation -unchecked -Xfatal-warnings -encoding UTF8 -language:implicitConversions -Yexplicit-nulls -with-compiler $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java)
 
     re2s:
         - measure $(find $PROG_HOME/tests/re2s/src -name *.scala)