xebia-functional · peterneyens · Jan 22, 2018 · Jan 22, 2018 · Jan 22, 2018 · Jan 22, 2018
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,7 @@ before_install:
 - export PATH=${PATH}:./vendor/bundle
 
 install:
-- rvm use 2.2.3 --install --fuzzy
+- rvm use 2.2.8 --install --fuzzy
 - gem update --system
 - gem install sass
 - gem install jekyll -v 3.2.1

diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright (C) 2016-2017 47 Degrees. <http://47deg.com>
+   Copyright (C) 2016-2018 47 Degrees. <http://47deg.com>
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/NOTICE.md b/NOTICE.md
@@ -1,4 +1,4 @@
 Fetch
-Copyright (c) 2016-2017 47 Degrees.  All rights reserved.
+Copyright (c) 2016-2018 47 Degrees.  All rights reserved.
 
 Licensed under Apache License. See [LICENSE](LICENSE) for terms.
diff --git a/README.md b/README.md
@@ -115,9 +115,9 @@ fetchOne.runA[Id]
 Multiple fetches to the same data source are automatically batched. For illustrating it, we are going to compose three independent fetch results as a tuple.
 
 ```scala
-import cats.syntax.cartesian._
+import cats.syntax.apply._
 
-val fetchThree: Fetch[(String, String, String)] = (fetchString(1) |@| fetchString(2) |@| fetchString(3)).tupled
+val fetchThree: Fetch[(String, String, String)] = (fetchString(1), fetchString(2), fetchString(3)).tupled
 ```
 
 When executing the above fetch, note how the three identities get batched and the data source is only queried once.
@@ -158,7 +158,7 @@ def fetchLength(s: String): Fetch[Int] = Fetch(s)
 And now we can easily receive data from the two sources in a single fetch. 
 
 ```scala
-val fetchMulti: Fetch[(String, Int)] = (fetchString(1) |@| fetchLength("one")).tupled
+val fetchMulti: Fetch[(String, Int)] = (fetchString(1), fetchLength("one")).tupled
 ```
 
 Note how the two independent data fetches run in parallel, minimizing the latency cost of querying the two data sources.
@@ -197,6 +197,6 @@ If you wish to add your library here please consider a PR to include it in the l
 
 Fetch is designed and developed by 47 Degrees
 
-Copyright (C) 2016-2017 47 Degrees. <http://47deg.com>
+Copyright (C) 2016-2018 47 Degrees. <http://47deg.com>
 
 [comment]: # (End Copyright)
diff --git a/debug/shared/src/main/scala/debug.scala b/debug/shared/src/main/scala/debug.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/debug/shared/src/main/scala/document.scala b/debug/shared/src/main/scala/document.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/docs/src/main/tut/index.md b/docs/src/main/tut/index.md
@@ -123,9 +123,9 @@ As you can see in the previous example, the `ToStringSource` is queried once to
 Multiple fetches to the same data source are automatically batched. For illustrating it, we are going to compose three independent fetch results as a tuple.
 
 ```tut:silent
-import cats.syntax.cartesian._
+import cats.syntax.apply._
 
-val fetchThree: Fetch[(String, String, String)] = (fetchString(1) |@| fetchString(2) |@| fetchString(3)).tupled
+val fetchThree: Fetch[(String, String, String)] = (fetchString(1), fetchString(2), fetchString(3)).tupled
 ```
 
 When executing the above fetch, note how the three identities get batched and the data source is only queried once.
@@ -164,7 +164,7 @@ def fetchLength(s: String): Fetch[Int] = Fetch(s)
 And now we can easily receive data from the two sources in a single fetch.
 
 ```tut:silent
-val fetchMulti: Fetch[(String, Int)] = (fetchString(1) |@| fetchLength("one")).tupled
+val fetchMulti: Fetch[(String, Int)] = (fetchString(1), fetchLength("one")).tupled
 ```
 
 Note how the two independent data fetches run in parallel, minimizing the latency cost of querying the two data sources.

