From 4c04491839a1a628119af53ac80390e926989ea8 Mon Sep 17 00:00:00 2001 From: Eric K Richardson Date: Thu, 18 Feb 2021 13:46:34 -0800 Subject: [PATCH 1/3] Add scalaCollectionCompat as a dependency --- community-build/src/scala/dotty/communitybuild/projects.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index 90b544e301f7..01dd3bb901bd 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -407,6 +407,7 @@ object projects: project = "sconfig", sbtTestCommand = "sconfigJVM/test", sbtDocCommand = "sconfigJVM/doc", + dependencies = List(scalaCollectionCompat) ) lazy val zio = SbtCommunityProject( From bb9fd50d187e01ba3f06a35c4b81bd86ef7a4db9 Mon Sep 17 00:00:00 2001 From: Eric K Richardson Date: Thu, 18 Feb 2021 13:58:53 -0800 Subject: [PATCH 2/3] Add publish for scala-collection-compat --- community-build/src/scala/dotty/communitybuild/projects.scala | 3 +++ 1 file changed, 3 insertions(+) diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala index 01dd3bb901bd..49571ecc6d04 100644 --- a/community-build/src/scala/dotty/communitybuild/projects.scala +++ b/community-build/src/scala/dotty/communitybuild/projects.scala @@ -46,6 +46,7 @@ object Versions: val munit = "0.7.19+DOTTY-SNAPSHOT" val scodecBits = "1.1+DOTTY-SNAPSHOT" val simulacrumScalafix = "0.5.1-SNAPSHOT" + val scalaCollectionCompat = "2.3.0+DOTTY-SNAPSHOT" sealed trait CommunityProject: private var published = false @@ -157,6 +158,7 @@ final case class SbtCommunityProject( s""""org.typelevel" %% "coop" % "${Versions.coop}"""", s""""org.typelevel" %% "coop_sjs1" % "${Versions.coop}"""", s""""dev.zio" %% "izumi-reflect" % "${Versions.izumiReflect}"""", + s""""org.scala-lang.modules" %% "scala-collection-compat" % "${Versions.scalaCollectionCompat}"""", ) private val baseCommand = @@ -506,6 +508,7 @@ object projects: lazy val scalaCollectionCompat = SbtCommunityProject( project = "scala-collection-compat", sbtTestCommand = "compat30/test", + sbtPublishCommand = s"""set every version := "${Versions.scalaCollectionCompat}"; compat30/publishLocal""", ) lazy val verify = SbtCommunityProject( From 929ba9c543499d17b543b0b139af6702bd930c8c Mon Sep 17 00:00:00 2001 From: Eric K Richardson Date: Thu, 18 Feb 2021 14:37:11 -0800 Subject: [PATCH 3/3] Update sconfig to latest --- community-build/community-projects/sconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/community-build/community-projects/sconfig b/community-build/community-projects/sconfig index 38d620bdab66..43f7b12dce6e 160000 --- a/community-build/community-projects/sconfig +++ b/community-build/community-projects/sconfig @@ -1 +1 @@ -Subproject commit 38d620bdab6656850ab0358583d2bb3638f83150 +Subproject commit 43f7b12dce6ec53bc7fafee8a35141944f31763e