Merge branch 'master' into rg_selective_functor

Author: JorgeCastilloPrz

README.md

@@ -367,16 +367,3 @@ fun <A, B> B?.rightIfNotNull(default: () -> A): Either<A, B> = when (this) {
   null -> Either.Left(default())
   else -> Either.Right(this)
 }
-
-
-/**
- * Applies the given function `f` if this is a [Left], otherwise returns this if this is a [Right].
- * This is like `flatMap` for the exception.
- */
-fun <A, B> EitherOf<A, B>.handleErrorWith(f: (A) -> EitherOf<A, B>): Either<A, B> =
-  fix().let {
-    when (it) {
-      is Either.Left -> f(it.a).fix()
-      is Either.Right -> it
-    }
-  }

modules/core/arrow-core-data/src/main/kotlin/arrow/core/Either.kt

@@ -4,6 +4,7 @@ import arrow.Kind
 import arrow.Kind2
 import arrow.core.extensions.*
 import arrow.core.extensions.either.applicative.applicative
+import arrow.core.extensions.either.applicativeError.handleErrorWith
 import arrow.core.extensions.either.bifunctor.bifunctor
 import arrow.core.extensions.either.eq.eq
 import arrow.core.extensions.either.hash.hash
@@ -68,7 +69,7 @@ class EitherTest : UnitSpec() {
     "combine a right and a left should return left" {
       forAll { a: String, b: String ->
         Either.left(a) == Either.left(a).combine(String.monoid(), String.monoid(), Either.right(b)) &&
-        Either.left(a) == Either.right(b).combine(String.monoid(), String.monoid(), Either.left(a))
+          Either.left(a) == Either.right(b).combine(String.monoid(), String.monoid(), Either.left(a))
       }
     }
 

modules/core/arrow-core-data/src/test/kotlin/arrow/core/EitherTest.kt

@@ -1,4 +1,4 @@
 # Maven publishing configuration
 POM_NAME=Arrow Data
-POM_ARTIFACT_ID=arrow-extras
+POM_ARTIFACT_ID=arrow-extras-data
 POM_PACKAGING=jar

modules/core/arrow-extras/build.gradle renamed to modules/core/arrow-extras-data/build.gradle

@@ -2,7 +2,7 @@ dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
     compile project(':arrow-annotations')
     compile project(':arrow-typeclasses')
-    compile project(':arrow-extras')
+    compile project(':arrow-extras-data')
     compile project(':arrow-core-extensions')
     kapt project(':arrow-meta')
     kaptTest project(':arrow-meta')

modules/core/arrow-extras/gradle.properties renamed to modules/core/arrow-extras-data/gradle.properties

@@ -1,5 +1,5 @@
 dependencies {
-    compile project(':arrow-extras')
+    compile project(':arrow-extras-data')
 
     kapt project(':arrow-meta')
     kaptTest project(':arrow-meta')

modules/core/arrow-extras/src/main/kotlin/arrow/data/AndThen.kt renamed to modules/core/arrow-extras-data/src/main/kotlin/arrow/data/AndThen.kt

@@ -1,5 +1,5 @@
 dependencies {
-    compile project(':arrow-extras')
+    compile project(':arrow-extras-data')
     compile project(':arrow-optics')
     compile project(':arrow-effects-data')
     compile project(':arrow-mtl')

modules/core/arrow-extras/src/main/kotlin/arrow/data/Cokleisli.kt renamed to modules/core/arrow-extras-data/src/main/kotlin/arrow/data/Cokleisli.kt

@@ -8,7 +8,7 @@ dependencies {
 //        exclude group: 'io.arrow-kt', module: 'arrow-free'
 //    }
     compile project(':arrow-ank')
-    compile project(':arrow-extras')
+    compile project(':arrow-extras-data')
     compile project(':arrow-core-data')
     compile project(':arrow-test')
     compile project(':arrow-extras-extensions')

modules/core/arrow-extras/src/main/kotlin/arrow/data/Coproduct.kt renamed to modules/core/arrow-extras-data/src/main/kotlin/arrow/data/Coproduct.kt

@@ -18,7 +18,7 @@ dependencies {
     kaptTest 'com.google.auto.service:auto-service:1.0-rc4'
     testCompile "com.google.testing.compile:compile-testing:0.15"
     testCompile fileTree(dir: './src/test/libs', includes: ['*.jar'])
-    testCompile project(":arrow-extras")
+    testCompile project(":arrow-extras-data")
     testCompile project(":arrow-meta-test-models")
     testCompile project(":arrow-optics")
     testCompile("junit:junit:$jUnitVersion")

modules/core/arrow-extras/src/main/kotlin/arrow/data/Coreader.kt renamed to modules/core/arrow-extras-data/src/main/kotlin/arrow/data/Coreader.kt

@@ -5,7 +5,7 @@ dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
     compileOnly 'com.google.auto.service:auto-service:1.0-rc4'
     kapt 'com.google.auto.service:auto-service:1.0-rc4'
-    compile project(":arrow-extras")
+    compile project(":arrow-extras-data")
     compile project(':arrow-annotations')
     compile project(":arrow-optics")
     compile project(":arrow-core-extensions")

modules/core/arrow-extras/src/main/kotlin/arrow/data/Day.kt renamed to modules/core/arrow-extras-data/src/main/kotlin/arrow/data/Day.kt

@@ -1,5 +1,5 @@
 dependencies {
-    compile project(':arrow-extras')
+    compile project(':arrow-extras-data')
     compile project(':arrow-extras-extensions')
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
     testCompile("junit:junit:$jUnitVersion")

modules/core/arrow-extras/src/main/kotlin/arrow/data/EitherT.kt renamed to modules/core/arrow-extras-data/src/main/kotlin/arrow/data/EitherT.kt

@@ -1,5 +1,5 @@
 dependencies {
-    compile project(':arrow-extras')
+    compile project(':arrow-extras-data')
     compile project(':arrow-extras-extensions')
 
     kapt project(':arrow-meta')

modules/core/arrow-extras/src/main/kotlin/arrow/data/Ior.kt renamed to modules/core/arrow-extras-data/src/main/kotlin/arrow/data/Ior.kt

@@ -44,7 +44,7 @@ include {
         core {
             _ 'core-data'
             _ 'core-extensions'
-            _ 'extras'
+            _ 'extras-data'
             _ 'extras-extensions'
             _ 'generic'
             _ 'kindedj'