Merge pull request #1541 from robstoll/codecov

deactivate jacoco_additional until fix is found
robstoll · Sep 18, 2023 · 08ecd59 · 08ecd59
2 parents 7da8aa3 + 9db45dd
commit 08ecd59
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 24 deletions.
diff --git a/.github/codecov.yml b/.github/codecov.yml
@@ -1,5 +1,5 @@
 ignore:
-  - "misc/specs"
+  - "misc/atrium-specs"
   - "misc/tools"
   - "samples"
 

diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml
@@ -25,6 +25,17 @@ jobs:
       - name: "build using jdk ${{ matrix.java_version }}"
         run: ./gradlew build
 
+      - name: Upload build code coverage
+        uses: codecov/[email protected]
+        if: ${{ github.event_name == 'pull_request' || (github.event_name == 'push' && github.ref == 'refs/heads/main') }}
+
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          flags: current
+          env_vars: JAVA_VERSION
+          # too many timeout errors, let's not fail at the moment
+          #fail_ci_if_error: true
+
       - name: Cache android jar
         id: android-cache
         uses: actions/cache@v3
@@ -50,21 +61,11 @@ jobs:
       - name: check Atrium's -jvm.jar can be dexed
         run: ATRIUM_ANDROID_JAR="$PWD/android-jar-cache/android.jar" ./gradlew checkDexer
 
-      # TODO 1.3.0 re-activate scala API
+      # TODO 1.5.0 re-activate scala API
       #            -   name: composite build atrium-scala2
       #                run: ./gradlew build
       #                working-directory: misc/tools/atrium-scala2-test
 
-      - name: Upload build code coverage
-        uses: codecov/[email protected]
-        if: ${{ github.event_name == 'pull_request' || (github.event_name == 'push' && github.ref == 'refs/heads/main') }}
-
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          flags: current
-          env_vars: JAVA_VERSION
-          # too many timeout errors, let's not fail at the moment
-          #fail_ci_if_error: true
 
       - name: composite build atrium-samples-test
         run: ./gradlew build

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -24,11 +24,6 @@ jobs:
       - name: "build using jdk ${{ matrix.java_version }}"
         run: ./gradlew build
 
-      # TODO 1.5.0 re-activate scala API
-      #            -   name: composite build atrium-scala2
-      #                run: ./gradlew build
-      #                working-directory: misc\tools\atrium-scala2-test
-
       - name: Upload windows build code coverage
         uses: codecov/[email protected]
         if: ${{ github.event_name == 'pull_request' || (github.event_name == 'push' && github.ref == 'refs/heads/main') }}
@@ -39,6 +34,11 @@ jobs:
           # too many timeout errors, let's not fail at the moment
           #fail_ci_if_error: true
 
+      # TODO 1.5.0 re-activate scala API
+      #            -   name: composite build atrium-scala2
+      #                run: ./gradlew build
+      #                working-directory: misc\tools\atrium-scala2-test
+
       - name: composite build atrium-samples-test
         run: ./gradlew build
         working-directory: misc\tools\atrium-samples-test

diff --git a/...luent/src/jvmTest/kotlin/ch/tutteli/atrium/api/fluent/en_GB/BigDecimalExpectationsSpec.kt b/...luent/src/jvmTest/kotlin/ch/tutteli/atrium/api/fluent/en_GB/BigDecimalExpectationsSpec.kt
@@ -14,7 +14,7 @@ class BigDecimalExpectationsSpec : Spek({
         @Suppress("DEPRECATION") fun1<BigDecimal?, BigDecimal?>(Expect<BigDecimal?>::toEqual).withNullableSuffix(),
         fun1<BigDecimal?, Nothing?>(Expect<BigDecimal?>::toEqual).withNullableSuffix(),
         Expect<Any>::toEqual,
-        @Suppress("DEPRECATION") Expect<BigDecimal>::notToEqual.name to @Suppress("DEPRECATION") Expect<BigDecimal>::notToEqual,
+        @Suppress("DEPRECATION") (Expect<BigDecimal>::notToEqual.name to  Expect<BigDecimal>::notToEqual),
         Expect<Any>::notToEqual,
         Expect<BigDecimal>::toEqualNumerically.name to Expect<BigDecimal>::toEqualNumerically,
         Expect<BigDecimal>::notToEqualNumerically.name to Expect<BigDecimal>::notToEqualNumerically,

diff --git a/gradle/build-logic/dev/src/main/kotlin/build-logic.junit-jacoco-conventions.gradle.kts b/gradle/build-logic/dev/src/main/kotlin/build-logic.junit-jacoco-conventions.gradle.kts
@@ -22,21 +22,26 @@ plugins.withId("jacoco") {
             toolVersion = jacocoToolVersion
         }
     }
-
+//
     val jacocoAdditionalExtraName = "jacocoAdditional"
     tasks.withType<JacocoReport>()
         .matching { it.name == "jacocoTestReport" }
         .configureEach {
+            val coverageSourceDirs = arrayOf(
+                "src/commonMain",
+                "src/jvmMain"
+            )
+            //TODO 1.2.0 remove again, should be fixed in tutteli-gradle-plugins by now
+            sourceDirectories.from(project.files(coverageSourceDirs))
+            classDirectories.from(project.layout.buildDirectory.map { it.dir("classes/kotlin/jvm/main").asFileTree })
+
             //TODO 1.2.0 translate to convention-plugin (or add to tutteli-plugin directly)
             if (project.extra.has(jacocoAdditionalExtraName)) {
                 val additional = project.extra.get(jacocoAdditionalExtraName) as List<*>
                 additional.forEach { p ->
                     val otherProject = p as Project
-                    val kotlin = otherProject.extensions
-                        .findByType<org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension>()
-                    kotlin?.sourceSets?.filterNot { it.name.contains("Test") }?.forEach {
-                        additionalSourceDirs(it.kotlin.sourceDirectories)
-                    }
+                    sourceDirectories.from(otherProject.files(coverageSourceDirs))
+                    classDirectories.from(otherProject.layout.buildDirectory.map { it.dir("classes/kotlin/jvm/main").asFileTree })
                 }
             }