Skip to content

Commit

Permalink
Merge pull request #9 from kolotaev/issue-8
Browse files Browse the repository at this point in the history
Adjustments for Scala 2.13 release
  • Loading branch information
kolotaev authored Feb 10, 2020
2 parents 9c26345 + 2063490 commit 3c8c2ef
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 5 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ dist: trusty

scala:
- 2.12.2
- 2.13.1

jdk:
- oraclejdk8
Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
# Change Log


## 1.1.1 - [2020-02-10]

Added:

- Support for Scala 2.13.

Changed:

- `Id#equals` now uses `TraversableOnce#mkString` internally for comparison
instead of `ArrayLike#deep` which is removed from Scala 2.13.
This solves previous release (1.1.0) source-incompatibility with Scala 2.13.


## 1.1.0 - [2019-07-28]

Added:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ sortable property of the ID.
In your `build.sbt` add
```scala
resolvers += Resolver.jcenterRepo
libraryDependencies += "com.github.kolotaev" %% "ride" % "1.1.0"
libraryDependencies += "com.github.kolotaev" %% "ride" % "(version)"
```

#### Generating IDs
Expand Down
10 changes: 7 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
val username = "kolotaev"
val repo = "ride"

val SCALA_2_12 = "2.12.2"
val SCALA_2_13 = "2.13.1"

name := "ride"
organization := s"com.github.$username"
version := "1.1.0"
version := "1.1.1"

scalaVersion := "2.12.2"
scalaVersion := SCALA_2_12
crossScalaVersions := Seq(SCALA_2_12, SCALA_2_13)
javacOptions ++= Seq(
"-source", "1.8", "-target", "1.8", "-Xlint"
)

libraryDependencies ++= Seq(
"org.scalatest" %% "scalatest" % "3.0.4" % "test"
"org.scalatest" %% "scalatest" % "3.0.8" % "test"
)

licenses := Seq("MIT" -> url("https://opensource.org/licenses/MIT"))
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/com/github/kolotaev/ride/Id.scala
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ class Id(bytes: Option[Array[Byte]] = None) extends Serializable with Ordered[Id
override def equals(other: Any): Boolean = other match {
case that: Id =>
(that canEqual this) &&
value.deep == that.value.deep
value.mkString == that.value.mkString
case _ => false
}

Expand Down

0 comments on commit 3c8c2ef

Please sign in to comment.