For testing workflow

.github/workflows/ci-publishing-jar-files.yaml

@@ -15,10 +15,12 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '21'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v6
+      - name: Run tests
+        run: ./gradlew test
       - name: Publish package
-        run: ./gradlew :publisher:publish
+        run: ./gradlew publish --stacktrace
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci-test-infrastructure.yaml

@@ -4,6 +4,7 @@ on:
   pull_request:
   workflow_dispatch:
 permissions:
+  pull-requests: write
   contents: read
 jobs:
   test:
@@ -15,11 +16,20 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '21'
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v6
-      - name: Run tests
-        run: ./gradlew --no-daemon solver:jacocoTestCoverageVerification generator:jacocoTestCoverageVerification
-
-      - name: Summarize tests results
-        uses: jeantessier/code-coverage-summary-action@v1
+      - name: Run tests and verify coverage
+        run: ./gradlew --no-daemon testCodeCoverageReport
+
+      - name: Add coverage to PR
+        id: jacoco
+        uses: madrapps/jacoco-report@v1.8.0
+        with:
+          paths: ${{ github.workspace }}/build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml
+          token: ${{ secrets.GITHUB_TOKEN }}
+          min-coverage-overall: 95
+          min-coverage-changed-lines: 0
+
+      - name: Verify coverage
+        run: ./gradlew jacocoTestCoverageVerification

.gitignore

@@ -2,6 +2,8 @@
 *.log
 *.logs
 
+bin/
+
 .gradle
 !gradle/wrapper/gradle-wrapper.jar
 **/build/

build.gradle.kts

@@ -0,0 +1,112 @@
+plugins {
+    id("java")
+    id("jacoco")
+    id("jacoco-report-aggregation")
+    kotlin("jvm") version "2.4.0" apply false
+    kotlin("plugin.allopen") version "2.4.0" apply false
+    id("maven-publish")
+    id("pl.allegro.tech.build.axion-release") version "1.21.2"
+}
+
+// Part of test code coverage report
+jacoco {
+    toolVersion = "0.8.14"
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    jacocoAggregation(project(":solver"))
+    jacocoAggregation(project(":generator"))
+    jacocoAggregation(project(":test-shared"))
+}
+
+tasks.testCodeCoverageReport {
+    reports {
+        xml.required.set(true)
+        html.required.set(true)
+        csv.required.set(true)
+    }
+    classDirectories.setFrom(classDirectories.filter { !it.path.contains("test-shared") })
+}
+
+tasks.jacocoTestCoverageVerification {
+    dependsOn(tasks.testCodeCoverageReport)
+
+    executionData.setFrom(tasks.testCodeCoverageReport.map { it.executionData })
+    sourceDirectories.setFrom(tasks.testCodeCoverageReport.map { it.sourceDirectories })
+    classDirectories.setFrom(tasks.testCodeCoverageReport.map { it.classDirectories })
+
+    violationRules {
+        rule {
+            isEnabled = true
+            limit {
+                counter = "INSTRUCTION"
+                value = "COVEREDRATIO"
+                minimum = "0.95".toBigDecimal()
+            }
+            limit {
+                counter = "BRANCH"
+                value = "COVEREDRATIO"
+                minimum = "0.80".toBigDecimal()
+            }
+            limit {
+                counter = "LINE"
+                value = "COVEREDRATIO"
+                minimum = "0.80".toBigDecimal()
+            }
+            limit {
+                counter = "METHOD";
+                value = "COVEREDRATIO"
+                minimum = "0.85".toBigDecimal()
+            }
+            limit {
+                counter = "CLASS"
+                value = "COVEREDRATIO"
+                minimum = "0.90".toBigDecimal()
+            }
+        }
+    }
+}
+
+// Part of publishing
+
+group = "org.ucfs"
+
+version = scmVersion.version
+
+subprojects {
+    version = rootProject.version
+    group = rootProject.group
+}
+
+evaluationDependsOnChildren()
+
+publishing {
+    publications {
+        create<MavenPublication>("solver") {
+            artifactId = "solver"
+            from(project(":solver").components.getByName("java"))
+        }
+        create<MavenPublication>("generator") {
+            artifactId = "generator"
+            from(project(":generator").components.getByName("java"))
+            versionMapping {
+                usage("java-api") { fromResolutionOf("runtimeClasspath") }
+                usage("java-runtime") { fromResolutionResult() }            
+            }
+        }
+    }
+    repositories {
+        maven {
+            name = "GitHubPackages"
+            url = uri("https://maven.pkg.github.com/GRIGAeo/UCFS")
+            credentials {
+                username = System.getenv("GITHUB_ACTOR")
+                password = System.getenv("GITHUB_TOKEN")
+            }
+        }
+    }
+}

