Skip to content

Commit 0ebc602

Browse files
i-walkernomisRev
authored andcommitted
refactor task for effects (arrow-kt#1495)
* init * marked failed imports * collapsed io-extensions and -extensions into arrow-effects-data * small fix in ReadME * collapsed reactor * collapsed rx2 * seperated mtl instances from effects-data * ;) arrow.fx.IO done * build file clean up and renamed arrow-benchmarks-fx
1 parent 2098bac commit 0ebc602

File tree

196 files changed

+1258
-1283
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

196 files changed

+1258
-1283
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
include:
2121
- stage: build
2222
script:
23-
- ./gradlew clean build :arrow-benchmarks-effects:jmhClasses
23+
- ./gradlew clean build :arrow-benchmarks-fx:jmhClasses
2424
- stage: coverage-report
2525
script:
2626
- ./gradlew codeCoverageReport

README.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,9 @@ dependencies {
9797
compile "io.arrow-kt:arrow-free-data:$arrow_version" //optional
9898
compile "io.arrow-kt:arrow-free-extensions:$arrow_version" //optional
9999
compile "io.arrow-kt:arrow-mtl:$arrow_version" //optional
100-
compile "io.arrow-kt:arrow-effects-data:$arrow_version" //optional
101-
compile "io.arrow-kt:arrow-effects-extensions:$arrow_version" //optional
102-
compile "io.arrow-kt:arrow-effects-io-extensions:$arrow_version" //optional
103-
compile "io.arrow-kt:arrow-effects-rx2-data:$arrow_version" //optional
104-
compile "io.arrow-kt:arrow-effects-rx2-extensions:$arrow_version" //optional
105-
compile "io.arrow-kt:arrow-effects-reactor-data:$arrow_version" //optional
106-
compile "io.arrow-kt:arrow-effects-reactor-extensions:$arrow_version" //optional
100+
compile "io.arrow-kt:arrow-fx:$arrow_version" //optional
101+
compile "io.arrow-kt:arrow-fx-rx2:$arrow_version" //optional
102+
compile "io.arrow-kt:arrow-fx-reactor:$arrow_version" //optional
107103
compile "io.arrow-kt:arrow-optics:$arrow_version" //optional
108104
compile "io.arrow-kt:arrow-generic:$arrow_version" //optional
109105
compile "io.arrow-kt:arrow-recursion-data:$arrow_version" //optional

modules/ank/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ Example:
219219
````
220220
```kotlin:ank:outFile(diagram.nomnol)
221221
import arrow.reflect.*
222-
import arrow.effects.typeclasses.*
222+
import arrow.fx.typeclasses.*
223223
224224
TypeClass(MonadDefer::class).hierarchyGraph()
225225
```

modules/ank/arrow-ank/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-kapt'
33

44
dependencies {
55
compile project(":arrow-core")
6-
compile project(":arrow-effects-io-extensions")
6+
compile project(":arrow-fx")
77

88
compile "org.jetbrains.kotlin:kotlin-compiler:$ankKotlinVersion"
99
compile "org.jetbrains.kotlin:kotlin-script-util:$ankKotlinVersion"

modules/ank/arrow-ank/src/main/kotlin/arrow/ank/ank.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import arrow.core.extensions.list.foldable.reduceLeftOption
1414
import arrow.core.extensions.list.semigroup.List.semigroup
1515
import arrow.core.extensions.nonemptylist.semigroup.semigroup
1616
import arrow.core.validNel
17-
import arrow.effects.typeclasses.Concurrent
17+
import arrow.fx.typeclasses.Concurrent
1818
import java.nio.file.Path
1919

2020
/**

modules/ank/arrow-ank/src/main/kotlin/arrow/ank/main.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
package arrow.ank
44

5-
import arrow.effects.IO
6-
import arrow.effects.extensions.io.concurrent.concurrent
7-
import arrow.effects.extensions.io.unsafeRun.runBlocking
5+
import arrow.fx.IO
6+
import arrow.fx.extensions.io.concurrent.concurrent
7+
import arrow.fx.extensions.io.unsafeRun.runBlocking
88
import arrow.unsafe
99
import java.nio.file.Paths
1010

modules/aql/arrow-query-language/src/test/kotlin/arrow/aql/tests/IOExample.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package arrow.aql.tests
33
import arrow.core.Option
44
import arrow.core.left
55
import arrow.core.right
6-
import arrow.effects.IO
7-
import arrow.effects.handleErrorWith
6+
import arrow.fx.IO
7+
import arrow.fx.handleErrorWith
88

99
data class UserId(val value: String)
1010
data class User(val userId: UserId)

modules/benchmarks/arrow-benchmarks-effects/gradle.properties

Lines changed: 0 additions & 4 deletions
This file was deleted.

modules/benchmarks/arrow-benchmarks-effects/build.gradle renamed to modules/benchmarks/arrow-benchmarks-fx/build.gradle

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
dependencies {
2-
compile project(":arrow-effects-data")
3-
compile project(":arrow-effects-extensions")
4-
compile project(":arrow-effects-io-extensions")
5-
compile project(":arrow-effects-rx2-extensions")
6-
compile project(":arrow-effects-reactor-extensions")
2+
compile project(":arrow-fx")
3+
compile project(":arrow-fx-rx2")
4+
compile project(":arrow-fx-reactor")
75
compile project(":arrow-scala-benchmarks")
86
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
97
compile "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion"
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Maven publishing configuration
2+
POM_NAME=Arrow-Benchmarks-Fx
3+
POM_ARTIFACT_ID=arrow-benchmarks-fx
4+
POM_PACKAGING=jar

0 commit comments

Comments
 (0)