Skip to content
Open
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
42 changes: 26 additions & 16 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import de.undercouch.gradle.tasks.download.Download
import org.gradle.api.tasks.testing.TestDescriptor
import org.gradle.api.tasks.testing.TestListener
import org.gradle.api.tasks.testing.TestResult

plugins {
// https://plugins.gradle.org/plugin/com.gradleup.shadow
Expand Down Expand Up @@ -88,7 +91,7 @@ ext {
// * Uncomment "-Werror"
errorprone : '2.48.0',
// NOTE: Google Java Format requires JDK 17 or higher as of version 1.25.0.
googleJavaFormat : '1.25.2',
googleJavaFormat : '1.35.0',
hashmapUtil : '0.0.1',
junit : '4.13.2',
lombok : '1.18.44',
Expand Down Expand Up @@ -146,7 +149,7 @@ spotless {
// > Could not create task ':checker-qual:spotlessJava'.
// > File signature can only be created for existing regular files, given:
// .../checker-framework/checker-qual/build/libs/checker-qual-3.25.1-SNAPSHOT.jar
predeclareDepsFromBuildscript()
predeclareDeps()
}

spotlessPredeclare {
Expand Down Expand Up @@ -207,11 +210,11 @@ allprojects { currentProj ->
dependencies {
if (useJdkVersionInt >= 21) {
// Only include Error Prone when its minimum version is met. It will not always be enabled.
errorprone group: 'com.google.errorprone', name: 'error_prone_core', version: versions.errorprone
errorprone("com.google.errorprone:error_prone_core:${versions.errorprone}")
}

// Always define javacJar, not just when `isJava8` is true, because we redistribute it in checker/build.gradle.
javacJar group: 'com.google.errorprone', name: 'javac', version: "9+181-r4173-1"
javacJar("com.google.errorprone:javac:9+181-r4173-1")

allProjects subprojects
}
Expand Down Expand Up @@ -1212,18 +1215,25 @@ subprojects {
}

// After each test, print a summary.
afterSuite { desc, result ->
if (desc.getClassName() != null) {
long mils = result.getEndTime() - result.getStartTime()
double seconds = mils / 1000.0

println "Testsuite: ${desc.getClassName()}\n" +
"Tests run: ${result.testCount}, " +
"Failures: ${result.failedTestCount}, " +
"Skipped: ${result.skippedTestCount}, " +
"Time elapsed: ${seconds} sec\n"
}
}
addTestListener(new TestListener() {
@Override void beforeSuite(TestDescriptor suite) {}
@Override void beforeTest(TestDescriptor test) {}
@Override void afterTest(TestDescriptor test, TestResult result) {}

@Override
void afterSuite(TestDescriptor desc, TestResult result) {
if (desc.getClassName() != null) {
long mils = result.getEndTime() - result.getStartTime()
double seconds = mils / 1000.0

println "Testsuite: ${desc.getClassName()}\n" +
"Tests run: ${result.testCount}, " +
"Failures: ${result.failedTestCount}, " +
"Skipped: ${result.skippedTestCount}, " +
"Time elapsed: ${seconds} sec\n"
}
}
})
}

// Create a nonJunitTests task per project
Expand Down
13 changes: 13 additions & 0 deletions checker-qual/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,19 @@ sourceSets {
}
}

jar {
doLast {
copy {
from archiveFile
into layout.projectDirectory.file('../checker/dist')
rename { String fileName ->
// remove version number on checker-qual.jar
fileName.replace(fileName, 'checker-qual.jar')
}
}
}
}

task compileJava9(type: JavaCompile) {
source = sourceSets.module_info.java
destinationDirectory = sourceSets.main.output.classesDirs[0]
Expand Down
13 changes: 13 additions & 0 deletions checker-util/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,19 @@ dependencies {
testImplementation "junit:junit:${versions.junit}"
}

jar {
doLast {
copy {
from archiveFile
into layout.projectDirectory.file('../checker/dist')
rename { String fileName ->
// remove version number on checker-util.jar
fileName.replace(fileName, 'checker-util.jar')
}
}
}
}

apply from: rootProject.file('gradle-mvn-push.gradle')

/** Adds information to the publication for uploading to Maven repositories. */
Expand Down
Loading
Loading