From 97256f7a317f3abee4ce3e2228c8676c1dbed783 Mon Sep 17 00:00:00 2001 From: Rohan Shetty <35475826+rohan-shettyy@users.noreply.github.com> Date: Wed, 10 Jul 2024 17:03:32 -0400 Subject: [PATCH] Update local dependencies (#6) --- build.gradle | 24 +++++++++++++++++------- gradle/libs.versions.toml | 2 ++ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 460849a..55fc83e 100644 --- a/build.gradle +++ b/build.gradle @@ -33,15 +33,8 @@ dependencies { testImplementation libs.junit testRuntimeOnly libs.junit - // This dependency is used by the application. - implementation libs.guava - testImplementation libs.jspecify.conformance.framework jSpecifyConformanceTests libs.jspecify.conformance.tests - - testImplementation libs.checkerframework.checker - testImplementation libs.checkerframework.framework.test - testImplementation libs.checkerframework.qual } // To use a locally-built Checker Framework, run gradle with "-PcfLocal". @@ -49,6 +42,23 @@ if (hasProperty('cfLocal')) { def cfHome = String.valueOf(System.getenv('CHECKERFRAMEWORK')) dependencies { testImplementation files(cfHome + '/checker/dist/checker.jar') + testImplementation files(cfHome + '/checker/dist/checker-qual.jar') + + def frameworkTestTree = fileTree(dir: cfHome + '/framework-test/build/libs', + include: '*.jar', + exclude: ['*-sources.jar', '*-javadoc.jar']) + + if (frameworkTestTree.files.size() != 1) { + logger.warn("Expected exactly one framework-test jar, but found " + frameworkTestTree.files.size() + " jars.") + } + testImplementation frameworkTestTree + testImplementation libs.plume.utils + } +} else { + dependencies { + testImplementation libs.checkerframework.checker + testImplementation libs.checkerframework.framework.test + testImplementation libs.checkerframework.qual } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 87515a0..4a16726 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,6 +3,7 @@ junitVer = "5.10.3" guavaVer = "33.2.1-jre" jSpecifyConformanceTestVer = "0.0.0-SNAPSHOT" checkerFrameworkVer = "3.42.0-eisop3" +plumeUtilVer = "1.9.0" [libraries] junit = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junitVer" } @@ -12,3 +13,4 @@ jspecify-conformance-framework = { module = "org.jspecify.conformance:conformanc checkerframework-checker = { module = "io.github.eisop:checker", version.ref = "checkerFrameworkVer" } checkerframework-framework-test = { module = "io.github.eisop:framework-test", version.ref = "checkerFrameworkVer" } checkerframework-qual = { module = "io.github.eisop:checker-qual", version.ref = "checkerFrameworkVer" } +plume-utils = { module = "org.plumelib:plume-util", version.ref = "plumeUtilVer" }