Skip to content

Commit

Permalink
Merge pull request #220 from KarelCemus/dependency-updates
Browse files Browse the repository at this point in the history
Update of dependencies
  • Loading branch information
KarelCemus committed Nov 6, 2019
2 parents d9ea6b3 + c54bb74 commit 59c86c4
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 21 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ branches:

cache:
directories:
- "$HOME/.coursier"
- "$HOME/.ivy2/cache"
- "$HOME/.ivy2/local"
- "$HOME/.jabba/jdk"
Expand All @@ -19,8 +20,9 @@ env:
- secure: ozghyo5Yp3enkBx53MzQaD0LeqhBNbGFC3vkkZAcQbele4tR5GrOzR4xjTH0oHhVj7NUHq7WGu4nUDj1h43fJW7uCViepUARrBMPLaUc8ba036IX1OXTU7e2ilGKnOsFeOGfgOo9tb5HnisgfhSXAfMBCgigc+oCtL0HTBdxn9CqjqsUo23c/fnG2UKyLk0Hv5vp91Z/3+kMNkxQTMdJs+ywpKRbMHdIwkghJIqSVfezGxmqhi1wSfoh0xMjOQjaHC0NpTWUs+gmD0hENzV/THwtkeLNcIsdkMIJPoPKruOlfGeTnCFHF3ojNgrUEEDwulrwpLTLoQJeDU6P60JSwUdtzu9hSxwTZLgndwmaE77r2cVsiD5xM5AGB4jVQbd9oOFMW7TIErUemg53qFAiix1W5KtgGv6vW9qT7Z/CRpYC2LG99BUnNzdTKu9e2oBsCY1QbYrXHORSqefnzihAlwJ/6lAGDLnAFw4pgYb779oo8GIhQQdCDMqELSunhP8uJ6G3dpY5p5ubrsSA7yS6tRcaQ+iB1410iTNfMAoD0tKIjgbpR4Zs8lg/5bpiO914f3Xf0KKwFM7lXdajMdN5z5iDnOGgAgtwXB1a/QT2phHqKQ/DFLUbqVUdE2tmuycJ9iAUtVVsyOXZggtOun6o04hfBG1NK/tc1ifGUPigjXw=
- secure: b1gPGCnIdQPqvztIFzM1JkVqYhgDSx5KC273sg9/I2f9zAP+YqPgJ9WjdUBj2Wp2pzQdggakdBgAj36cpEhpylr4W2t4aMzHitvmu/BvHW9+vpjzMhqpLP/6GG8N+Szbhm3nj4BDA/BjelTnN2SyvKrxWGrD6QJuU33AakWM3v/b/Og5L2Sb2E63X80i2iZk9qTdOHCoTxizkTtB/DEgt9PpzUfMJmn8Ww1Gs1mbou3fPUPOVO88iBjn5JmF6iJ+sIRY0MQuPHhDnk98z6BvITg8GycQBc27OWzJFxK0Zu78MVV3t8WRjZ0sxyJNwdGSBBdz5L1jEzP5J5GtgRZiCcCOVZ4j04kdd2/2/4RaZX2jdZAyr1uzIEuBY+xwKhg6J0386HGrQVUu+IvgPQbpFOtmDeyIBRRAXW11KXR2+cNH6RFF8wA274G8l3SAfvvpWKUwussj9j3h1T/37xdCL2igaOmbOEIQYL1Mpo5cnN8lI080LoCc5vL9XHqCVlE7Hr+VUhoagmuiMMUzrTW0Rg81fI+I8dswyy6QTaqY8EYg8KdxQhDoFnkRtHAdaJyjWrL7IuM5G1Poto9UkW8Gg4YwK5HHeg9xDaLMD/OBnup2DVIqwsi2walsM6OlLB0WkEaDa2VG8WVKFOrTOLTAmfWFCscg+qutgTrfasF12EM=
# set version of JDK
- TRAVIS_JDK=adopt@1.8.202-08
- TRAVIS_JDK=adopt@1.8.0-232
- SCALA_VERSION=2.13.0
- COURSIER_CACHE=$HOME/.coursier

