Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update local dependencies #6

Merged
merged 4 commits into from
Jul 10, 2024
Merged

Update local dependencies #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c803f60
Add local plume-utils dependency
rohan-shettyy Apr 26, 2024
0388fd5
refactor dependencies
rohan-shettyy Apr 27, 2024
f1cdce9
Merge branch 'main' into local-cf
wmdietl Jul 10, 2024
5950956
Merge branch 'main' into local-cf
wmdietl Jul 10, 2024
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
24 changes: 17 additions & 7 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,32 @@ 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".
if (hasProperty('cfLocal')) {
def cfHome = String.valueOf(System.getenv('CHECKERFRAMEWORK'))
rohan-shettyy marked this conversation as resolved.
Show resolved Hide resolved
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
}
rohan-shettyy marked this conversation as resolved.
Show resolved Hide resolved
} else {
dependencies {
testImplementation libs.checkerframework.checker
testImplementation libs.checkerframework.framework.test
testImplementation libs.checkerframework.qual
}
}

Expand Down
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand All @@ -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" }
Loading