Skip to content
This repository was archived by the owner on Nov 29, 2021. It is now read-only.

Commit

Permalink
Merge pull request #79 from jmcardon/bump-version
Browse files Browse the repository at this point in the history
Update Versions - Cats RC2
  • Loading branch information
jmcardon authored Jan 3, 2018
2 parents a9c5253 + a4e3e22 commit 769cb89
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 17 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ________________________________________
[ ![Latest Version](https://api.bintray.com/packages/jmcardon/tsec/tsec-common/images/download.svg) ](https://bintray.com/jmcardon/tsec/tsec-common/_latestVersion)


### Latest Release: 0.0.1-M6
### Latest Release: 0.0.1-M7

For the current progress, please refer to the [RoadMap](https://github.com/jmcardon/tsec/wiki)

Expand All @@ -35,7 +35,7 @@ internals shift as we find better/more performant abstractions.

We will guarantee compatibility between minor versions (i.e 0.0.1 => 0.0.2) but not major versions (0.0.1 => 0.1.0)

0.0.1-M6 is here for scala 2.12+ and Cats 1.0.0-RC1!
0.0.1-M7 is here for scala 2.12+ and Cats 1.0.0-RC2!

To get started, if you are on sbt 0.13.16+, add

Expand Down Expand Up @@ -65,7 +65,7 @@ resolvers += Resolver.bintrayRepo("jmcardon", "tsec")
To include any of these packages in your project use:

```scala
val tsecV = "0.0.1-M6"
val tsecV = "0.0.1-M7"
libraryDependencies ++= Seq(
"io.github.jmcardon" %% "tsec-common" % tsecV,
"io.github.jmcardon" %% "tsec-password" % tsecV,
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ lazy val scalacOpts = scalacOptions := Seq(
)

lazy val micrositeSettings = Seq(
libraryDependencies += "com.47deg" %% "github4s" % "0.16.0",
libraryDependencies += "com.47deg" %% "github4s" % "0.17.0",
micrositeName := "TSec",
micrositeBaseUrl := "/tsec",
micrositeDescription := "A Type-Safe General Cryptography Library on the JVM",
Expand All @@ -46,8 +46,8 @@ lazy val commonSettings = Seq(
scalaVersion in ThisBuild := "2.12.4",
fork in test := true,
parallelExecution in test := false,
addCompilerPlugin("org.spire-math" %% "kind-projector" % "0.9.4"),
version in ThisBuild := "0.0.1-M6",
addCompilerPlugin("org.spire-math" %% "kind-projector" % "0.9.5"),
version in ThisBuild := "0.0.1-M7",
scalacOpts
)

Expand Down
14 changes: 7 additions & 7 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ import Keys._
object Dependencies {

object Versions {
val circeV = "0.9.0-M2"
val catsV = "1.0.0-RC1"
val catsEffV = "0.5"
val circeV = "0.9.0-M3"
val catsV = "1.0.0-RC2"
val catsEffV = "0.6"
val thymeV = "0.1.2-SNAPSHOT"
val bouncyCastleV = "1.52"
val bouncyCastleV = "1.58"
val sCryptV = "1.4.0"
val scalaTestV = "3.0.4"
val http4sV = "0.18.0-M6"
val scalacheckV = "1.13.4"
val http4sV = "0.18.0-M7"
val scalacheckV = "1.13.5"
val commonsCodecV = "1.11"
val fs2Version = "0.10.0-M9"
val fs2Version = "0.10.0-M10"
val log4sV = "1.4.0"
}

Expand Down
7 changes: 4 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
logLevel := Level.Warn
addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.12")
addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.15")
addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.1")
addSbtPlugin("com.47deg" % "sbt-microsites" % "0.7.4")
addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.5.5")
addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.6.2")
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.2")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.27")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.2")
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.3")

libraryDependencies ++= List(
//"org.scalameta" %% "scalameta" % "2.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ package object authentication {
* @return
*/
def empty[A, Ident, F[_]: Applicative]: TSecAuthService[Ident, A, F] =
Kleisli.lift(OptionT.none)
Kleisli.liftF(OptionT.none)
}

/** Common cookie settings for cookie-based authenticators
Expand Down

0 comments on commit 769cb89

Please sign in to comment.