generator/build.gradle.kts

@@ -1,11 +1,8 @@
 plugins {
-    kotlin("jvm") version "1.9.20"
-    jacoco
+    kotlin("jvm")
+    id("jacoco")
 }
 
-jacoco{
-    toolVersion = "0.8.14"
-}
 
 repositories {
     mavenCentral()
@@ -21,74 +18,6 @@ tasks.test {
     useJUnitPlatform()
 }
 
-tasks.jacocoTestReport{
-    dependsOn(":test-shared:test")
-    dependsOn(tasks.test)
-
-    val localExec = layout.buildDirectory.dir("jacoco").map { it.file("test.exec").asFile }
-    val testSharedExec = project(":test-shared").layout.buildDirectory.dir("jacoco").map { it.file("test.exec").asFile }
-    val classData1 = layout.buildDirectory.dir("classes/java/main").map{ it.asFile }
-    val classData2 = layout.buildDirectory.dir("classes/kotlin/main").map{ it.asFile }
-
-    classDirectories.setFrom(files(classData1, classData2))
-    sourceDirectories.setFrom(files("src/main/java", "src/main/kotlin"))
-    executionData.setFrom(files(localExec, testSharedExec))
-
-    reports{
-        xml.required.set(true)
-        html.required.set(true)
-        csv.required.set(true)
-    }
-}
-
-tasks.jacocoTestCoverageVerification{
-    dependsOn(tasks.jacocoTestReport)
-
-    val localExec = layout.buildDirectory.dir("jacoco").map { it.file("test.exec").asFile }
-    val testSharedExec = project(":test-shared").layout.buildDirectory.dir("jacoco").map { it.file("test.exec").asFile }
-    val classData1 = layout.buildDirectory.dir("classes/java/main").map{ it.asFile }
-    val classData2 = layout.buildDirectory.dir("classes/kotlin/main").map{ it.asFile }
-
-    classDirectories.setFrom(files(classData1, classData2))
-    sourceDirectories.setFrom(files("src/main/java", "src/main/kotlin"))
-    executionData.setFrom(files(localExec, testSharedExec))
-
-    violationRules{
-        rule{
-            isEnabled = true
-            limit{
-                counter = "INSTRUCTION"
-                value = "COVEREDRATIO"
-                minimum = "0.95".toBigDecimal()
-            }
-            limit{
-                counter = "BRANCH"
-                value = "COVEREDRATIO"
-                minimum = "0.8".toBigDecimal()
-            }
-            limit{
-                counter = "LINE"
-                value = "COVEREDRATIO"
-                minimum = "0.8".toBigDecimal()
-            }
-            limit{
-                counter = "METHOD"
-                value = "COVEREDRATIO"
-                minimum = "0.85".toBigDecimal()
-            }
-            limit {
-                counter = "CLASS"
-                value = "COVEREDRATIO"
-                minimum = "0.9".toBigDecimal()
-            }
-        }
-    }
-}
-
-tasks.check{
-    dependsOn(tasks.jacocoTestCoverageVerification)
-}
-
 kotlin {
     jvmToolchain(11)
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

@@ -5,4 +5,3 @@ rootProject.name = "ucfs"
 include("solver")
 include("generator")
 include("test-shared")
-include("publisher")