Skip to content

Commit

Permalink
Merge pull request #616 from kevin-lee/task/615/rename
Browse files Browse the repository at this point in the history
Close #615 - Rename `effectie-cats-effect2-time` to `effectie-time-cats-effect2` and `effectie-cats-effect3-time` to `effectie-time-cats-effect3`
  • Loading branch information
kevin-lee committed Jan 12, 2024
2 parents 0029533 + 81d2376 commit 39e6a99
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 57 deletions.
112 changes: 55 additions & 57 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,18 @@ lazy val effectie = (project in file("."))
coreJs,
syntaxJvm,
syntaxJs,
timeJvm,
timeJs,
catsJvm,
catsJs,
timeJvm,
timeJs,
timeCatsEffect2Jvm,
timeCatsEffect2Js,
timeCatsEffect3Jvm,
timeCatsEffect3Js,
catsEffect2Jvm,
catsEffect2Js,
catsEffect2TimeJvm,
catsEffect2TimeJs,
catsEffect3Jvm,
catsEffect3Js,
catsEffect3TimeJvm,
catsEffect3TimeJs,
monix3Jvm,
monix3Js,
)
Expand Down Expand Up @@ -184,20 +184,20 @@ lazy val timeJs = time
.settings(jsSettingsForFuture)
.settings(jsSettings)

