Fix kotlin multi module and coveralls setup

pgpainless · Jul 25, 2023 · 0cb8185 · 0cb8185
1 parent f6c97b3
commit 0cb8185
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml
@@ -9,5 +9,5 @@ pipeline:
       # Code is clean
       - gradle check javadocAll
       # Code has coverage
-      - gradle jacocoRootReport coveralls
+      - gradle jacocoRootReport coverallsJacoco
     secrets: [COVERALLS_REPO_TOKEN]
diff --git a/build.gradle b/build.gradle
@@ -12,9 +12,12 @@ buildscript {
         mavenLocal()
         mavenCentral()
     }
-    dependencies {
-        classpath "gradle.plugin.org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.12.0"
-    }
+}
+
+plugins {
+    id("com.github.nbaztec.coveralls-jacoco") version "1.2.16"
+    id 'org.jetbrains.kotlin.jvm' version "1.8.10"
+    id 'jacoco-report-aggregation'
 }
 
 apply from: 'version.gradle'
@@ -25,6 +28,7 @@ allprojects {
     apply plugin: 'eclipse'
     apply plugin: 'jacoco'
     apply plugin: 'checkstyle'
+    apply plugin: 'kotlin'
 
     compileJava {
         options.release = 8
@@ -108,6 +112,13 @@ allprojects {
     }
 }
 
+dependencies {
+    jacocoAggregation project(":pgpainless-wot")
+    jacocoAggregation project(":pgpainless-wot-cli")
+    jacocoAggregation project(":wot-dijkstra")
+    jacocoAggregation project(":wot-test-suite")
+}
+
 subprojects {
 
     apply plugin: 'maven-publish'
@@ -222,9 +233,8 @@ def getGitCommit() {
     gitCommit
 }
 
-apply plugin: "com.github.kt3k.coveralls"
-coveralls {
-	sourceDirs = files(subprojects.sourceSets.main.allSource.srcDirs).files.absolutePath
+coverallsJacoco {
+    reportPath = "build/reports/jacoco/test/jacocoTestReport.xml"
 }
 
 task jacocoRootReport(type: JacocoReport) {

diff --git a/pgpainless-wot-cli/build.gradle b/pgpainless-wot-cli/build.gradle
@@ -13,7 +13,6 @@ buildscript {
 
 plugins {
     id 'application'
-    id 'org.jetbrains.kotlin.jvm' version "$kotlinVersion"
     id "com.github.johnrengelman.shadow" version "6.1.0"
 }
 

diff --git a/pgpainless-wot/build.gradle b/pgpainless-wot/build.gradle
@@ -14,7 +14,6 @@ buildscript {
 plugins {
     id 'java-library'
     id 'java-test-fixtures'
-    id 'org.jetbrains.kotlin.jvm' version "$kotlinVersion"
 }
 
 group 'org.pgpainless'

diff --git a/wot-dijkstra/build.gradle b/wot-dijkstra/build.gradle
@@ -14,7 +14,6 @@ buildscript {
 plugins {
     id 'java-library'
     id 'java-test-fixtures'
-    id 'org.jetbrains.kotlin.jvm' version "$kotlinVersion"
 }
 
 group 'org.pgpainless'

diff --git a/wot-test-suite/build.gradle b/wot-test-suite/build.gradle
@@ -13,7 +13,6 @@ buildscript {
 
 plugins {
     id 'java-library'
-    id 'org.jetbrains.kotlin.jvm' version "$kotlinVersion"
 }
 
 group 'org.pgpainless'