jobs:
include:
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -227,11 +227,11 @@ Since Akka 2.4.1, default `JavaSerializer` is [officially considered inefficient
Nevertheless, to keep things simple, play-redis **still uses this inefficient serializer NOT to enforce** any serialization
library to end users. Although, it recommends [kryo serializer](https://github.com/romix/akka-kryo-serialization) claiming
great performance and small output stream. Any serialization library can be smoothly connected through Akka
configuration, see the [official Akka documentation](http://doc.akka.io/docs/akka/current/scala/serialization.html).
configuration, see the [official Akka documentation](https://doc.akka.io/docs/akka/current/scala/serialization.html).

This release is focused on library refactoring. While **public API remained unchanged**, there are several significant
changes to their implementations. Those are consequences of refactoring some functionality into self-standing
units. For example, there has been extracted `RedisConnector` implementing the [Redis protocol](http://redis.io/commands)
units. For example, there has been extracted `RedisConnector` implementing the [Redis protocol](https://redis.io/commands)
and `RedisCache` implementing cache API over that. Before, it was tangled together. As consequence, the library has
now layered architecture (facades -> cache implementation -> protocol implementation) with several public facades.

Expand Down
6 changes: 3 additions & 3 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Project maintainers who do not follow or enforce the Code of Conduct in good fai

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [https://contributor-covenant.org/version/1/4][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
[homepage]: https://contributor-covenant.org
[version]: https://contributor-covenant.org/version/1/4/
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ Exhibit A - Source Code Form License Notice

This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at http://mozilla.org/MPL/2.0/.
file, You can obtain one at https://mozilla.org/MPL/2.0/.

If it is not possible or desirable to put the notice in a particular
file, then You may include the notice in a location (such as a LICENSE
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

## About the Project

[Play framework 2](http://playframework.com/) is delivered with
[Play framework 2](https://playframework.com/) is delivered with
[SyncCacheApi and AsyncCacheApi](https://playframework.com/documentation/2.7.x/ScalaCache).
This module provides **implementation of a cache over Redis** server, i.e., key/value storage.

Expand Down
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import com.typesafe.sbt.pgp.PgpKeys
import com.jsuereth.sbtpgp.PgpKeys
import sbt.Keys._
import sbt._

Expand All @@ -12,7 +12,7 @@ organization := "com.github.karelcemus"

scalaVersion := "2.13.0"

crossScalaVersions := Seq( "2.11.12", "2.12.9", scalaVersion.value )
crossScalaVersions := Seq( "2.11.12", "2.12.10", scalaVersion.value )

playVersion := {
// todo play 2.7.3 does not work in scala 2.11
Expand All @@ -21,7 +21,7 @@ playVersion := {

connectorVersion := "1.9.1"

specs2Version := "4.7.0"
specs2Version := "4.8.0"

libraryDependencies ++= Seq(
// play framework cache API
Expand All @@ -37,7 +37,7 @@ libraryDependencies ++= Seq(
)

resolvers ++= Seq(
"Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
"Typesafe repository" at "https://repo.typesafe.com/typesafe/releases/"
)

javacOptions ++= Seq( "-source", "1.8", "-target", "1.8", "-Xlint:unchecked", "-encoding", "UTF-8" )
Expand All @@ -46,7 +46,7 @@ scalacOptions ++= Seq( "-deprecation", "-feature", "-unchecked" )

homepage := Some( url( "https://github.com/karelcemus/play-redis" ) )

licenses := Seq( "Apache 2" -> url( "http://www.apache.org/licenses/LICENSE-2.0" ) )
licenses := Seq( "Apache 2" -> url( "https://www.apache.org/licenses/LICENSE-2.0" ) )

vcsScm := "git@github.com:KarelCemus/play-redis.git"

Expand Down
2 changes: 1 addition & 1 deletion doc/20-configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ Since Akka 2.4.1, default `JavaSerializer` is [officially considered inefficient
Nevertheless, to keep things simple, play-redis **still uses this inefficient serializer NOT to enforce** any serialization
library to end users. Although, it recommends [kryo serializer](https://github.com/romix/akka-kryo-serialization) claiming
great performance and small output stream. Any serialization library can be smoothly connected through Akka
configuration, see the [official Akka documentation](http://doc.akka.io/docs/akka/current/scala/serialization.html).
configuration, see the [official Akka documentation](https://doc.akka.io/docs/akka/current/scala/serialization.html).


## Overview
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.2.8
sbt.version=1.3.3
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ resolvers += Resolver.url( "scoverage-bintray", url( "https://dl.bintray.com/sks
addSbtPlugin( "com.github.gseitz" % "sbt-release" % "1.0.11" )

// PGP signature
addSbtPlugin( "com.jsuereth" % "sbt-pgp" % "1.1.2" )
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0")

// checks for updates
addSbtPlugin( "com.timushev.sbt" % "sbt-updates" % "0.4.0" )
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import scala.reflect.ClassTag
*
* Subset of REDIS commands, basic commands.
*
* @see http://redis.io/commands
* @see https://redis.io/commands
*/
private[redis] trait CoreCommands {

Expand Down Expand Up @@ -142,7 +142,7 @@ private[redis] trait CoreCommands {
*
* Subset of REDIS commands, Hash-related commands.
*
* @see http://redis.io/commands
* @see https://redis.io/commands
*/
private[redis] trait HashCommands {

Expand Down Expand Up @@ -261,7 +261,7 @@ private[redis] trait HashCommands {
*
* Subset of REDIS commands, List-related commands.
*
* @see http://redis.io/commands
* @see https://redis.io/commands
*/
private[redis] trait ListCommands {

Expand Down Expand Up @@ -396,7 +396,7 @@ private[redis] trait ListCommands {
*
* Subset of REDIS commands, unordered Set-related commands.
*
* @see http://redis.io/commands
* @see https://redis.io/commands
*/
private[redis] trait SetCommands {

Expand Down Expand Up @@ -466,7 +466,7 @@ private[redis] trait SetCommands {
/**
* Internal non-blocking Redis API implementing REDIS protocol
*
* @see http://redis.io/commands
* @see https://redis.io/commands
*/
trait RedisConnector extends AnyRef
with CoreCommands
Expand Down

0 comments on commit 59c86c4

Please sign in to comment.