lazy val catsEffect2 = module(ProjectName("cats-effect2"), crossProject(JVMPlatform, JSPlatform))
lazy val timeCatsEffect2 = module(ProjectName("time-cats-effect2"), crossProject(JVMPlatform, JSPlatform))
.settings(
description := "Effect Utils - Cats Effect 2",
description := "Effect Utils - Time with Cats Effect 2",
libraryDependencies :=
(SemVer.parseUnsafe(scalaVersion.value) match {
case SemVer(Major(2), Minor(11), _, _, _) =>
libraryDependencies.value ++ Seq(libs.libCatsCore_2_0_0, libs.libCatsEffect_2_0_0)
case SemVer(
Major(3),
Minor(0),
Patch(0),
Some(PreRelease(List(Dsv(List(Anh.Alphabet("RC"), Anh.Num("1")))))),
_,
) =>
Major(3),
Minor(0),
Patch(0),
Some(PreRelease(List(Dsv(List(Anh.Alphabet("RC"), Anh.Num("1")))))),
_,
) =>
libraryDependencies.value ++ Seq(
libs.libCatsCore(props.catsVersion),
libs.libCatsEffect(props.catsEffect2Version),
Expand All @@ -211,31 +211,52 @@ lazy val catsEffect2 = module(ProjectName("cats-effect2"), crossProject(JVMPl
libraryDependencies := libraryDependenciesPostProcess(isScala3(scalaVersion.value), libraryDependencies.value),
)
.dependsOn(
core % props.IncludeTest,
syntax % props.IncludeTest,
cats % props.IncludeTest,
testing4Cats % Test,
core % props.IncludeTest,
syntax % props.IncludeTest,
time,
)
lazy val catsEffect2Jvm = catsEffect2.jvm
lazy val catsEffect2Js = catsEffect2
lazy val timeCatsEffect2Jvm = timeCatsEffect2.jvm
lazy val timeCatsEffect2Js = timeCatsEffect2
.js
.settings(jsSettingsForFuture)
.settings(jsSettings)

lazy val catsEffect2Time = module(ProjectName("cats-effect2-time"), crossProject(JVMPlatform, JSPlatform))
lazy val timeCatsEffect3 = module(ProjectName("time-cats-effect3"), crossProject(JVMPlatform, JSPlatform))
.settings(
description := "Effect Utils - Time with Cats Effect 2",
description := "Effect Utils - Time with Cats Effect 3",
libraryDependencies ++= List(
libs.libCatsCore(props.catsVersion),
libs.libCatsEffect(props.catsEffect3Version),
libs.libCatsEffectTestKit % Test excludeAll ("org.scalacheck"),
libs.tests.extrasHedgehogCatsEffect3,
),
libraryDependencies := libraryDependenciesPostProcess(isScala3(scalaVersion.value), libraryDependencies.value),
)
.dependsOn(
core % props.IncludeTest,
syntax % props.IncludeTest,
time,
)
lazy val timeCatsEffect3Jvm = timeCatsEffect3.jvm
lazy val timeCatsEffect3Js = timeCatsEffect3
.js
.settings(jsSettingsForFuture)
.settings(jsSettings)

lazy val catsEffect2 = module(ProjectName("cats-effect2"), crossProject(JVMPlatform, JSPlatform))
.settings(
description := "Effect Utils - Cats Effect 2",
libraryDependencies :=
(SemVer.parseUnsafe(scalaVersion.value) match {
case SemVer(Major(2), Minor(11), _, _, _) =>
libraryDependencies.value ++ Seq(libs.libCatsCore_2_0_0, libs.libCatsEffect_2_0_0)
case SemVer(
Major(3),
Minor(0),
Patch(0),
Some(PreRelease(List(Dsv(List(Anh.Alphabet("RC"), Anh.Num("1")))))),
_,
) =>
Major(3),
Minor(0),
Patch(0),
Some(PreRelease(List(Dsv(List(Anh.Alphabet("RC"), Anh.Num("1")))))),
_,
) =>
libraryDependencies.value ++ Seq(
libs.libCatsCore(props.catsVersion),
libs.libCatsEffect(props.catsEffect2Version),
Expand All @@ -249,17 +270,17 @@ lazy val catsEffect2Time = module(ProjectName("cats-effect2-time"), crossProject
libraryDependencies := libraryDependenciesPostProcess(isScala3(scalaVersion.value), libraryDependencies.value),
)
.dependsOn(
core % props.IncludeTest,
syntax % props.IncludeTest,
time,
core % props.IncludeTest,
syntax % props.IncludeTest,
cats % props.IncludeTest,
testing4Cats % Test,
)
lazy val catsEffect2TimeJvm = catsEffect2Time.jvm
lazy val catsEffect2TimeJs = catsEffect2Time
lazy val catsEffect2Jvm = catsEffect2.jvm
lazy val catsEffect2Js = catsEffect2
.js
.settings(jsSettingsForFuture)
.settings(jsSettings)


lazy val catsEffect3 = module(ProjectName("cats-effect3"), crossProject(JVMPlatform, JSPlatform))
.settings(
description := "Effect Utils - Cats Effect 3",
Expand All @@ -285,29 +306,6 @@ lazy val catsEffect3Js = catsEffect3
.settings(jsSettingsForFuture)
.settings(jsSettings)

lazy val catsEffect3Time = module(ProjectName("cats-effect3-time"), crossProject(JVMPlatform, JSPlatform))
.settings(
description := "Effect Utils - Time with Cats Effect 3",
libraryDependencies ++= List(
libs.libCatsCore(props.catsVersion),
libs.libCatsEffect(props.catsEffect3Version),
libs.libCatsEffectTestKit % Test excludeAll ("org.scalacheck"),
libs.tests.extrasHedgehogCatsEffect3,
),
libraryDependencies := libraryDependenciesPostProcess(isScala3(scalaVersion.value), libraryDependencies.value),
)
.dependsOn(
core % props.IncludeTest,
syntax % props.IncludeTest,
time,
)
lazy val catsEffect3TimeJvm = catsEffect3Time.jvm
lazy val catsEffect3TimeJs = catsEffect3Time
.js
.settings(jsSettingsForFuture)
.settings(jsSettings)


lazy val monix3 = module(ProjectName("monix3"), crossProject(JVMPlatform, JSPlatform))
.settings(
description := "Effect Utils - Monix 3",
Expand Down

0 comments on commit 39e6a99

Please sign in to comment.