Update all dependencies (#3065)

* Update all dependencies | datasource | package | from | to | | ---------- | ----------------------------------------------------------------------------------------------------------------------- | ------------- | ------------- | | maven | org.codehaus.mojo:animal-sniffer-annotations | 1.21 | 1.23 | | maven | com.squareup.okhttp3:mockwebserver | 4.10.0 | 4.11.0 | | maven | com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin | 1.8.21-1.0.11 | 1.8.22-1.0.11 | | maven | com.google.devtools.ksp:symbol-processing-api | 1.8.21-1.0.11 | 1.8.22-1.0.11 | | maven | org.jetbrains.kotlinx.binary-compatibility-validator:org.jetbrains.kotlinx.binary-compatibility-validator.gradle.plugin | 0.13.1 | 0.13.2 | | maven | org.jetbrains.kotlin.plugin.serialization:org.jetbrains.kotlin.plugin.serialization.gradle.plugin | 1.8.21 | 1.8.22 | | maven | org.jetbrains.kotlin.multiplatform:org.jetbrains.kotlin.multiplatform.gradle.plugin | 1.8.21 | 1.8.22 | | maven | org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin | 1.8.21 | 1.8.22 | | maven | org.jetbrains.kotlinx.kover:org.jetbrains.kotlinx.kover.gradle.plugin | 0.6.1 | 0.7.2 | | maven | com.gradle.enterprise:com.gradle.enterprise.gradle.plugin | 3.13.3 | 3.13.4 | | maven | org.junit.vintage:junit-vintage-engine | 5.9.2 | 5.9.3 | | maven | org.junit.jupiter:junit-jupiter-engine | 5.9.2 | 5.9.3 | | maven | org.junit.jupiter:junit-jupiter | 5.9.2 | 5.9.3 | | maven | org.jetbrains.kotlinx:kotlinx-coroutines-test | 1.7.1 | 1.7.2 | | maven | org.jetbrains.kotlinx:kotlinx-coroutines-core | 1.7.1 | 1.7.2 | | maven | ru.vyarus.animalsniffer:ru.vyarus.animalsniffer.gradle.plugin | 1.6.0 | 1.7.0 | * Fix kover * Remove lingering TEST_COVERAGE * Add KSP Plugin to coverage * Update kover workflow * Fix report.xml path --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Simon Vergauwen <nomisRev@users.noreply.github.com>
arrow-kt · Jun 30, 2023 · c4bffca · c4bffca
1 parent 3d7cb6e
commit c4bffca
Show file tree

Hide file tree

Showing 18 changed files with 41 additions and 80 deletions.
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -142,14 +142,14 @@ jobs:
         if: "! github.event.pull_request.head.repo.fork "
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: koverMergedReport
+          arguments: koverXmlReport
 
       - name: Add coverage report to PR
         if: "! github.event.pull_request.head.repo.fork "
         id: kover
         uses: mi-kas/kover-report@v1
         with:
-          path: build/reports/kover/merged/xml/report.xml
+          path: build/reports/kover/report.xml
           token: ${{ secrets.GITHUB_TOKEN }}
           title: Kover Report
           update-comment: true

diff --git a/arrow-libs/core/arrow-atomic/build.gradle.kts b/arrow-libs/core/arrow-atomic/build.gradle.kts
@@ -6,9 +6,9 @@ plugins {
   alias(libs.plugins.arrowGradleConfig.publish)
   alias(libs.plugins.arrowGradleConfig.versioning)
   alias(libs.plugins.kotest.multiplatform)
+  alias(libs.plugins.kotlinx.kover)
 }
 
-apply(from = property("TEST_COVERAGE"))
 apply(from = property("ANIMALSNIFFER_MPP"))
 
 val enableCompatibilityMetadataVariant =

diff --git a/arrow-libs/core/arrow-continuations/build.gradle.kts b/arrow-libs/core/arrow-continuations/build.gradle.kts
@@ -5,11 +5,11 @@ plugins {
   alias(libs.plugins.arrowGradleConfig.kotlin)
   alias(libs.plugins.arrowGradleConfig.publish)
   alias(libs.plugins.arrowGradleConfig.versioning)
+  alias(libs.plugins.kotlinx.kover)
+  alias(libs.plugins.kotest.multiplatform)
 }
 
-apply(from = property("TEST_COVERAGE"))
 apply(from = property("ANIMALSNIFFER_MPP"))
-apply(plugin = "io.kotest.multiplatform")
 
 val enableCompatibilityMetadataVariant =
   providers.gradleProperty("kotlin.mpp.enableCompatibilityMetadataVariant")

diff --git a/arrow-libs/core/arrow-core-retrofit/build.gradle.kts b/arrow-libs/core/arrow-core-retrofit/build.gradle.kts
@@ -5,9 +5,9 @@ plugins {
   alias(libs.plugins.arrowGradleConfig.kotlin)
   alias(libs.plugins.arrowGradleConfig.publish)
   alias(libs.plugins.kotlinx.serialization) // Needed for testing only
+  alias(libs.plugins.kotlinx.kover)
 }
 
-apply(from = property("TEST_COVERAGE"))
 apply(from = property("ANIMALSNIFFER"))
 
 val enableCompatibilityMetadataVariant =

diff --git a/arrow-libs/core/arrow-core/build.gradle.kts b/arrow-libs/core/arrow-core/build.gradle.kts
@@ -7,10 +7,10 @@ plugins {
   alias(libs.plugins.arrowGradleConfig.kotlin)
   alias(libs.plugins.arrowGradleConfig.publish)
   alias(libs.plugins.arrowGradleConfig.versioning)
+  alias(libs.plugins.kotlinx.kover)
+  alias(libs.plugins.kotest.multiplatform)
 }
 
-apply(plugin = "io.kotest.multiplatform")
-apply(from = property("TEST_COVERAGE"))
 apply(from = property("ANIMALSNIFFER_MPP"))
 
 val enableCompatibilityMetadataVariant =

diff --git a/arrow-libs/fx/arrow-fx-coroutines/build.gradle.kts b/arrow-libs/fx/arrow-fx-coroutines/build.gradle.kts
@@ -5,10 +5,10 @@ plugins {
   alias(libs.plugins.arrowGradleConfig.kotlin)
   alias(libs.plugins.arrowGradleConfig.publish)
   alias(libs.plugins.arrowGradleConfig.versioning)
+  alias(libs.plugins.kotlinx.kover)
 }
 
 apply(plugin = "io.kotest.multiplatform")
-apply(from = property("TEST_COVERAGE"))
 
 val enableCompatibilityMetadataVariant =
   providers.gradleProperty("kotlin.mpp.enableCompatibilityMetadataVariant")

diff --git a/arrow-libs/fx/arrow-fx-stm/build.gradle.kts b/arrow-libs/fx/arrow-fx-stm/build.gradle.kts
@@ -5,10 +5,10 @@ plugins {
   alias(libs.plugins.arrowGradleConfig.kotlin)
   alias(libs.plugins.arrowGradleConfig.publish)
   alias(libs.plugins.arrowGradleConfig.versioning)
+  alias(libs.plugins.kotlinx.kover)
+  alias(libs.plugins.kotest.multiplatform)
 }
 
-apply(plugin = "io.kotest.multiplatform")
-apply(from = property("TEST_COVERAGE"))
 apply(from = property("ANIMALSNIFFER_MPP"))
 
 val enableCompatibilityMetadataVariant =

diff --git a/arrow-libs/gradle/animalsniffer-mpp.gradle b/arrow-libs/gradle/animalsniffer-mpp.gradle
@@ -23,12 +23,12 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                implementation "org.codehaus.mojo:animal-sniffer-annotations:1.21"
+                implementation "org.codehaus.mojo:animal-sniffer-annotations:1.23"
             }
         }
         jvmMain {
             dependencies {
-                implementation "org.codehaus.mojo:animal-sniffer-annotations:1.21"
+                implementation "org.codehaus.mojo:animal-sniffer-annotations:1.23"
             }
          }
      }

