diff --git a/build.gradle b/build.gradle index 1abef41f..aac779c6 100644 --- a/build.gradle +++ b/build.gradle @@ -22,14 +22,15 @@ repositories { } jacoco { - toolVersion = "0.8.7" + toolVersion = "0.8.12" } tasks.jacocoTestReport { dependsOn test // Ensure tests run before generating the report reports { - xml.required.set(true) - html.required.set(true) + xml.required = false + csv.required = false + html.required = true } } @@ -38,9 +39,9 @@ dependencies { testImplementation('com.intellij.remoterobot:remote-fixtures:' + remoteRobotVersion) { exclude group: 'com.square.okio', module: 'okio' } - testImplementation 'com.squareup.okio:okio:3.8.0' + testImplementation 'com.squareup.okio:okio:3.10.0' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.1' - testImplementation 'com.squareup.okhttp3:okhttp:4.9.2' + testImplementation 'com.squareup.okhttp:4.12.0' testImplementation 'junit:junit:4.11-redhat-1' testImplementation 'junit:junit:4.13.1' @@ -89,6 +90,10 @@ test { useJUnitPlatform() systemProperty 'uiWaitDuration', project.findProperty('uiWaitDuration') ?: 300 testLogging { + events "passed", "skipped", "failed", "standardOut", "standardError" + showExceptions true + showCauses true + showStackTraces true showStandardStreams = true } } @@ -99,14 +104,14 @@ runIdeForUiTests { } jacocoTestReport { - additionalSourceDirs.setFrom(files(sourceSets.main.allSource.srcDirs)) - classDirectories.setFrom( - fileTree(dir: "$buildDir/classes/java/main", excludes: []) - ) - executionData.setFrom(fileTree(dir: "$buildDir", includes: ["jacoco/test.exec"])) + dependsOn test + + reports { + xml.required = true + html.required = true + } } - publishPlugin { token.set System.getenv("PUBLISH_TOKEN") if (project.hasProperty("rchannels")) { @@ -114,7 +119,6 @@ publishPlugin { } } - java { toolchain { languageVersion.set(JavaLanguageVersion.of(11)) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e1bef7e8..d6e308a6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists