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

Update versions of several libraries #3017

Merged
merged 19 commits into from
Jun 19, 2023
Merged

Update versions of several libraries #3017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
fb865c0
Update versions of several libraries
serras Mar 31, 2023
670ad48
Rollback Kotest update
serras Mar 31, 2023
14a54e4
Branch was auto-updated.
github-actions[bot] Mar 31, 2023
379e252
Branch was auto-updated.
github-actions[bot] Apr 3, 2023
a1a866e
Branch was auto-updated.
github-actions[bot] Apr 3, 2023
ff08bc7
Branch was auto-updated.
github-actions[bot] Apr 3, 2023
26706e6
Branch was auto-updated.
github-actions[bot] Apr 3, 2023
2a31bd2
Merge branch 'main' into as-update-versions-03-23
serras Apr 6, 2023
43a4033
Move to Kotlin 1.8.20
serras Apr 6, 2023
c57f0a0
Apply the versioning plug-in to all projects
serras Apr 6, 2023
53fdc75
Update more
serras Jun 2, 2023
091e547
Update Gradle version
serras Jun 2, 2023
155b9a2
Merge branch 'main' into as-update-versions-03-23
serras Jun 2, 2023
18ae99c
Update Kotest
serras Jun 2, 2023
ec96b1b
Fix small issue in test
serras Jun 2, 2023
63b476f
Fix wrong test
serras Jun 2, 2023
2a0ae90
Add resolver plug-in + remove deprecation warnings in Gradle 8
serras Jun 5, 2023
3670912
Merge branch 'main' into as-update-versions-03-23
serras Jun 5, 2023
a2a0b66
Update Dokka
serras Jun 6, 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
1 change: 1 addition & 0 deletions arrow-libs/core/arrow-annotations/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ plugins {
id(libs.plugins.kotlin.multiplatform.get().pluginId)
alias(libs.plugins.arrowGradleConfig.kotlin)
alias(libs.plugins.arrowGradleConfig.publish)
alias(libs.plugins.arrowGradleConfig.versioning)
}

