From ad2a1048984994b5142262769406e1c73e5a37a3 Mon Sep 17 00:00:00 2001
From: Tom Grigg <tomegrigg@gmail.com>
Date: Mon, 7 Dec 2020 21:24:24 -0800
Subject: [PATCH 1/2] community build: Add izumi-reflect

As a dependency of latest zio upstream
---
 .gitmodules                                              | 3 +++
 community-build/community-projects/izumi-reflect         | 1 +
 .../src/scala/dotty/communitybuild/projects.scala        | 9 +++++++++
 .../scala/dotty/communitybuild/CommunityBuildTest.scala  | 1 +
 4 files changed, 14 insertions(+)
 create mode 160000 community-build/community-projects/izumi-reflect

diff --git a/.gitmodules b/.gitmodules
index 1d54c5c6d6a1..a6e92e961cf1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -174,3 +174,6 @@
 [submodule "community-build/community-projects/scalatestplus-junit"]
 	path = community-build/community-projects/scalatestplus-junit
 	url = https://github.com/dotty-staging/scalatestplus-junit.git
+[submodule "community-build/community-projects/izumi-reflect"]
+	path = community-build/community-projects/izumi-reflect
+	url = https://github.com/dotty-staging/izumi-reflect.git
diff --git a/community-build/community-projects/izumi-reflect b/community-build/community-projects/izumi-reflect
new file mode 160000
index 000000000000..c368dcc9025b
--- /dev/null
+++ b/community-build/community-projects/izumi-reflect
@@ -0,0 +1 @@
+Subproject commit c368dcc9025b455944e797dffa1b78d3ecf83752
diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala
index 7593f047f801..c701cbc8d270 100644
--- a/community-build/src/scala/dotty/communitybuild/projects.scala
+++ b/community-build/src/scala/dotty/communitybuild/projects.scala
@@ -40,6 +40,7 @@ object Versions:
   val discipline = "1.1.3-SNAPSHOT"
   val disciplineMunit = "1.0.3+DOTTY-SNAPSHOT"
   val disciplineSpecs2 = "1.1.3-SNAPSHOT"
+  val izumiReflect = "1.0.0-SNAPSHOT"
   val scalacheck = "1.15.2-SNAPSHOT"
   val scalatest = "3.2.3"
   val munit = "0.7.19+DOTTY-SNAPSHOT"
@@ -147,6 +148,7 @@ final case class SbtCommunityProject(
     s""""org.typelevel" %% "cats-mtl-laws_sjs1" % "${Versions.catsMtl}"""",
     s""""org.typelevel" %% "coop" % "${Versions.coop}"""",
     s""""org.typelevel" %% "coop_sjs1" % "${Versions.coop}"""",
+    s""""dev.zio" %% "izumi-reflect" % "${Versions.izumiReflect}"""",
   )
 
   private val baseCommand =
@@ -615,6 +617,13 @@ object projects:
     dependencies      = List(scalaSTM, scissAsyncFile, scissEqual, scissFingerTree, scissLog, scissModel, scissNumbers, scissSerial, scissSpan, scalatest),
   )
 
+  lazy val izumiReflect = SbtCommunityProject(
+    project = "izumi-reflect",
+    sbtTestCommand = "test",
+    sbtPublishCommand = "publishLocal",
+    dependencies = List(scalatest)
+  )
+
 end projects
 
 def allProjects = projects.reflectedFields.of[CommunityProject].sortBy(_.project)
diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala
index ffb3474a61c0..ba94091867c1 100644
--- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala
+++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala
@@ -86,6 +86,7 @@ class CommunityBuildTestA extends CommunityBuildTest:
   @Test def fansi = projects.fansi.run()
   @Test def fastparse = projects.fastparse.run()
   @Test def geny = projects.geny.run()
+  @Test def izumiReflect = projects.izumiReflect.run()
   @Test def oslib = projects.oslib.run()
   // @Test def oslibWatch = projects.oslibWatch.run()
   @Test def pprint = projects.pprint.run()

From 70c46b318b812af935f16e4d2fee9c3ec2aa22e1 Mon Sep 17 00:00:00 2001
From: Tom Grigg <tomegrigg@gmail.com>
Date: Mon, 7 Dec 2020 21:32:55 -0800
Subject: [PATCH 2/2] community build: Update zio to latest upstream

With additional fixes for 3.0.0-M3
---
 community-build/community-projects/zio                        | 2 +-
 community-build/src/scala/dotty/communitybuild/projects.scala | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/community-build/community-projects/zio b/community-build/community-projects/zio
index 2c39fcbe1f4b..c08d2b0bd87d 160000
--- a/community-build/community-projects/zio
+++ b/community-build/community-projects/zio
@@ -1 +1 @@
-Subproject commit 2c39fcbe1f4bb3f7766338a56ed7b2abb8b96593
+Subproject commit c08d2b0bd87de82617ae71fc3922292bc8f7b194
diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala
index c701cbc8d270..4ec1b5247780 100644
--- a/community-build/src/scala/dotty/communitybuild/projects.scala
+++ b/community-build/src/scala/dotty/communitybuild/projects.scala
@@ -397,7 +397,8 @@ object projects:
   lazy val zio = SbtCommunityProject(
     project = "zio",
     sbtTestCommand = "testJVMDotty",
-    sbtDocCommand  = forceDoc("coreJVM"),
+    sbtDocCommand = forceDoc("coreJVM"),
+    dependencies = List(izumiReflect)
   )
 
   lazy val munit = SbtCommunityProject(