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

Jump to bottom

Update all dependencies #3085

Merged
merged 14 commits into from
Jul 20, 2023
Merged

Update all dependencies #3085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
dd6b60c
Update all dependencies
renovate[bot] Jul 6, 2023
371db19
Update API files
renovate[bot] Jul 6, 2023
1321870
Retrigger CI
nomisRev Jul 7, 2023
34ab332
Upgrade yarn.lock
serras Jul 7, 2023
43fa850
Remove wrong versions in yarn.lock
serras Jul 7, 2023
37c0d45
Merge branch 'main' into renovate/all
serras Jul 7, 2023
79dffa3
kotlin.mpp.enableCompatibilityMetadataVariant is deprecated
serras Jul 7, 2023
8fba688
Update yarn.lock in Action
serras Jul 7, 2023
f0eded0
Merge branch 'main' into renovate/all
serras Jul 10, 2023
b9dc1b6
Merge branch 'main' into renovate/all
serras Jul 10, 2023
7692238
Merge branch 'main' into renovate/all
serras Jul 14, 2023
187e963
Merge branch 'main' into renovate/all
serras Jul 15, 2023
824bd32
Temporarily disable tests
nomisRev Jul 19, 2023
a4e24d8
Merge branch 'main' into renovate/all
nomisRev Jul 19, 2023
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
5 changes: 5 additions & 0 deletions .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,11 @@ jobs:
distribution: 'zulu'
java-version: 11

- name: kotlinUpgradeYarnLock
uses: gradle/gradle-build-action@v2
with:
arguments: kotlinUpgradeYarnLock

