Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:
- uses: actions/checkout@v4
- name: Setup Linux display
run: sudo apt-get install at-spi2-core
- name: Set up JDK 21
- name: Set up JDK 25
uses: actions/setup-java@v4
with:
java-version: '21'
java-version: '25'
distribution: 'temurin'

# Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
Expand All @@ -49,10 +49,10 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Set up JDK 21
- name: Set up JDK 25
uses: actions/setup-java@v4
with:
java-version: '21'
java-version: '25'
distribution: 'temurin'

# Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
Expand Down
23 changes: 15 additions & 8 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import com.fagi.test.TestResultsService
import info.solidsoft.gradle.pitest.PitestPluginExtension
import org.gradle.api.tasks.testing.TestDescriptor
import org.gradle.api.tasks.testing.TestListener
import org.gradle.api.tasks.testing.TestResult
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
import org.gradle.api.tasks.testing.logging.TestLogEvent

Expand All @@ -17,16 +20,16 @@ subprojects {
apply(plugin = "info.solidsoft.pitest")

tasks.withType<JavaCompile> {
sourceCompatibility = JavaVersion.VERSION_21.toString()
targetCompatibility = JavaVersion.VERSION_21.toString()
sourceCompatibility = JavaVersion.VERSION_25.toString()
targetCompatibility = JavaVersion.VERSION_25.toString()
}

configure<PitestPluginExtension> {
threads.set(4)
outputFormats.set(listOf("XML", "HTML"))
exportLineCoverage.set(true)
timestampedReports.set(false)
junit5PluginVersion.set("1.2.2")
junit5PluginVersion.set("1.2.3")
verbose.set(false)

if (project.name in listOf("shared")) {
Expand Down Expand Up @@ -59,11 +62,15 @@ allprojects {
}

// After a test suite is done running this is called to register the result
afterSuite(KotlinClosure2<TestDescriptor, TestResult, Unit>({ desc, result ->
if (desc.parent == null) {
val testResultsService = testResultsServiceProvider.get()
testResultsService.addTestResult(desc, result)
addTestListener(object : TestListener {
override fun beforeSuite(suite: TestDescriptor) {}
override fun beforeTest(testDescriptor: TestDescriptor) {}
override fun afterTest(testDescriptor: TestDescriptor, result: TestResult) {}
override fun afterSuite(suite: TestDescriptor, result: TestResult) {
if (suite.parent == null) {
testResultsServiceProvider.get().addTestResult(suite, result)
}
}
}))
})
}
}
2 changes: 1 addition & 1 deletion fagiClient/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ tasks.test {
}

javafx {
version = "21"
version = "25.0.3"
modules = mutableListOf("javafx.controls", "javafx.fxml", "javafx.web", "javafx.graphics")
}

Expand Down
10 changes: 5 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[versions]
junit = "6.1.0-M1"
mockito = "5.21.0"
junit = "6.1.0"
mockito = "5.23.0"
testfx = "4.0.18"

[libraries]
# --------- Prod dependenices ---------
gson = { module = "com.google.code.gson:gson", version = "2.13.2" }
gson = { module = "com.google.code.gson:gson", version = "2.14.0" }
# -------------------------------------

# --------- Test dependenices ---------
Expand All @@ -18,7 +18,7 @@ junit-platform = { module = "org.junit.platform:junit-platform-suite", version.r
mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" }

openjfx-javafx-swing = { module = "org.openjfx:javafx-swing", version = "21.0.9" }
openjfx-javafx-swing = { module = "org.openjfx:javafx-swing", version = "25.0.3" }

testfx-core = { module = "org.testfx:testfx-core", version.ref = "testfx" }
testfx-junit5 = { module = "org.testfx:testfx-junit5", version.ref = "testfx" }
Expand All @@ -32,4 +32,4 @@ testfx = ["openjfx-javafx-swing", "testfx-core", "testfx-junit5", "testfx-openjf

[plugins]
javafx = { id = "org.openjfx.javafxplugin", version = "0.1.0" }
pitest = { id = "info.solidsoft.pitest", version = "1.15.0" }
pitest = { id = "info.solidsoft.pitest", version = "1.19.0" }
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
11 changes: 4 additions & 7 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 12 additions & 24 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading