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

Support eisop fork without warnings #279

Merged
merged 3 commits into from
Jun 26, 2024
Merged

Support eisop fork without warnings #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e156078
eisop w/o warnings
kelloggm Jun 25, 2024
3587bdf
Merge branch 'master' into eisop-no-warn
mernst Jun 25, 2024
510fecf
Expand comment
mernst Jun 25, 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
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Add the following to your `build.gradle` file:
```groovy
plugins {
// Checker Framework pluggable type-checking
id 'org.checkerframework' version '0.6.40'
id 'org.checkerframework' version '0.6.41'
}

apply plugin: 'org.checkerframework'
Expand Down Expand Up @@ -94,7 +94,7 @@ the definitions of the custom qualifiers.

### Specifying a Checker Framework version

Version 0.6.40 of this plugin uses Checker Framework version 3.44.0 by default.
Version 0.6.41 of this plugin uses Checker Framework version 3.44.0 by default.
Anytime you upgrade to a newer version of this plugin,
it might use a different version of the Checker Framework.

Expand Down Expand Up @@ -258,7 +258,7 @@ top-level project is a Java project). For example:

```groovy
plugins {
id 'org.checkerframework' version '0.6.40' apply false
id 'org.checkerframework' version '0.6.41' apply false
}

subprojects { subproject ->
Expand Down Expand Up @@ -299,7 +299,7 @@ plugins {
id "net.ltgt.errorprone" version "1.1.1" apply false
// To do Checker Framework pluggable type-checking (and disable Error Prone), run:
// ./gradlew compileJava -PuseCheckerFramework=true
id 'org.checkerframework' version '0.6.40' apply false
id 'org.checkerframework' version '0.6.41' apply false
}

if (!project.hasProperty("useCheckerFramework")) {
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies {
}

group 'org.checkerframework'
version '0.6.40'
version '0.6.41'

gradlePlugin {
website = 'https://github.com/kelloggm/checkerframework-gradle-plugin/blob/master/README.md'
Expand Down
6 changes: 3 additions & 3 deletions src/main/groovy/org/checkerframework/gradle/plugin/CheckerFrameworkPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,9 +311,9 @@ final class CheckerFrameworkPlugin implements Plugin<Project> {
def versionString
try {
def actualCFDependencySet = project.configurations.checkerFramework.getAllDependencies()
.matching({ dep ->
dep.getName().equals("checker") && dep.getGroup().equals("org.checkerframework")
})
// Only check the name of the dependency (not the group), to support forks
// of the CF that use the same version scheme, such as the EISOP fork.
.matching({ dep -> dep.getName().equals("checker")})
if (actualCFDependencySet.size() == 0) {
if (userConfig.skipVersionCheck) {
versionString = LIBRARY_VERSION
Expand Down
Loading