Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(core): Get rid of redundant logback dependency #398

Merged
merged 2 commits into from
Jun 2, 2024
Merged

fix(core): Get rid of redundant logback dependency #398

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c0ac7a
fix(core): Get rid of redundant logback dependency
flipp5b Jun 1, 2024
d728b42
Merge branch 'main' into logback
ex0ns Jun 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 18 additions & 17 deletions build.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,7 @@ trait Bot4sTelegramModule extends CrossScalaModule {
library.catsCore,
library.catsFree,
library.sttpCore,
library.scalaLogging,
library.logback
library.scalaLogging
)
}

Expand Down Expand Up @@ -195,11 +194,17 @@ object akka extends Module {
}

object examples extends Module {
trait ExamplesJvmCommon extends Bot4sTelegramCrossPlatform {
override val platformSegment: String = "jvm"

override def ivyDeps = super.ivyDeps() ++ Agg(
ex0ns marked this conversation as resolved.
Show resolved Hide resolved
library.logback
)
}

object jvm extends Cross[ExamplesJvmModule](ScalaVersions)
trait ExamplesJvmModule extends Bot4sTelegramCrossPlatform {
override val platformSegment: String = "jvm"
override val location: String = "examples"
trait ExamplesJvmModule extends ExamplesJvmCommon {
override val location: String = "examples"

override def ivyDeps = super.ivyDeps() ++ Agg(
library.scalajHttp,
Expand All @@ -211,9 +216,8 @@ object examples extends Module {
}

object catsjvm extends Cross[ExamplesCatsModule](ScalaVersions)
trait ExamplesCatsModule extends Bot4sTelegramCrossPlatform {
override val platformSegment: String = "jvm"
override val location: String = "cats"
trait ExamplesCatsModule extends ExamplesJvmCommon {
override val location: String = "cats"

override def ivyDeps = super.ivyDeps() ++ Agg(
library.asyncHttpClientBackendCats,
Expand All @@ -226,9 +230,8 @@ object examples extends Module {
}

object cats3jvm extends Cross[ExamplesCats3Module](ScalaVersions)
trait ExamplesCats3Module extends Bot4sTelegramCrossPlatform {
override val platformSegment: String = "jvm"
override val location: String = "cats"
trait ExamplesCats3Module extends ExamplesJvmCommon {
override val location: String = "cats"

override def ivyDeps = T {
super.ivyDeps() ++ Agg(
Expand All @@ -243,9 +246,8 @@ object examples extends Module {
}

object ziojvm extends Cross[ExamplesZIOModule](ScalaVersions)
trait ExamplesZIOModule extends Bot4sTelegramCrossPlatform {
override val platformSegment: String = "jvm"
override val location: String = "zio"
trait ExamplesZIOModule extends ExamplesJvmCommon {
override val location: String = "zio"

override def ivyDeps = T {
super.ivyDeps() ++ Agg(
Expand All @@ -263,9 +265,8 @@ object examples extends Module {
}

object monixjvm extends Cross[ExamplesMonixModule](ScalaVersions)
trait ExamplesMonixModule extends Bot4sTelegramCrossPlatform {
override val platformSegment: String = "jvm"
override val location: String = "monix"
trait ExamplesMonixModule extends ExamplesJvmCommon {
override val location: String = "monix"

override def ivyDeps = T {
super.ivyDeps() ++ Agg(
Expand Down
Loading