- name: jsTest
uses: gradle/gradle-build-action@v2
with:
Expand Down
1 change: 1 addition & 0 deletions arrow-libs/core/arrow-annotations/api/arrow-annotations.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ public final class arrow/optics/OpticsTarget : java/lang/Enum {
public static final field LENS Larrow/optics/OpticsTarget;
public static final field OPTIONAL Larrow/optics/OpticsTarget;
public static final field PRISM Larrow/optics/OpticsTarget;
public static fun getEntries ()Lkotlin/enums/EnumEntries;
public static fun valueOf (Ljava/lang/String;)Larrow/optics/OpticsTarget;
public static fun values ()[Larrow/optics/OpticsTarget;
}
Expand Down
56 changes: 22 additions & 34 deletions arrow-libs/core/arrow-atomic/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,6 @@ spotless {

apply(from = property("ANIMALSNIFFER_MPP"))

val enableCompatibilityMetadataVariant =
providers.gradleProperty("kotlin.mpp.enableCompatibilityMetadataVariant")
.orNull?.toBoolean() == true

if (enableCompatibilityMetadataVariant) {
tasks.withType<Test>().configureEach {
exclude("**/*")
}
}

kotlin {
sourceSets {
commonMain {
Expand All @@ -36,20 +26,18 @@ kotlin {
}
}

if (!enableCompatibilityMetadataVariant) {
commonTest {
dependencies {
implementation(projects.arrowFxCoroutines)
implementation(libs.kotest.frameworkEngine)
implementation(libs.kotest.assertionsCore)
implementation(libs.kotest.property)
}
commonTest {
dependencies {
implementation(projects.arrowFxCoroutines)
implementation(libs.kotest.frameworkEngine)
implementation(libs.kotest.assertionsCore)
implementation(libs.kotest.property)
}
}

jvmTest {
dependencies {
runtimeOnly(libs.kotest.runnerJUnit5)
}
jvmTest {
dependencies {
runtimeOnly(libs.kotest.runnerJUnit5)
}
}

Expand All @@ -65,21 +53,21 @@ kotlin {
}
}

if (!enableCompatibilityMetadataVariant) {
commonTest {
dependencies {
implementation(projects.arrowFxCoroutines)
implementation(libs.kotest.frameworkEngine)
implementation(libs.kotest.assertionsCore)
implementation(libs.kotest.property)
}
commonTest {
dependencies {
implementation(projects.arrowFxCoroutines)
implementation(libs.kotest.frameworkEngine)
implementation(libs.kotest.assertionsCore)
implementation(libs.kotest.property)
}
jvmTest {
dependencies {
runtimeOnly(libs.kotest.runnerJUnit5)
}
}

jvmTest {
dependencies {
runtimeOnly(libs.kotest.runnerJUnit5)
}
}

}
}

Expand Down
32 changes: 10 additions & 22 deletions arrow-libs/core/arrow-continuations/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,6 @@ spotless {

apply(from = property("ANIMALSNIFFER_MPP"))

val enableCompatibilityMetadataVariant =
providers.gradleProperty("kotlin.mpp.enableCompatibilityMetadataVariant")
.orNull?.toBoolean() == true


if (enableCompatibilityMetadataVariant) {
tasks.withType<Test>().configureEach {
exclude("**/*")
}
}

kotlin {
sourceSets {
Expand All @@ -35,19 +25,17 @@ kotlin {
implementation(libs.kotlin.stdlibCommon)
}
}
if(!enableCompatibilityMetadataVariant) {
commonTest {
dependencies {
implementation(projects.arrowCore)
implementation(libs.kotest.frameworkEngine)
implementation(libs.kotest.assertionsCore)
implementation(libs.kotest.property)
}
commonTest {
dependencies {
implementation(projects.arrowCore)
implementation(libs.kotest.frameworkEngine)
implementation(libs.kotest.assertionsCore)
implementation(libs.kotest.property)
}
jvmTest {
dependencies {
runtimeOnly(libs.kotest.runnerJUnit5)
}
}
jvmTest {
dependencies {
runtimeOnly(libs.kotest.runnerJUnit5)
}
}
jvmMain {
Expand Down
35 changes: 12 additions & 23 deletions arrow-libs/core/arrow-core-retrofit/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,32 +18,21 @@ spotless {

apply(from = property("ANIMALSNIFFER"))

val enableCompatibilityMetadataVariant =
providers.gradleProperty("kotlin.mpp.enableCompatibilityMetadataVariant")
.orNull?.toBoolean() == true

if (enableCompatibilityMetadataVariant) {
tasks.withType<Test>().configureEach {
exclude("**/*")
}
}

dependencies {
compileOnly(libs.kotlin.stdlib)
compileOnly(projects.arrowCore)
compileOnly(libs.squareup.retrofit)

if (!enableCompatibilityMetadataVariant) {
testImplementation(projects.arrowCore)
testImplementation(libs.kotest.frameworkEngine)
testImplementation(libs.kotest.assertionsCore)
testImplementation(libs.kotest.property)
testCompileOnly(libs.kotlin.reflect)
testRuntimeOnly(libs.kotest.runnerJUnit5)
testImplementation(libs.squareup.okhttpMockWebServer)
testImplementation(libs.squareup.retrofitConverterGson)
testImplementation(libs.squareup.retrofitConverterMoshi)
testImplementation(libs.kotlinx.serializationJson)
testImplementation(libs.jakewharton.retrofitConverterKotlinxSerialization)
}
testImplementation(projects.arrowCore)
testImplementation(libs.kotest.frameworkEngine)
testImplementation(libs.kotest.assertionsCore)
testImplementation(libs.kotest.property)
testCompileOnly(libs.kotlin.reflect)
testRuntimeOnly(libs.kotest.runnerJUnit5)
testImplementation(libs.squareup.okhttpMockWebServer)
testImplementation(libs.squareup.retrofitConverterGson)
testImplementation(libs.squareup.retrofitConverterMoshi)
testImplementation(libs.kotlinx.serializationJson)
testImplementation(libs.jakewharton.retrofitConverterKotlinxSerialization)

}
33 changes: 11 additions & 22 deletions arrow-libs/core/arrow-core-serialization/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,6 @@ plugins {

apply(from = property("ANIMALSNIFFER_MPP"))

val enableCompatibilityMetadataVariant =
providers.gradleProperty("kotlin.mpp.enableCompatibilityMetadataVariant")
.orNull?.toBoolean() == true

if (enableCompatibilityMetadataVariant) {
tasks.withType<Test>().configureEach {
exclude("**/*")
}
}

kotlin {
sourceSets {
commonMain {
Expand All @@ -30,20 +20,19 @@ kotlin {
api(libs.kotlinx.serializationCore)
}
}
if (!enableCompatibilityMetadataVariant) {
commonTest {
dependencies {
implementation(libs.kotlinx.serializationJson)
implementation(libs.kotest.frameworkEngine)
implementation(libs.kotest.assertionsCore)
implementation(libs.kotest.property)
}

commonTest {
dependencies {
implementation(libs.kotlinx.serializationJson)
implementation(libs.kotest.frameworkEngine)
implementation(libs.kotest.assertionsCore)
implementation(libs.kotest.property)
}
}

jvmTest {
dependencies {
runtimeOnly(libs.kotest.runnerJUnit5)
}
jvmTest {
dependencies {
runtimeOnly(libs.kotest.runnerJUnit5)
}
}
}
Expand Down
33 changes: 11 additions & 22 deletions arrow-libs/core/arrow-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,6 @@ spotless {

apply(from = property("ANIMALSNIFFER_MPP"))

val enableCompatibilityMetadataVariant =
providers.gradleProperty("kotlin.mpp.enableCompatibilityMetadataVariant")
.orNull?.toBoolean() == true

if (enableCompatibilityMetadataVariant) {
tasks.withType<Test>().configureEach {
exclude("**/*")
}
}

kotlin {
sourceSets {
commonMain {
Expand All @@ -39,20 +29,19 @@ kotlin {
api(libs.kotlin.stdlibCommon)
}
}
if (!enableCompatibilityMetadataVariant) {
commonTest {
dependencies {
implementation(projects.arrowFxCoroutines)
implementation(libs.kotest.frameworkEngine)
implementation(libs.kotest.assertionsCore)
implementation(libs.kotest.property)
}

commonTest {
dependencies {
implementation(projects.arrowFxCoroutines)
implementation(libs.kotest.frameworkEngine)
implementation(libs.kotest.assertionsCore)
implementation(libs.kotest.property)
}
}

jvmTest {
dependencies {
runtimeOnly(libs.kotest.runnerJUnit5)
}
jvmTest {
dependencies {
runtimeOnly(libs.kotest.runnerJUnit5)
}
}

Expand Down
33 changes: 11 additions & 22 deletions arrow-libs/fx/arrow-fx-coroutines/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,6 @@ spotless {

apply(plugin = "io.kotest.multiplatform")

val enableCompatibilityMetadataVariant =
providers.gradleProperty("kotlin.mpp.enableCompatibilityMetadataVariant")
.orNull?.toBoolean() == true

if (enableCompatibilityMetadataVariant) {
tasks.withType<Test>().configureEach {
exclude("**/*")
}
}

kotlin {
sourceSets {
commonMain {
Expand All @@ -36,21 +26,20 @@ kotlin {
}
}

if (!enableCompatibilityMetadataVariant) {
commonTest {
dependencies {
implementation(libs.kotest.frameworkEngine)
implementation(libs.kotest.assertionsCore)
implementation(libs.kotest.property)
implementation(libs.coroutines.test)
}
commonTest {
dependencies {
implementation(libs.kotest.frameworkEngine)
implementation(libs.kotest.assertionsCore)
implementation(libs.kotest.property)
implementation(libs.coroutines.test)
}
jvmTest {
dependencies {
runtimeOnly(libs.kotest.runnerJUnit5)
}
}
jvmTest {
dependencies {
runtimeOnly(libs.kotest.runnerJUnit5)
}
}

jvmMain {
dependencies {
implementation(libs.kotlin.stdlib)
Expand Down
34 changes: 12 additions & 22 deletions arrow-libs/fx/arrow-fx-stm/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,6 @@ spotless {

apply(from = property("ANIMALSNIFFER_MPP"))

val enableCompatibilityMetadataVariant =
providers.gradleProperty("kotlin.mpp.enableCompatibilityMetadataVariant")
.orNull?.toBoolean() == true

if (enableCompatibilityMetadataVariant) {
tasks.withType<Test>().configureEach {
exclude("**/*")
}
}

kotlin {
sourceSets {
commonMain {
Expand All @@ -36,21 +26,21 @@ kotlin {
implementation(libs.coroutines.core)
}
}
if (!enableCompatibilityMetadataVariant) {
commonTest {
dependencies {
implementation(projects.arrowFxCoroutines)
implementation(libs.kotest.frameworkEngine)
implementation(libs.kotest.assertionsCore)
implementation(libs.kotest.property)
}

commonTest {
dependencies {
implementation(projects.arrowFxCoroutines)
implementation(libs.kotest.frameworkEngine)
implementation(libs.kotest.assertionsCore)
implementation(libs.kotest.property)
}
jvmTest {
dependencies {
runtimeOnly(libs.kotest.runnerJUnit5)
}
}
jvmTest {
dependencies {
runtimeOnly(libs.kotest.runnerJUnit5)
}
}

jvmMain {
dependencies {
implementation(libs.kotlin.stdlib)
Expand Down
Loading