Skip to content

Commit 3a5afe6

Browse files
committed
community build: Add discipline
This is a dependency of cats
1 parent d099250 commit 3a5afe6

File tree

4 files changed

+15
-0
lines changed

4 files changed

+15
-0
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,3 +120,6 @@
120120
[submodule "community-build/community-projects/verify"]
121121
path = community-build/community-projects/verify
122122
url = https://github.com/dotty-staging/nanotest-strawman.git
123+
[submodule "community-build/community-projects/discipline"]
124+
path = community-build/community-projects/discipline
125+
url = https://github.com/typelevel/discipline.git
Submodule discipline added at 4e3f967

community-build/src/scala/dotty/communitybuild/projects.scala

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ def exec(projectDir: Path, binary: String, arguments: String*): Int =
3434
* projects to output the version number to a file.
3535
*/
3636
object Versions:
37+
val discipline = "1.1.3-SNAPSHOT"
3738
val scalacheck = "1.15.2-SNAPSHOT"
3839
val scalatest = "3.2.3"
3940
val munit = "0.7.19+DOTTY-SNAPSHOT"
@@ -114,6 +115,8 @@ final case class SbtCommunityProject(
114115
s""""org.scalameta" %% "junit-interface" % "${Versions.munit}"""",
115116
s""""org.scodec" %% "scodec-bits" % "${Versions.scodecBits}"""",
116117
s""""org.scodec" %% "scodec-bits_sjs1" % "${Versions.scodecBits}"""",
118+
s""""org.typelevel" %% "discipline-core" % "${Versions.discipline}"""",
119+
s""""org.typelevel" %% "discipline-core_sjs1" % "${Versions.discipline}"""",
117120
)
118121

119122
private val baseCommand =
@@ -455,6 +458,13 @@ object projects:
455458
sbtDocCommand = "verifyJVM/doc",
456459
)
457460

461+
lazy val discipline = SbtCommunityProject(
462+
project = "discipline",
463+
sbtTestCommand = "coreJVM/test;coreJS/test",
464+
sbtPublishCommand = "set every credentials := Nil;coreJVM/publishLocal;coreJS/publishLocal",
465+
dependencies = List(scalacheck)
466+
)
467+
458468
end projects
459469

460470
def allProjects = projects.fields.of[CommunityProject].sortBy(_.project)

community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ class CommunityBuildTestB extends CommunityBuildTest:
105105
// temporarily disabled due to lampepfl/dotty#10478
106106
//@Test def catsEffect2 = projects.catsEffect2.run()
107107
//@Test def catsEffect3 = projects.catsEffect3.run()
108+
@Test def discipline = projects.discipline.run()
108109
// Temporarily disabled until problem discovered in comments to #9449 is fixed
109110
// @Test def dottyCpsAsync = projects.dottyCpsAsync.run()
110111
@Test def effpi = projects.effpi.run()

0 commit comments

Comments
 (0)