diff --git a/arrow-libs/gradle/animalsniffer.gradle b/arrow-libs/gradle/animalsniffer.gradle
@@ -22,6 +22,6 @@ animalsniffer {
     ignore 'java.lang.*'
 }
 dependencies {
-    implementation "org.codehaus.mojo:animal-sniffer-annotations:1.21"
+    implementation "org.codehaus.mojo:animal-sniffer-annotations:1.23"
     signature 'net.sf.androidscents.signature:android-api-level-21:5.0.1_r2@signature'
 }
diff --git a/arrow-libs/gradle/test-coverage.gradle b/arrow-libs/gradle/test-coverage.gradle
diff --git a/arrow-libs/optics/arrow-optics-ksp-plugin/build.gradle.kts b/arrow-libs/optics/arrow-optics-ksp-plugin/build.gradle.kts
@@ -5,13 +5,13 @@ plugins {
   alias(libs.plugins.arrowGradleConfig.kotlin)
   alias(libs.plugins.arrowGradleConfig.publish)
   alias(libs.plugins.arrowGradleConfig.versioning)
+  alias(libs.plugins.kotlinx.kover)
 }
 
 kotlin {
   explicitApi = null
 }
 
-apply(from = property("TEST_COVERAGE"))
 apply(from = property("ANIMALSNIFFER_MPP"))
 
 val enableCompatibilityMetadataVariant =

diff --git a/arrow-libs/optics/arrow-optics-reflect/build.gradle.kts b/arrow-libs/optics/arrow-optics-reflect/build.gradle.kts
@@ -5,9 +5,9 @@ plugins {
   alias(libs.plugins.arrowGradleConfig.kotlin)
   alias(libs.plugins.arrowGradleConfig.publish)
   alias(libs.plugins.arrowGradleConfig.versioning)
+  alias(libs.plugins.kotlinx.kover)
 }
 
