Skip to content

Commit

Permalink
Preparing the 2.13.x release
Browse files Browse the repository at this point in the history
  • Loading branch information
gvolpe committed Jun 17, 2019
1 parent 7033971 commit 257d79c
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 40 deletions.
20 changes: 8 additions & 12 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,8 @@ promptTheme := PromptTheme(List(
text(_ => "redis4cats", fg(15)).padRight(" λ ")
))

def cond[A](condition: Boolean, t: => Seq[A], f: => Seq[A]): Seq[A] =
if (condition) {
t
} else {
f
}
def pred[A](p: Boolean, t: => Seq[A], f: => Seq[A]): Seq[A] =
if (p) t else f

def version(strVersion: String): Option[(Long, Long)] = CrossVersion.partialVersion(strVersion)

Expand All @@ -36,7 +32,7 @@ val commonSettings = Seq(
compilerPlugin(Libraries.betterMonadicFor),
Libraries.redisClient,
Libraries.scalaCheck % Test
) ++ cond(
) ++ pred(
version(scalaVersion.value) == Some(2, 12),
t = Seq(
Libraries212.catsEffect,
Expand All @@ -51,7 +47,7 @@ val commonSettings = Seq(
Libraries213.catsTestKit % Test,
)),
resolvers += "Apache public" at "https://repository.apache.org/content/groups/public/",
scalacOptions ++= cond(
scalacOptions ++= pred(
version(scalaVersion.value) == Some(2, 12),
t = Seq("-Xmax-classfile-name", "80"),
f = Seq.empty
Expand Down Expand Up @@ -96,7 +92,7 @@ lazy val `redis4cats-core` = project.in(file("modules/core"))
lazy val `redis4cats-log4cats` = project.in(file("modules/log4cats"))
.settings(commonSettings: _*)
.settings(libraryDependencies ++=
cond(
pred(
version(scalaVersion.value) == Some(2, 12),
t = Seq(Libraries212.log4CatsCore),
f = Seq(Libraries213.log4CatsCore)
Expand All @@ -115,7 +111,7 @@ lazy val `redis4cats-effects` = project.in(file("modules/effects"))
lazy val `redis4cats-streams` = project.in(file("modules/streams"))
.settings(commonSettings: _*)
.settings(libraryDependencies ++=
cond(
pred(
version(scalaVersion.value) == Some(2, 12),
t = Seq(Libraries212.fs2Core),
f = Seq(Libraries213.fs2Core)
Expand All @@ -129,7 +125,7 @@ lazy val examples = project.in(file("modules/examples"))
.settings(commonSettings: _*)
.settings(noPublish)
.settings(libraryDependencies ++=
cond(
pred(
version(scalaVersion.value) == Some(2, 12),
t = Seq(Libraries212.log4CatsSlf4j),
f = Seq(Libraries213.log4CatsSlf4j)
Expand All @@ -145,7 +141,7 @@ lazy val `redis4cats-test-support` = project.in(file("modules/test-support"))
.settings(commonSettings: _*)
.settings(
libraryDependencies ++=
cond(
pred(
version(scalaVersion.value) == Some(2, 12),
t = Seq(Libraries212.scalaTest),
f = Seq(Libraries213.scalaTest)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,4 @@ package dev.profunktor.redis4cats.testutils

import org.scalatest.AsyncFunSuite

class Redis4CatsAsyncFunSuite extends AsyncFunSuite {

}
class Redis4CatsAsyncFunSuite extends AsyncFunSuite {}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,4 @@ package dev.profunktor.redis4cats.testutils

import org.scalatest.funsuite.AsyncFunSuite

class Redis4CatsAsyncFunSuite extends AsyncFunSuite {

}

class Redis4CatsAsyncFunSuite extends AsyncFunSuite {}
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,4 @@ package dev.profunktor.redis4cats.testutils

import org.scalatest.AsyncFunSuite

class Redis4CatsAsyncFunSuite extends AsyncFunSuite {

}
class Redis4CatsAsyncFunSuite extends AsyncFunSuite {}
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,4 @@ package dev.profunktor.redis4cats.testutils

import org.scalatest.FunSuite

class Redis4CatsFunSuite extends FunSuite {

}
class Redis4CatsFunSuite extends FunSuite {}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,4 @@ package dev.profunktor.redis4cats.testutils

import org.scalatest.funsuite.AsyncFunSuite

class Redis4CatsAsyncFunSuite extends AsyncFunSuite {

}

class Redis4CatsAsyncFunSuite extends AsyncFunSuite {}
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,4 @@ package dev.profunktor.redis4cats.testutils

import org.scalatest.funsuite.AnyFunSuite

class Redis4CatsFunSuite extends AnyFunSuite {

}
class Redis4CatsFunSuite extends AnyFunSuite {}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package dev.profunktor.redis4cats

import cats.effect._
import cats.syntax.apply._
import cats.syntax.functor._
import dev.profunktor.redis4cats.algebra._
import dev.profunktor.redis4cats.connection.{ RedisClient, RedisURI }
Expand Down Expand Up @@ -82,9 +81,7 @@ trait DockerRedis extends BeforeAndAfterAll with BeforeAndAfterEach { self: Suit
withAbstractRedis[A, String, String](f)(stringCodec)

private def flushAll(): Unit =
withRedis {
_.flushAll *> IO(println(">>>>>> FLUSHALL done <<<<<<<"))
}
withRedis(_.flushAll)
}

object DockerRedis {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,5 @@ trait RedisClusterTest extends BeforeAndAfterAll with BeforeAndAfterEach { self:
withAbstractRedisCluster[A, String, String](f)(stringCodec)

private def flushAll(): Unit =
withRedisCluster {
_.flushAll *> IO(println(">>>>>> CLUSTER FLUSHALL done <<<<<<<"))
}
withRedisCluster(_.flushAll)
}
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "0.8.2"
version in ThisBuild := "0.8.3"

0 comments on commit 257d79c

Please sign in to comment.