Merge branch 'master' into gitlab-ci

Author: simooonb

build.sbt

@@ -3,7 +3,7 @@ import sbt.Keys.crossScalaVersions
 lazy val scala212 = "2.12.8"
 lazy val scala211 = "2.11.12"
 
-ThisBuild / organization := "com.guizmaii"
+ThisBuild / organization := "com.colisweb"
 ThisBuild / scalaVersion := scala212
 ThisBuild / crossScalaVersions := Seq(scala211, scala212)
 ThisBuild / scalafmtOnCompile := true
@@ -123,10 +123,18 @@ lazy val noPublishSettings = Seq(
 ThisBuild / releaseCrossBuild := true
 ThisBuild / credentials += Credentials(Path.userHome / ".bintray" / ".credentials")
 ThisBuild / licenses := Seq("MIT" -> url("http://opensource.org/licenses/MIT"))
-ThisBuild / scmInfo := Some(ScmInfo(url("https://github.com/guizmaii/scala-distances"), "scm:git:[email protected]:guizmaii/scala-distances.git"))
-ThisBuild / homepage := Some(url("https://github.com/guizmaii/scala-distances"))
-ThisBuild / developers := List(Developer("guizmaii", "Jules Ivanic", "[email protected]", url("https://guizmaii.github.io/")))
-ThisBuild / bintrayOrganization := Some("guizmaii")
+ThisBuild / scmInfo := Some(
+  ScmInfo(
+    url("https://gitlab.com/colisweb-open-source/scala-distances"),
+    "scm:git:[email protected]:colisweb-open-source/scala-distances.git"
+  )
+)
+ThisBuild / homepage := Some(url("https://gitlab.com/colisweb-open-source/scala-distances"))
+ThisBuild / developers := List(
+  Developer("guizmaii", "Jules Ivanic", "[email protected]", url("https://guizmaii.github.io/")),
+  Developer("simooonbar", "Simon Bar", "[email protected]", url("https://gitlab.com/snatz"))
+)
+ThisBuild / bintrayOrganization := Some("colisweb")
 ThisBuild / bintrayReleaseOnPublish := true
 ThisBuild / publishMavenStyle := true
 

core/src/main/scala/com/guizmaii/distances/DistanceApi.scala

@@ -86,6 +86,8 @@ object DistanceApi {
     new DistanceApi(provider, cacheProvider)
 
   private[DistanceApi] final val directedPathSemiGroup: Semigroup[DirectedPath] =
-    (x: DirectedPath, y: DirectedPath) =>
-      DirectedPath(origin = x.origin, destination = x.destination, (x.travelModes ++ y.travelModes).distinct)
+    new Semigroup[DirectedPath] {
+      override def combine(x: DirectedPath, y: DirectedPath): DirectedPath =
+        DirectedPath(origin = x.origin, destination = x.destination, (x.travelModes ++ y.travelModes).distinct)
+    }
 }

version.sbt

@@ -1 +1 @@
-version in ThisBuild := "1.0.0-SNAPSHOT"
+version in ThisBuild := "1.0.1-SNAPSHOT"