-apply(from = property("TEST_COVERAGE"))
 apply(from = property("ANIMALSNIFFER_MPP"))
 
 val enableCompatibilityMetadataVariant =

diff --git a/arrow-libs/optics/arrow-optics/build.gradle.kts b/arrow-libs/optics/arrow-optics/build.gradle.kts
@@ -5,12 +5,10 @@ plugins {
   alias(libs.plugins.arrowGradleConfig.kotlin)
   alias(libs.plugins.arrowGradleConfig.publish)
   alias(libs.plugins.arrowGradleConfig.versioning)
-//  alias(libs.plugins.ksp)
+  alias(libs.plugins.kotlinx.kover)
+  alias(libs.plugins.kotest.multiplatform)
 }
 
-apply(plugin = "io.kotest.multiplatform")
-
-apply(from = property("TEST_COVERAGE"))
 apply(from = property("ANIMALSNIFFER_MPP"))
 
 val enableCompatibilityMetadataVariant =

diff --git a/arrow-libs/resilience/arrow-resilience/build.gradle.kts b/arrow-libs/resilience/arrow-resilience/build.gradle.kts
@@ -5,10 +5,9 @@ plugins {
   alias(libs.plugins.arrowGradleConfig.kotlin)
   alias(libs.plugins.arrowGradleConfig.publish)
   alias(libs.plugins.arrowGradleConfig.versioning)
+  alias(libs.plugins.kotlinx.kover)
 }
 
-apply(from = property("TEST_COVERAGE"))
-
 val enableCompatibilityMetadataVariant =
   providers.gradleProperty("kotlin.mpp.enableCompatibilityMetadataVariant")
     .orNull?.toBoolean() == true

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,7 @@
 @file:Suppress("DSL_SCOPE_VIOLATION")
 
 import kotlinx.knit.KnitPluginExtension
+import kotlinx.kover.gradle.plugin.dsl.KoverProjectExtension
 import org.jetbrains.dokka.gradle.DokkaMultiModuleTask
 import org.jetbrains.dokka.gradle.DokkaTaskPartial
 import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
@@ -51,19 +52,17 @@ configure<KnitPluginExtension> {
   }
 }
 
-koverMerged {
-  enable()
-  filters {
-    projects {
-      excludes.addAll(
-        listOf(
-          ":arrow-annotations",
-          ":arrow-stack",
-          ":arrow-optics-ksp-plugin"
-        )
-      )
-    }
-  }
+dependencies {
+  kover(projects.arrowAtomic)
+  kover(projects.arrowContinuations)
+  kover(projects.arrowCore)
+  kover(projects.arrowCoreRetrofit)
+  kover(projects.arrowFxCoroutines)
+  kover(projects.arrowFxStm)
+  kover(projects.arrowOptics)
+  kover(projects.arrowOpticsKspPlugin)
+  kover(projects.arrowOpticsReflect)
+  kover(projects.arrowResilience)
 }
 
 allprojects {

diff --git a/gradle.properties b/gradle.properties
@@ -31,7 +31,6 @@ kapt.use.worker.api=false
 
 COMMON_SETUP=../gradle/setup.gradle
 ROOT_PROJECT=../gradle/main.gradle
-TEST_COVERAGE=../../gradle/test-coverage.gradle
 ANIMALSNIFFER=../../gradle/animalsniffer.gradle
 ANIMALSNIFFER_MPP=../../gradle/animalsniffer-mpp.gradle
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,23 +1,23 @@
 [versions]
-animalSniffer = "1.6.0"
+animalSniffer = "1.7.0"
 arrowGradleConfig = "0.12.0-rc.3"
 assertj = "3.24.2"
-coroutines = "1.7.1"
+coroutines = "1.7.2"
 classgraph = "4.8.160"
 dokka = "1.8.20"
 jUnit = "4.13.2"
-jUnitJupiter = "5.9.2"
-jUnitVintage = "5.9.2"
+jUnitJupiter = "5.9.3"
+jUnitVintage = "5.9.3"
 kotest = "5.6.2"
 kotestGradle = "5.6.2"
-kover = "0.6.1"
-kotlin = "1.8.21"
-kotlinBinaryCompatibilityValidator = "0.13.1"
+kover = "0.7.2"
+kotlin = "1.8.22"
+kotlinBinaryCompatibilityValidator = "0.13.2"
 kotlinCompileTesting = "1.5.0"
 knit = "0.4.0"
-kspVersion = "1.8.21-1.0.11"
+kspVersion = "1.8.22-1.0.11"
 kotlinxSerialization = "1.5.1"
-mockWebServer = "4.10.0"
+mockWebServer = "4.11.0"
 retrofit = "2.9.0"
 retrofitKotlinxSerialization = "1.0.0"
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -11,7 +11,7 @@ pluginManagement {
 }
 
 plugins {
-  id("com.gradle.enterprise") version "3.13.3"
+  id("com.gradle.enterprise") version "3.13.4"
   id("org.gradle.toolchains.foojay-resolver-convention") version("0.5.0")
 }