Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Review on sv-arrow-mpp branch #2404

Merged
merged 2 commits into from
May 21, 2021
Merged

Review on sv-arrow-mpp branch #2404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2e1cf7
Review on sv-arrow-mpp branch
rachelcarmena May 20, 2021
e595a26
Empty commit
rachelcarmena May 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion arrow-libs/ank/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ kotlin.incremental=true
# Kotlin Test configuration
#Parallelism needs to be set to 1 since the concurrent tests in arrow-effects become flaky otherwise
kotlintest.parallelism=1
kotlin.stdlib.default.dependency=false

# Reason: https://youtrack.jetbrains.com/issue/KT-46847
# kotlin.stdlib.default.dependency=false
2 changes: 1 addition & 1 deletion arrow-libs/core/arrow-annotations/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
apply from: "$SUB_PROJECT_MPP"
apply from: "$DOC_CREATION"
apply from: "$PUBLICATION_MPP"
apply from: "$ANIMALSNIFFER"
apply from: "$ANIMALSNIFFER_MPP"

kotlin {
sourceSets {
Expand Down
4 changes: 2 additions & 2 deletions arrow-libs/core/arrow-continuations/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ apply from: "$SUB_PROJECT_MPP"
apply from: "$TEST_COVERAGE"
apply from: "$DOC_CREATION"
apply from: "$PUBLICATION_MPP"
apply from: "$ANIMALSNIFFER"
apply from: "$ANIMALSNIFFER_MPP"
apply plugin: 'kotlinx-atomicfu'

kotlin {
sourceSets {
commonMain {
dependencies {
compileOnly "org.jetbrains.kotlin:kotlin-stdlib-common:$KOTLIN_VERSION"
compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
}
}
jvmMain {
Expand Down
2 changes: 1 addition & 1 deletion arrow-libs/core/arrow-core-retrofit/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
apply from: "$SUB_PROJECT"
apply from: "$TEST_COVERAGE"
apply from: "$DOC_CREATION"
apply from: "$PUBLICATION_MPP"
apply from: "$PUBLICATION"
apply from: "$ANIMALSNIFFER"

dependencies {
Expand Down
0 .../adapter/either/ArrowEitherCallAdapter.kt → .../adapter/either/ArrowEitherCallAdapter.kt
View file
Open in desktop
File renamed without changes.
0 ...apter/either/ArrowResponseECallAdapter.kt → ...apter/either/ArrowResponseECallAdapter.kt
View file
Open in desktop
File renamed without changes.
0 ...dapter/either/EitherCallAdapterFactory.kt → ...dapter/either/EitherCallAdapterFactory.kt
View file
Open in desktop
File renamed without changes.
0 ...rrow/retrofit/adapter/either/ResponseE.kt → ...rrow/retrofit/adapter/either/ResponseE.kt
View file
Open in desktop
File renamed without changes.
0 .../retrofit/adapter/either/eitherAdapter.kt → .../retrofit/adapter/either/eitherAdapter.kt
View file
Open in desktop
File renamed without changes.
0 ...pter/either/ArrowEitherCallAdapterTest.kt → ...pter/either/ArrowEitherCallAdapterTest.kt
View file
Open in desktop
File renamed without changes.
0 ...apter/either/ArrowResponseEAdapterTest.kt → ...apter/either/ArrowResponseEAdapterTest.kt
View file
Open in desktop
File renamed without changes.
0 .../arrow/retrofit/adapter/mock/ErrorMock.kt → .../arrow/retrofit/adapter/mock/ErrorMock.kt
View file
Open in desktop
File renamed without changes.
0 ...row/retrofit/adapter/mock/ResponseMock.kt → ...row/retrofit/adapter/mock/ResponseMock.kt
View file
Open in desktop
File renamed without changes.
0 ...t/adapter/retrofit/SuspedApiClientTest.kt → ...t/adapter/retrofit/SuspedApiClientTest.kt
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions arrow-libs/core/arrow-core-test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ apply from: "$PUBLICATION"
apply from: "$ANIMALSNIFFER"

dependencies {
compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
api project(":arrow-core")
api project(":arrow-continuations")
api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$KOTLINX_COROUTINES_VERSION"
Expand Down
5 changes: 2 additions & 3 deletions arrow-libs/core/arrow-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,20 @@ apply from: "$SUB_PROJECT_MPP"
apply from: "$TEST_COVERAGE"
apply from: "$DOC_CREATION"
apply from: "$PUBLICATION_MPP"
apply from: "$ANIMALSNIFFER"
apply from: "$ANIMALSNIFFER_MPP"

kotlin {
sourceSets {
commonMain {
dependencies {
compileOnly "org.jetbrains.kotlin:kotlin-stdlib-common:$KOTLIN_VERSION"
compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
api project(":arrow-continuations")
api project(":arrow-annotations")
}
}
jvmMain {
dependencies {
compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION"
compileOnly "org.codehaus.mojo:animal-sniffer-annotations:1.19"
}
}

Expand Down
4 changes: 3 additions & 1 deletion arrow-libs/core/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ kotlin.incremental=true
#Parallelism needs to be set to 1 since the concurrent tests in arrow-effects become flaky otherwise
kotlintest.parallelism=1
kapt.incremental.apt=false
kotlin.stdlib.default.dependency=false

# Reason: https://youtrack.jetbrains.com/issue/KT-46847
# kotlin.stdlib.default.dependency=false
1 change: 1 addition & 0 deletions arrow-libs/fx/arrow-fx-coroutines-test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ apply from: "$PUBLICATION"
apply from: "$ANIMALSNIFFER"

dependencies {
compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
api project(":arrow-core")
api project(":arrow-fx-coroutines")

Expand Down
9 changes: 4 additions & 5 deletions arrow-libs/fx/arrow-fx-coroutines/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,24 @@ kotlin {
commonMain {
dependencies {
api project(":arrow-core")
compileOnly "org.jetbrains.kotlin:kotlin-stdlib-common:$KOTLIN_VERSION"
compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$KOTLINX_COROUTINES_VERSION"
}
}

jvmMain {
dependencies {
compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION"
compileOnly "org.codehaus.mojo:animal-sniffer-annotations:1.19"
}
}

jvmTest {
dependencies {
implementation project(":arrow-fx-coroutines-test")
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$KOTLINX_COROUTINES_VERSION"
implementation "io.kotest:kotest-runner-junit5-jvm:$KOTEST_VERSION" // for kotest framework
implementation "io.kotest:kotest-assertions-core-jvm:$KOTEST_VERSION" // for kotest core jvm assertions
implementation "io.kotest:kotest-property-jvm:$KOTEST_VERSION" // for kotest property test
implementation "io.kotest:kotest-runner-junit5:$KOTEST_VERSION" // for kotest framework
implementation "io.kotest:kotest-assertions-core:$KOTEST_VERSION" // for kotest core jvm assertions
implementation "io.kotest:kotest-property:$KOTEST_VERSION" // for kotest property test
}
}
}
Expand Down
11 changes: 5 additions & 6 deletions arrow-libs/fx/arrow-fx-stm/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,30 @@ apply from: "$SUB_PROJECT_MPP"
apply from: "$TEST_COVERAGE"
apply from: "$DOC_CREATION"
apply from: "$PUBLICATION_MPP"
apply from: "$ANIMALSNIFFER"
apply from: "$ANIMALSNIFFER_MPP"

kotlin {
sourceSets {
commonMain {
dependencies {
api project(":arrow-core")
compileOnly "org.jetbrains.kotlin:kotlin-stdlib-common:$KOTLIN_VERSION"
compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$KOTLINX_COROUTINES_VERSION"
}
}

jvmMain {
dependencies {
compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION"
compileOnly "org.codehaus.mojo:animal-sniffer-annotations:1.19"
}
}

jvmTest {
dependencies {
implementation project(":arrow-fx-coroutines-test")
implementation "io.kotest:kotest-runner-junit5-jvm:$KOTEST_VERSION" // for kotest framework
implementation "io.kotest:kotest-assertions-core-jvm:$KOTEST_VERSION" // for kotest core jvm assertions
implementation "io.kotest:kotest-property-jvm:$KOTEST_VERSION" // for kotest property test
implementation "io.kotest:kotest-runner-junit5:$KOTEST_VERSION" // for kotest framework
implementation "io.kotest:kotest-assertions-core:$KOTEST_VERSION" // for kotest core jvm assertions
implementation "io.kotest:kotest-property:$KOTEST_VERSION" // for kotest property test
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion arrow-libs/fx/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ kotlin.incremental=true
#Parallelism needs to be set to 1 since the concurrent tests in arrow-effects become flaky otherwise
kotlintest.parallelism=1
kapt.incremental.apt=false
kotlin.stdlib.default.dependency=false

# Reason: https://youtrack.jetbrains.com/issue/KT-46847
# kotlin.stdlib.default.dependency=false
5 changes: 4 additions & 1 deletion arrow-libs/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@ kotlin.incremental=true
#Parallelism needs to be set to 1 since the concurrent tests in arrow-effects become flaky otherwise
kotlintest.parallelism=1
kapt.incremental.apt=false
kotlin.stdlib.default.dependency=false

# Reason: https://youtrack.jetbrains.com/issue/KT-46847
# kotlin.stdlib.default.dependency=false

COMMON_SETUP=../gradle/setup.gradle
ROOT_PROJECT=../gradle/main.gradle
Expand All @@ -78,3 +80,4 @@ DOC_CREATION=../../gradle/apidoc-creation.gradle
PUBLICATION=../../gradle/publication.gradle
PUBLICATION_MPP=../../gradle/publication-mpp.gradle
ANIMALSNIFFER=../../gradle/animalsniffer.gradle
ANIMALSNIFFER_MPP=../../gradle/animalsniffer-mpp.gradle
35 changes: 35 additions & 0 deletions arrow-libs/gradle/animalsniffer-mpp.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/*
* Copyright (C) 2021 The Arrow Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

// -- Gradle Animal Sniffer Plugin: https://github.com/xvik/gradle-animalsniffer-plugin
apply plugin: 'ru.vyarus.animalsniffer'
animalsniffer {
ignore 'java.lang.*'
}
kotlin {
sourceSets {
commonMain {
dependencies {
compileOnly "org.codehaus.mojo:animal-sniffer-annotations:1.19"
}
}
jvmMain {
dependencies {
compileOnly "org.codehaus.mojo:animal-sniffer-annotations:1.19"
}
}
}
}
1 change: 1 addition & 0 deletions arrow-libs/optics/arrow-optics-test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ apply from: "$PUBLICATION"
apply from: "$ANIMALSNIFFER"

dependencies {
compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
compile project(":arrow-optics")
compile project(":arrow-core-test")
compile "io.kotlintest:kotlintest-runner-junit5:$KOTLIN_TEST_VERSION", excludeArrow
Expand Down
7 changes: 3 additions & 4 deletions arrow-libs/optics/arrow-optics/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,20 @@ plugins {
apply from: "$SUB_PROJECT_MPP"
apply from: "$TEST_COVERAGE"
apply from: "$DOC_CREATION"
apply from: "$PUBLICATION"
apply from: "$ANIMALSNIFFER"
apply from: "$PUBLICATION_MPP"
apply from: "$ANIMALSNIFFER_MPP"

kotlin {
sourceSets {
commonMain {
dependencies {
api project(":arrow-core")
compileOnly "org.jetbrains.kotlin:kotlin-stdlib-common:$KOTLIN_VERSION"
compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
}
}
jvmMain {
dependencies {
compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION"
compileOnly "org.codehaus.mojo:animal-sniffer-annotations:1.19"
}
}
jvmTest {
Expand Down
4 changes: 3 additions & 1 deletion arrow-libs/optics/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ kotlin.incremental=true
# Kotlin Test configuration
#Parallelism needs to be set to 1 since the concurrent tests in arrow-effects become flaky otherwise
kotlintest.parallelism=1
kotlin.stdlib.default.dependency=false

# Reason: https://youtrack.jetbrains.com/issue/KT-46847
# kotlin.stdlib.default.dependency=false