Skip to content
This repository has been archived by the owner on Apr 22, 2020. It is now read-only.

General Library Upgrade #632

Merged
merged 1 commit into from
Sep 18, 2017
Merged

General Library Upgrade #632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
70 changes: 35 additions & 35 deletions core/src/main/scala/sbtorgpolicies/libraries.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,39 +23,39 @@ object libraries {
val v47: Map[String, String] = Map[String, String](
"iota" -> "0.2.0",
"case-classy" -> "0.4.0",
"fetch" -> "0.6.2",
"fetch" -> "0.6.3",
"freestyle" -> "0.3.1",
"github4s" -> "0.15.0",
"org-policies" -> sbtorgpolicies.BuildInfo.version,
"scheckToolbox" -> "0.2.2"
)

protected val vOthers: Map[String, String] = Map[String, String](
"akka" -> "2.5.3",
"akka-http" -> "10.0.9",
"akka" -> "2.5.4",
"akka-http" -> "10.0.10",
"algebra" -> "0.7.0",
"alleycats" -> "0.1.9",
"apache-kafka" -> "0.11.0.0",
"aws-sdk" -> "1.11.168",
"alleycats" -> "0.2.0",
"apache-kafka" -> "0.11.0.1",
"aws-sdk" -> "1.11.197",
"base64" -> "0.2.3",
"cassandra-driver" -> "3.3.0",
"catalysts" -> "0.0.5",
"catbird" -> "0.15.0",
"catbird" -> "0.18.0",
"cats" -> "0.9.0",
"cats-effect" -> "0.3",
"cats-effect" -> "0.4",
"circe" -> "0.8.0",
"config" -> "1.3.1",
"coursier" -> "1.0.0-RC11",
"discipline" -> "0.8",
"doobie" -> "0.4.1",
"doobie" -> "0.4.4",
"embedded-redis" -> "0.6",
"export-hook" -> "1.2.0",
"finch" -> "0.15.1",
"fs2" -> "0.9.7",
"fs2-cats" -> "0.3.0",
"fs2-cats" -> "0.4.0",
"h2" -> "1.4.196",
"http4s" -> "0.17.0-M3",
"joda-convert" -> "1.8.2",
"http4s" -> "0.18.0-M1",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

http4s 0.18.0-M1 depends on fs2 0.10.0-M6 and I'm not sure that it's binary compatible with fs2 0.9.7. It is okay?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, thanks for pointing it out @guersam

At this moment, this plugin sadly is not checking if libraries are binary compatible. However, when you are using the sbt-org-policies plugin and its dependency dsl, you can specify the version which fits better for your project.

For example:

%%("http4s") => by default will use the last one: "0.18.0-M1"

But you could use it in this way, to force the use of a different version of the artifact:

%%("http4s", "0.17.0-M3")

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I created an issue because it would be great that plugin check it automatically: #638

"joda-convert" -> "1.8.3",
"joda-time" -> "2.9.9",
"journal" -> "3.0.18",
"jwt-scala" -> "0.14.0",
Expand All @@ -65,61 +65,61 @@ object libraries {
"macro-compat" -> "1.1.1",
"monix" -> "2.3.0",
"monocle" -> "1.4.0",
"mockito" -> "2.8.47",
"mockito" -> "2.10.0",
"moultingyaml" -> "0.4.0",
"newrelic" -> "3.41.0",
"newrelic" -> "3.42.0",
"paradise" -> "2.1.0",
"pcplod" -> "1.2.1",
"play" -> "2.6.2",
"postgresql" -> "42.1.3",
"play" -> "2.6.5",
"postgresql" -> "42.1.4",
"pure-config" -> "0.7.0",
"rediscala" -> "1.8.0",
"refined" -> "0.8.2",
"refined" -> "0.8.3",
"roshttp" -> "2.0.2",
"scala-parser-combinators" -> "1.0.6",
"scala-reflect" -> "2.11.11",
"scalacheck" -> "1.13.5",
"scheckShapeless" -> "1.1.6",
"scalactic" -> "3.0.3",
"scheckShapeless" -> "1.1.7",
"scalactic" -> "3.0.4",
"scalaj" -> "2.3.0",
"scalameta" -> "1.8.0",
"scalameta" -> "2.0.0",
"scalameta-paradise" -> "3.0.0-M9",
"scalamock" -> "3.6.0",
"scalatags" -> "0.6.5",
"scalatest" -> "3.0.3",
"scalaz" -> "7.2.14",
"scalatags" -> "0.6.7",
"scalatest" -> "3.0.4",
"scalaz" -> "7.2.15",
"scalazspecs2" -> "0.5.0",
"scanamo" -> "0.9.5",
"shapeless" -> "2.3.2",
"shocon" -> "0.1.8",
"shocon" -> "0.1.9",
"simulacrum" -> "0.11.0",
"slf4j" -> "1.7.25",
"slick" -> "3.2.1",
"slogging" -> "0.5.3",
"specs2" -> "3.9.4"
"specs2" -> "3.9.5"
)

val vPlugins47: Map[String, String] = Map[String, String](
"sbt-dependencies" -> "0.2.0",
"sbt-microsites" -> "0.5.7"
"sbt-microsites" -> "0.7.0"
)

val vPluginsOthers: Map[String, String] = Map[String, String](
"sbt-buildinfo" -> "0.7.0",
"sbt-ghpages" -> "0.6.2",
"sbt-git" -> "0.9.3",
"sbt-header" -> "3.0.1",
"sbt-header" -> "3.0.2",
"sbt-pgp" -> "1.1.0",
"sbt-jmh" -> "0.2.27",
"sbt-release" -> "1.0.6",
"sbt-scalafmt" -> "0.6.8",
"sbt-scalajs" -> "0.6.19",
"sbt-scalajs" -> "0.6.20",
"sbt-scoverage" -> "1.5.1",
"sbt-site" -> "1.3.0",
"sbt-sonatype" -> "2.0",
"sbt-unidoc" -> "0.4.1",
"scalastyle-sbt-plugin" -> "1.0.0",
"tut-plugin" -> "0.6.0"
"tut-plugin" -> "0.6.1"
)

val v: Map[String, String] = v47 ++ vOthers ++ vPlugins47 ++ vPluginsOthers
Expand Down Expand Up @@ -301,12 +301,12 @@ object libraries {
val pluginLibs: Map[String, Artifact] = Map[String, Artifact](
"sbt-buildinfo" -> (("com.eed3si9n", "sbt-buildinfo", v("sbt-buildinfo"))),
"sbt-dependencies" -> (("com.47deg", "sbt-dependencies", v("sbt-dependencies"))),
// "sbt-coursier" -> (("io.get-coursier", "sbt-coursier", v("coursier"))),
"sbt-ghpages" -> (("com.typesafe.sbt", "sbt-ghpages", v("sbt-ghpages"))),
"sbt-git" -> (("com.typesafe.sbt", "sbt-git", v("sbt-git"))),
"sbt-header" -> (("de.heikoseeberger", "sbt-header", v("sbt-header"))),
"sbt-jmh" -> (("pl.project13.scala", "sbt-jmh", v("sbt-jmh"))),
// "sbt-microsites" -> (("com.47deg", "sbt-microsites", v("sbt-microsites"))),
"sbt-coursier" -> (("io.get-coursier", "sbt-coursier", v("coursier"))),
"sbt-ghpages" -> (("com.typesafe.sbt", "sbt-ghpages", v("sbt-ghpages"))),
"sbt-git" -> (("com.typesafe.sbt", "sbt-git", v("sbt-git"))),
"sbt-header" -> (("de.heikoseeberger", "sbt-header", v("sbt-header"))),
"sbt-jmh" -> (("pl.project13.scala", "sbt-jmh", v("sbt-jmh"))),
"sbt-microsites" -> (("com.47deg", "sbt-microsites", v("sbt-microsites"))),
"sbt-org-policies" -> (("com.47deg", "sbt-org-policies", v("org-policies"))),
"sbt-pgp" -> (("com.jsuereth", "sbt-pgp", v("sbt-pgp"))),
"sbt-release" -> (("com.github.gseitz", "sbt-release", v("sbt-release"))),
Expand Down
10 changes: 5 additions & 5 deletions project/ProjectPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ object ProjectPlugin extends AutoPlugin {
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.27"),
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0"),
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1"),
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19"),
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.20"),
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "3.0.1"),
addSbtPlugin("com.47deg" % "sbt-dependencies" % "0.2.0"),
// addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.10"),
Expand All @@ -61,7 +61,7 @@ object ProjectPlugin extends AutoPlugin {

val (tutPluginVersion, sbtScalafmtVersion) = sbtBinaryVersionValue match {
case "0.13" => ("0.5.3", "0.6.8")
case "1.0" => ("0.6.0", "1.2.0")
case "1.0" => ("0.6.1", "1.2.0")
}

Seq(
Expand All @@ -84,9 +84,9 @@ object ProjectPlugin extends AutoPlugin {
"-Dplugin.version=" + version.value,
"-Dscala.version=" + scalaVersion.value
)
}
// addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC11"),
// addCustomSBTPlugin("com.47deg" % "sbt-microsites" % "0.6.1", sbt210 = true)
},
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC11"),
addSbtPlugin("com.47deg" % "sbt-microsites" % "0.7.0")
)

lazy val coreSettings: Seq[Def.Setting[_]] = commonSettings ++ Seq(
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import sbt.Resolver.sonatypeRepo

resolvers ++= Seq(sonatypeRepo("snapshots"), sonatypeRepo("releases"))
addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.6.4-M1")
addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.6.4")
2 changes: 1 addition & 1 deletion project/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
// addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC11")
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC11")
20 changes: 10 additions & 10 deletions src/main/scala/sbtorgpolicies/settings/AllSettings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import com.typesafe.sbt.pgp.PgpKeys
import com.typesafe.sbt.pgp.PgpKeys._
import dependencies.DependenciesPlugin
import dependencies.DependenciesPlugin.autoImport._
//import microsites.MicrositeKeys._
import microsites.MicrositeKeys._
import scoverage.ScoverageKeys
import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
import sbt.Keys._
Expand Down Expand Up @@ -244,13 +244,13 @@ trait AllSettings
depGithubTokenSetting := getEnvVar(orgGithubTokenSetting.value)
)

// /**
// * Sets the default properties for the sbt-microsites plugin.
// *
// */
// val sbtMicrositesSettings: Seq[Setting[_]] =
// Seq(
// micrositeGithubToken := getEnvVar(orgGithubTokenSetting.value),
// micrositePushSiteWith := GitHub4s
// )
/**
* Sets the default properties for the sbt-microsites plugin.
*
*/
val sbtMicrositesSettings: Seq[Setting[_]] =
Seq(
micrositeGithubToken := getEnvVar(orgGithubTokenSetting.value),
micrositePushSiteWith := GitHub4s
)
}
2 changes: 1 addition & 1 deletion version.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "0.6.5-SNAPSHOT"
version in ThisBuild := "0.7.0"