Upgrade dependencies (#2)

* Prepare development iteration

* Upgrade to sbt 0.13.13

* Upgrade to sbt-scalariform 1.7.1

* Upgrade to sbt-android 1.7.1

* Upgrade to sbt-scoverage 1.4.0

* Upgrade to Android build tools 24.0.3

* Upgrade to cats 0.8.1

* Remove Xor occurrences

* Migrate to new sbt-android APIs

* Upgrade to scalatest 3.0.1

* Update version references

README.md

@@ -2,16 +2,16 @@
 
 [![Circle CI](https://circleci.com/gh/Taig/gandalf.svg?style=shield)](https://circleci.com/gh/Taig/gandalf)
 [![codecov.io](https://codecov.io/github/Taig/gandalf/coverage.svg?branch=master)](https://codecov.io/github/Taig/gandalf?branch=master)
-[![Maven](https://img.shields.io/maven-central/v/io.taig/gandalf_2.11.svg)](http://search.maven.org/#artifactdetails%7Cio.taig%7Cgandalf_2.11%7C0.3.9%7Cjar)
+[![Maven](https://img.shields.io/maven-central/v/io.taig/gandalf_2.11.svg)](http://search.maven.org/#artifactdetails%7Cio.taig%7Cgandalf_2.11%7C0.3.10-SNAPSHOT%7Cjar)
 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/Taig/gandalf/master/LICENSE)
 
 > Flexible data validation
 
 ```scala
 libraryDependencies ++=
-    "io.taig" %% "gandalf-core" % "0.3.9" ::
-    "io.taig" %% "gandalf-predef" % "0.3.9" ::
-    "io.taig" %% "gandalf-report" % "0.3.9" ::
-    "io.taig" %% "gandalf-android" % "0.3.9" ::
+    "io.taig" %% "gandalf-core" % "0.3.10-SNAPSHOT" ::
+    "io.taig" %% "gandalf-predef" % "0.3.10-SNAPSHOT" ::
+    "io.taig" %% "gandalf-report" % "0.3.10-SNAPSHOT" ::
+    "io.taig" %% "gandalf-android" % "0.3.10-SNAPSHOT" ::
     Nil
 ```

build.sbt

@@ -7,7 +7,7 @@ lazy val gandalf = project.in( file( "." ) )
         publish := (),
         publishArtifact := false,
         publishLocal := (),
-        test <<= test in tests in Test
+        test := ( test in tests in Test ).value
     )
     .aggregate( core, predef, report, android )
 
@@ -16,8 +16,8 @@ lazy val core = project
     .settings(
         libraryDependencies ++=
             "com.chuusai" %% "shapeless" % "2.3.2" ::
-            "org.typelevel" %% "cats-core" % "0.7.0" ::
-            "org.typelevel" %% "cats-macros" % "0.7.0" ::
+            "org.typelevel" %% "cats-core" % "0.8.1" ::
+            "org.typelevel" %% "cats-macros" % "0.8.1" ::
             Nil
     )
 
@@ -30,7 +30,8 @@ lazy val report = project
     .dependsOn( core )
 
 lazy val android = project
-    .settings( androidBuildAar ++ Settings.common )
+    .enablePlugins( AndroidLib )
+    .settings( Settings.common )
     .settings(
         libraryDependencies ++=
             "io.taig.android" %% "viewvalue-core" % "1.3.1" ::
@@ -46,7 +47,7 @@ lazy val tests = project
     .settings( Settings.common )
     .settings(
         libraryDependencies ++=
-            "org.scalatest" %% "scalatest" % "3.0.0" ::
+            "org.scalatest" %% "scalatest" % "3.0.1" ::
             Nil
     )
     .dependsOn( core, predef, report )

circle.yml

@@ -4,10 +4,10 @@ machine:
 
 dependencies:
   pre:
-    - wget -q https://dl.bintray.com/sbt/debian/sbt-0.13.12.deb
-    - sudo dpkg -i sbt-0.13.12.deb
+    - wget -q https://dl.bintray.com/sbt/debian/sbt-0.13.13.deb
+    - sudo dpkg -i sbt-0.13.13.deb
     - ( sleep 5 && while [ 1 ]; do sleep 1; echo y; done ) | android update sdk --no-ui --all --filter "tools,platform-tools,android-24,extra-google-m2repository,extra-android-m2repository,extra-google-google_play_services"
-    - echo y | android update sdk --no-ui --all --filter "build-tools-24.0.1"
+    - echo y | android update sdk --no-ui --all --filter "build-tools-24.0.3"
   cache_directories:
     - ~/.ivy2
     - ~/.sbt

core/src/main/scala/io/taig/gandalf/ops/Extraction.scala

@@ -1,7 +1,5 @@
 package io.taig.gandalf.ops
 
-import cats.data.Xor
-
 import scala.language.{ higherKinds, reflectiveCalls }
 import scala.util.Try
 
@@ -21,8 +19,4 @@ object Extraction {
     implicit def extractionOption[T]: Extraction[T, Option] = instance( identity )
 
     implicit def extractionTry[T]: Extraction[T, Try] = instance( _.toOption )
-
-    implicit def extractionXor[L, R]: Extraction[R, ( { type λ[β] = Xor[L, β] } )#λ] = {
-        instance[R, ( { type λ[β] = Xor[L, β] } )#λ]( _.toOption )
-    }
 }

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.12
+sbt.version=0.13.13

project/plugins.sbt

@@ -1,7 +1,7 @@
-addSbtPlugin( "io.taig" % "sbt-scalariform" % "1.7.0" )
+addSbtPlugin( "io.taig" % "sbt-scalariform" % "1.7.1" )
 
 addSbtPlugin( "io.taig" % "sbt-sonatype" % "1.1.0" )
 
-addSbtPlugin( "org.scala-android" % "sbt-android" % "1.6.16" )
+addSbtPlugin( "org.scala-android" % "sbt-android" % "1.7.1" )
 
-addSbtPlugin( "org.scoverage" % "sbt-scoverage" % "1.3.5" )
+addSbtPlugin( "org.scoverage" % "sbt-scoverage" % "1.4.0" )

version.sbt

@@ -1 +1 @@
-version in ThisBuild := "0.3.9"
+version in ThisBuild := "0.3.10-SNAPSHOT"