Skip to content

Commit

Permalink
Update dependencies, remove merge task, run Actions on all pushes
Browse files Browse the repository at this point in the history
  • Loading branch information
Thijsiez committed Dec 26, 2023
1 parent a8755ca commit a72f92b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 28 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: Test

on:
push:
branches: [main]
workflow_dispatch:
on: [push, workflow_dispatch]

jobs:
build:
Expand Down
22 changes: 2 additions & 20 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -61,30 +61,12 @@ configure(subprojects) {
}
}

val mergeReportsTaskName = "merged"
tasks.register<JacocoReport>(mergeReportsTaskName) {
dependsOn(project(":library").tasks.jacocoTestReport)
dependsOn(project(":examples").tasks.jacocoTestReport)

executionData.setFrom(
fileTree(project.layout.projectDirectory)
.apply { include("**/jacoco/*.exec") }
)
sourceSets(
project(":library").sourceSets["main"],
project(":examples").sourceSets["main"]
)

reports {
html.required = true
xml.required = true
}
}
tasks.test {
useJUnitPlatform()
finalizedBy(tasks[mergeReportsTaskName])
}

//Fixes issue with circular task dependency,
//see https://github.com/quarkusio/quarkus/issues/29698#issuecomment-1671861607
project.afterEvaluate {
getTasksByName("quarkusGenerateCode", true).forEach { task ->
task.setDependsOn(task.dependsOn.filterIsInstance<Provider<Task>>()
Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
#

#https://github.com/quarkusio/quarkus
quarkusVersion=3.5.0
quarkusVersion=3.6.4
#https://github.com/JetBrains/kotlin
kotlinVersion=1.9.10
kotlinVersion=1.9.21
#https://github.com/google/ksp
kspVersion=1.9.10-1.0.13
kspVersion=1.9.21-1.0.16
#https://github.com/square/kotlinpoet
kotlinPoetVersion=1.14.2
kotlinPoetVersion=1.15.3
#https://github.com/mockk/mockk
mockkVersion=1.13.8
#https://github.com/tschuchortdev/kotlin-compile-testing
Expand Down

0 comments on commit a72f92b

Please sign in to comment.