kotlin {
Expand Down
1 change: 1 addition & 0 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 @@ -4,6 +4,7 @@ plugins {
id(libs.plugins.kotlin.multiplatform.get().pluginId)
alias(libs.plugins.arrowGradleConfig.kotlin)
alias(libs.plugins.arrowGradleConfig.publish)
alias(libs.plugins.arrowGradleConfig.versioning)
alias(libs.plugins.kotest.multiplatform)
}

Expand Down
1 change: 1 addition & 0 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 @@ -4,6 +4,7 @@ plugins {
id(libs.plugins.kotlin.multiplatform.get().pluginId)
alias(libs.plugins.arrowGradleConfig.kotlin)
alias(libs.plugins.arrowGradleConfig.publish)
alias(libs.plugins.arrowGradleConfig.versioning)
}

apply(from = property("TEST_COVERAGE"))
Expand Down
1 change: 1 addition & 0 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 @@ -6,6 +6,7 @@ plugins {
id(libs.plugins.kotlin.multiplatform.get().pluginId)
alias(libs.plugins.arrowGradleConfig.kotlin)
alias(libs.plugins.arrowGradleConfig.publish)
alias(libs.plugins.arrowGradleConfig.versioning)
}

apply(plugin = "io.kotest.multiplatform")
Expand Down
3 changes: 1 addition & 2 deletions arrow-libs/core/arrow-core/src/commonTest/kotlin/arrow/core/MapKTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -899,9 +899,8 @@ class MapKTest : StringSpec({

"mapOrAccumulate accumulates errors" {
checkAll(
Arb.map(Arb.int(), Arb.int())
Arb.map(Arb.int(), Arb.int(), minSize = 1)
) { xs ->

xs.mapOrAccumulate {
raise(it.value)
}.shouldBeInstanceOf<Either.Left<NonEmptyList<Int>>>()
Expand Down
3 changes: 2 additions & 1 deletion arrow-libs/core/arrow-core/src/commonTest/kotlin/arrow/core/test/laws/MonoidLaws.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ data class MonoidLaws<F>(
list.fold(empty, combine).equalUnderTheLaw(if (list.isEmpty()) empty else list.reduce(combine), eq)
}

private fun combineAllOfEmptyIsEmpty(): Unit =
private fun combineAllOfEmptyIsEmpty() {
emptyList<F>().fold(empty, combine).equalUnderTheLaw(empty, eq) shouldBe true
}
}
1 change: 1 addition & 0 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 @@ -4,6 +4,7 @@ plugins {
id(libs.plugins.kotlin.multiplatform.get().pluginId)
alias(libs.plugins.arrowGradleConfig.kotlin)
alias(libs.plugins.arrowGradleConfig.publish)
alias(libs.plugins.arrowGradleConfig.versioning)
}

apply(plugin = "io.kotest.multiplatform")
Expand Down
1 change: 1 addition & 0 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 @@ -4,6 +4,7 @@ plugins {
id(libs.plugins.kotlin.multiplatform.get().pluginId)
alias(libs.plugins.arrowGradleConfig.kotlin)
alias(libs.plugins.arrowGradleConfig.publish)
alias(libs.plugins.arrowGradleConfig.versioning)
}

apply(plugin = "io.kotest.multiplatform")
Expand Down
1 change: 1 addition & 0 deletions arrow-libs/optics/arrow-optics-ksp-plugin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ plugins {
id(libs.plugins.kotlin.jvm.get().pluginId)
alias(libs.plugins.arrowGradleConfig.kotlin)
alias(libs.plugins.arrowGradleConfig.publish)
alias(libs.plugins.arrowGradleConfig.versioning)
}

kotlin {
Expand Down
1 change: 1 addition & 0 deletions arrow-libs/optics/arrow-optics-reflect/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ plugins {
id(libs.plugins.kotlin.jvm.get().pluginId)
alias(libs.plugins.arrowGradleConfig.kotlin)
alias(libs.plugins.arrowGradleConfig.publish)
alias(libs.plugins.arrowGradleConfig.versioning)
}

apply(from = property("TEST_COVERAGE"))
Expand Down
1 change: 1 addition & 0 deletions arrow-libs/optics/arrow-optics/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ plugins {
id(libs.plugins.kotlin.multiplatform.get().pluginId)
alias(libs.plugins.arrowGradleConfig.kotlin)
alias(libs.plugins.arrowGradleConfig.publish)
alias(libs.plugins.arrowGradleConfig.versioning)
// alias(libs.plugins.ksp)
}

Expand Down
1 change: 1 addition & 0 deletions arrow-libs/resilience/arrow-resilience/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ plugins {
id(libs.plugins.kotlin.multiplatform.get().pluginId)
alias(libs.plugins.arrowGradleConfig.kotlin)
alias(libs.plugins.arrowGradleConfig.publish)
alias(libs.plugins.arrowGradleConfig.versioning)
}

apply(from = property("TEST_COVERAGE"))
Expand Down
1 change: 1 addition & 0 deletions arrow-libs/stack/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
plugins {
`java-platform`
alias(libs.plugins.arrowGradleConfig.publish)
alias(libs.plugins.arrowGradleConfig.versioning)
}

group = property("projects.group").toString()
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ kotlin.mpp.stability.nowarn=true
# https://youtrack.jetbrains.com/issue/KT-32476
kotlin.native.ignoreIncorrectDependencies=true
kotlin.native.ignoreDisabledTargets=true
kotlin.mpp.enableCompatibilityMetadataVariant=false
# https://youtrack.jetbrains.com/issue/KT-45545#focus=Comments-27-4773544.0-0
kapt.use.worker.api=false

Expand Down
19 changes: 10 additions & 9 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
[versions]
animalSniffer = "1.6.0"
arrowGradleConfig = "0.11.0-alpha.1"
assertj = "3.23.1"
arrowGradleConfig = "0.12.0-rc.3"
assertj = "3.24.2"
coroutines = "1.7.1"
classgraph = "4.8.151"
dokka = "1.8.10"
classgraph = "4.8.160"
dokka = "1.8.20"
jUnit = "4.13.2"
jUnitJupiter = "5.8.2"
jUnitVintage = "5.8.2"
kotest = "5.5.4"
kotestGradle = "5.5.4"
jUnitJupiter = "5.9.2"
jUnitVintage = "5.9.2"
kotest = "5.6.2"
kotestGradle = "5.6.2"
kover = "0.6.1"
kotlin = "1.8.21"
kotlinBinaryCompatibilityValidator = "0.12.1"
kotlinBinaryCompatibilityValidator = "0.13.1"
kotlinCompileTesting = "1.5.0"
knit = "0.4.0"
kspVersion = "1.8.21-1.0.11"
Expand Down Expand Up @@ -57,6 +57,7 @@ arrowGradleConfig-formatter = { id = "io.arrow-kt.arrow-gradle-config-formatter"
arrowGradleConfig-kotlin = { id = "io.arrow-kt.arrow-gradle-config-kotlin", version.ref = "arrowGradleConfig" }
arrowGradleConfig-nexus = { id = "io.arrow-kt.arrow-gradle-config-nexus", version.ref = "arrowGradleConfig" }
arrowGradleConfig-publish = { id = "io.arrow-kt.arrow-gradle-config-publish", version.ref = "arrowGradleConfig" }
arrowGradleConfig-versioning = { id = "io.arrow-kt.arrow-gradle-config-versioning", version.ref = "arrowGradleConfig" }
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
kotest-multiplatform = { id = "io.kotest.multiplatform", version.ref = "kotestGradle" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
Expand Down
5 changes: 3 additions & 2 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ pluginManagement {
}

plugins {
id("com.gradle.enterprise") version "3.11.4"
id("com.gradle.enterprise") version "3.13.3"
id("org.gradle.toolchains.foojay-resolver-convention") version("0.5.0")
}

dependencyResolutionManagement {
Expand All @@ -24,7 +25,7 @@ dependencyResolutionManagement {

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

//CORE
include("arrow-annotations")
Expand Down