diff --git a/examples/src/test/scala/DoobieExample.scala b/examples/src/test/scala/DoobieExample.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/examples/src/test/scala/Http4sExample.scala b/examples/src/test/scala/Http4sExample.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/jvm/src/main/scala/unsafeImplicits.scala b/jvm/src/main/scala/unsafeImplicits.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/jvm/src/test/scala/FetchMonadErrorTimoutSpec.scala b/jvm/src/test/scala/FetchMonadErrorTimoutSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/jvm/src/test/scala/FutureTimeoutTests.scala b/jvm/src/test/scala/FutureTimeoutTests.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/monix/jvm/src/test/scala/FetchTaskTimoutTests.scala b/monix/jvm/src/test/scala/FetchTaskTimoutTests.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/monix/shared/src/main/scala/monix.scala b/monix/shared/src/main/scala/monix.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/monix/shared/src/test/scala/FetchTaskTests.scala b/monix/shared/src/test/scala/FetchTaskTests.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala
@@ -21,9 +21,9 @@ object ProjectPlugin extends AutoPlugin {
       Seq(%%("cats-free"), %%("scalatest") % "test")
 
     lazy val monixCrossDependencies: Seq[ModuleID] =
-      %%("monix-eval", "3.0.0-M2") :: Nil
+      %%("monix-eval") :: Nil
 
-    lazy val twitterUtilDependencies: Seq[ModuleID] = Seq(%%("catbird-util"))
+    lazy val twitterUtilDependencies: Seq[ModuleID] = Seq(%%("catbird-util", "18.1.0"))
 
     lazy val micrositeSettings: Seq[Def.Setting[_]] = Seq(
       micrositeName := "Fetch",
@@ -65,8 +65,8 @@ object ProjectPlugin extends AutoPlugin {
 
     lazy val examplesSettings: Seq[Def.Setting[_]] = libraryDependencies ++= Seq(
       %%("circe-generic"),
-      %%("doobie-core", "0.5.0-M9"),
-      %%("doobie-h2", "0.5.0-M9"),
+      %%("doobie-core"),
+      %%("doobie-h2"),
       %%("http4s-blaze-client"),
       %%("http4s-circe")
     ) ++ commonCrossDependencies

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.0.3
+sbt.version=1.1.0
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,2 +1,2 @@
 resolvers += Resolver.sonatypeRepo("releases")
-addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.8.14")
+addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.8.22")
diff --git a/shared/src/main/scala/FetchMonadError.scala b/shared/src/main/scala/FetchMonadError.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/shared/src/main/scala/Query.scala b/shared/src/main/scala/Query.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/shared/src/main/scala/cache.scala b/shared/src/main/scala/cache.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/shared/src/main/scala/datasource.scala b/shared/src/main/scala/datasource.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/shared/src/main/scala/env.scala b/shared/src/main/scala/env.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/shared/src/main/scala/fetch.scala b/shared/src/main/scala/fetch.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/shared/src/main/scala/freeinspect.scala b/shared/src/main/scala/freeinspect.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/shared/src/main/scala/implicits.scala b/shared/src/main/scala/implicits.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/shared/src/main/scala/interpreters.scala b/shared/src/main/scala/interpreters.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/shared/src/main/scala/interpreters/CoreInterpreter.scala b/shared/src/main/scala/interpreters/CoreInterpreter.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/shared/src/main/scala/interpreters/MaxBatchSizePhase.scala b/shared/src/main/scala/interpreters/MaxBatchSizePhase.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/shared/src/main/scala/interpreters/ParallelJoinPhase.scala b/shared/src/main/scala/interpreters/ParallelJoinPhase.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/shared/src/main/scala/syntax.scala b/shared/src/main/scala/syntax.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/shared/src/test/scala/FetchAsyncQueryTests.scala b/shared/src/test/scala/FetchAsyncQueryTests.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/shared/src/test/scala/FetchBatchingTests.scala b/shared/src/test/scala/FetchBatchingTests.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/shared/src/test/scala/FetchReportingTests.scala b/shared/src/test/scala/FetchReportingTests.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/shared/src/test/scala/FetchSyntaxTests.scala b/shared/src/test/scala/FetchSyntaxTests.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/shared/src/test/scala/FetchTests.scala b/shared/src/test/scala/FetchTests.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/shared/src/test/scala/TestHelper.scala b/shared/src/test/scala/TestHelper.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/tut/README.md b/tut/README.md
@@ -120,9 +120,9 @@ fetchOne.runA[Id]
 Multiple fetches to the same data source are automatically batched. For illustrating it, we are going to compose three independent fetch results as a tuple.
 
 ```tut:silent
-import cats.syntax.cartesian._
+import cats.syntax.apply._
 
-val fetchThree: Fetch[(String, String, String)] = (fetchString(1) |@| fetchString(2) |@| fetchString(3)).tupled
+val fetchThree: Fetch[(String, String, String)] = (fetchString(1), fetchString(2), fetchString(3)).tupled
 ```
 
 When executing the above fetch, note how the three identities get batched and the data source is only queried once.
@@ -161,7 +161,7 @@ def fetchLength(s: String): Fetch[Int] = Fetch(s)
 And now we can easily receive data from the two sources in a single fetch. 
 
 ```tut:silent
-val fetchMulti: Fetch[(String, Int)] = (fetchString(1) |@| fetchLength("one")).tupled
+val fetchMulti: Fetch[(String, Int)] = (fetchString(1), fetchLength("one")).tupled
 ```
 
 Note how the two independent data fetches run in parallel, minimizing the latency cost of querying the two data sources.
@@ -196,6 +196,6 @@ If you wish to add your library here please consider a PR to include it in the l
 
 Fetch is designed and developed by 47 Degrees
 
-Copyright (C) 2016-2017 47 Degrees. <http://47deg.com>
+Copyright (C) 2016-2018 47 Degrees. <http://47deg.com>
 
 [comment]: # (End Copyright)
diff --git a/twitter/jvm/src/main/scala/TwitterFuture.scala b/twitter/jvm/src/main/scala/TwitterFuture.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/twitter/jvm/src/test/scala/FetchTwitterFutureSpec.scala b/twitter/jvm/src/test/scala/FetchTwitterFutureSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/twitter/jvm/src/test/scala/RerunnableTimeoutSpecs.scala b/twitter/jvm/src/test/scala/RerunnableTimeoutSpecs.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/twitter/jvm/src/test/scala/TwitterFutureTimeoutSpec.scala b/twitter/jvm/src/test/scala/TwitterFutureTimeoutSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/twitter/jvm/src/test/scala/TwitterToScalaFuture.scala b/twitter/jvm/src/test/scala/TwitterToScalaFuture.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 47 Degrees, LLC. <http://www.47deg.com>
+ * Copyright 2016-2018 47 Degrees, LLC. <http://www.47deg.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.