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

Clean up dependency definitions #1516

Merged
merged 2 commits into from Jun 13, 2023
Merged

Clean up dependency definitions #1516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80081d5
Clean up dependency definitions
ruippeixotog Jun 10, 2023
7133902
Merge branch 'master' into clean-up-dependencies
jcazevedo Jun 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/build.sbt
View file
Open in desktop
Expand Up @@ -4,4 +4,4 @@ name := "pureconfig-core"

crossScalaVersions := Seq(scala212, scala213, scala3)

libraryDependencies += Dependencies.typesafeConfig
libraryDependencies += "com.typesafe" % "config" % "1.4.2"
25 changes: 4 additions & 21 deletions project/Dependencies.scala
View file
Open in desktop
Expand Up @@ -8,30 +8,13 @@ object Dependencies {
val scala213 = "2.13.10"
val scala3 = "3.3.0"

val typesafeConfig = "1.4.2"

// can't use 3.2.11+ on Scala 2.12 because it pulls in scala-xml 2.
// See https://github.com/scoverage/sbt-scoverage/issues/439
val scalaTest212 = "3.2.16"
val scalaTestPlusScalaCheck212 = "3.2.10.0"
val scalaTest = "3.2.12"
val scalaTestPlusScalaCheck = "3.2.11.0"

val scalaTest = "3.2.16"
val scalaTestPlusScalaCheck = "3.2.16.0"
val scalaCheck = "1.17.0"
}

val typesafeConfig = "com.typesafe" % "config" % Version.typesafeConfig

// testing libraries
val scalaTest = forScalaVersions {
case (2, 12) => "org.scalatest" %% "scalatest" % Version.scalaTest212
case _ => "org.scalatest" %% "scalatest" % Version.scalaTest
}

val scalaTestPlusScalaCheck = forScalaVersions {
case (2, 12) => "org.scalatestplus" %% "scalacheck-1-15" % Version.scalaTestPlusScalaCheck212
case _ => "org.scalatestplus" %% "scalacheck-1-15" % Version.scalaTestPlusScalaCheck
}

val scalaTest = "org.scalatest" %% "scalatest" % Version.scalaTest
val scalaTestPlusScalaCheck = "org.scalatestplus" %% "scalacheck-1-17" % Version.scalaTestPlusScalaCheck
val scalaCheck = "org.scalacheck" %% "scalacheck" % Version.scalaCheck
}
4 changes: 2 additions & 2 deletions testkit/build.sbt
View file
Open in desktop
Expand Up @@ -5,9 +5,9 @@ name := "pureconfig-testkit"
crossScalaVersions := Seq(scala212, scala213, scala3)

libraryDependencies ++= Seq(
Dependencies.scalaTest.value,
Dependencies.scalaTest,
Dependencies.scalaCheck,
Dependencies.scalaTestPlusScalaCheck.value
Dependencies.scalaTestPlusScalaCheck
)

// This is to avoid a warning due to the intransitive dependency of scalaTestPlusScalaCheck.
Expand Down