Skip to content

Commit 800b3d4

Browse files
cpovirkGoogle Java Core Libraries
authored andcommitted
Remove dependency on Checker Framework annotations.
This is the final(?) step in [using JSpecify in Guava](jspecify/jspecify#239 (comment)). RELNOTES=n/a PiperOrigin-RevId: 708715141
1 parent 2cc8c5e commit 800b3d4

File tree

13 files changed

+0
-280
lines changed

13 files changed

+0
-280
lines changed

android/guava-testlib/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@
2424
<version>3.0.2</version>
2525
<scope>test</scope>
2626
</dependency>
27-
<dependency>
28-
<groupId>org.checkerframework</groupId>
29-
<artifactId>checker-qual</artifactId>
30-
</dependency>
3127
<dependency>
3228
<groupId>com.google.errorprone</groupId>
3329
<artifactId>error_prone_annotations</artifactId>

android/guava-tests/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
<groupId>org.jspecify</groupId>
2626
<artifactId>jspecify</artifactId>
2727
</dependency>
28-
<dependency>
29-
<groupId>org.checkerframework</groupId>
30-
<artifactId>checker-qual</artifactId>
31-
</dependency>
3228
<dependency>
3329
<groupId>com.google.errorprone</groupId>
3430
<artifactId>error_prone_annotations</artifactId>

android/guava/javadoc-link/checker-framework/package-list

Lines changed: 0 additions & 101 deletions
This file was deleted.

android/guava/pom.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@
3232
<groupId>org.jspecify</groupId>
3333
<artifactId>jspecify</artifactId>
3434
</dependency>
35-
<dependency>
36-
<groupId>org.checkerframework</groupId>
37-
<artifactId>checker-qual</artifactId>
38-
</dependency>
3935
<dependency>
4036
<groupId>com.google.errorprone</groupId>
4137
<artifactId>error_prone_annotations</artifactId>
@@ -161,10 +157,6 @@
161157
<url>https://static.javadoc.io/com.google.j2objc/j2objc-annotations/1.1/</url>
162158
<location>${project.basedir}/javadoc-link/j2objc-annotations</location>
163159
</offlineLink>
164-
<offlineLink>
165-
<url>https://checkerframework.org/api/</url>
166-
<location>${project.basedir}/javadoc-link/checker-framework</location>
167-
</offlineLink>
168160
</offlineLinks>
169161
<links>
170162
<link>https://docs.oracle.com/javase/21/docs/api/</link>

android/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
<test.include>%regex[.*.class]</test.include>
2323
<truth.version>1.4.4</truth.version>
2424
<jspecify.version>1.0.0</jspecify.version>
25-
<checker.version>3.43.0</checker.version>
2625
<errorprone.version>2.36.0</errorprone.version>
2726
<j2objc.version>3.0.0</j2objc.version>
2827
<!-- Empty for all JDKs but 9-12 -->
@@ -422,11 +421,6 @@
422421
<artifactId>jspecify</artifactId>
423422
<version>${jspecify.version}</version>
424423
</dependency>
425-
<dependency>
426-
<groupId>org.checkerframework</groupId>
427-
<artifactId>checker-qual</artifactId>
428-
<version>${checker.version}</version>
429-
</dependency>
430424
<dependency>
431425
<groupId>com.google.errorprone</groupId>
432426
<artifactId>error_prone_annotations</artifactId>

guava-gwt/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,6 @@
122122
</exclusion>
123123
</exclusions>
124124
</dependency>
125-
<dependency>
126-
<groupId>org.checkerframework</groupId>
127-
<artifactId>checker-qual</artifactId>
128-
</dependency>
129125
</dependencies>
130126
<build>
131127
<plugins>

guava-testlib/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@
2424
<version>3.0.2</version>
2525
<scope>test</scope>
2626
</dependency>
27-
<dependency>
28-
<groupId>org.checkerframework</groupId>
29-
<artifactId>checker-qual</artifactId>
30-
</dependency>
3127
<dependency>
3228
<groupId>com.google.errorprone</groupId>
3329
<artifactId>error_prone_annotations</artifactId>

guava-tests/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
<groupId>org.jspecify</groupId>
2626
<artifactId>jspecify</artifactId>
2727
</dependency>
28-
<dependency>
29-
<groupId>org.checkerframework</groupId>
30-
<artifactId>checker-qual</artifactId>
31-
</dependency>
3228
<dependency>
3329
<groupId>com.google.errorprone</groupId>
3430
<artifactId>error_prone_annotations</artifactId>

guava/javadoc-link/checker-framework/package-list

Lines changed: 0 additions & 101 deletions
This file was deleted.

guava/module.json

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,6 @@
4747
"requires": "${jspecify.version}"
4848
}
4949
},
50-
{
51-
"group": "org.checkerframework",
52-
"module": "checker-qual",
53-
"version": {
54-
"requires": "${checker.version}"
55-
}
56-
},
5750
{
5851
"group": "com.google.errorprone",
5952
"module": "error_prone_annotations",
@@ -120,13 +113,6 @@
120113
"requires": "${jspecify.version}"
121114
}
122115
},
123-
{
124-
"group": "org.checkerframework",
125-
"module": "checker-qual",
126-
"version": {
127-
"requires": "${checker.version}"
128-
}
129-
},
130116
{
131117
"group": "com.google.errorprone",
132118
"module": "error_prone_annotations",
@@ -193,13 +179,6 @@
193179
"requires": "${jspecify.version}"
194180
}
195181
},
196-
{
197-
"group": "org.checkerframework",
198-
"module": "checker-qual",
199-
"version": {
200-
"requires": "${checker.version}"
201-
}
202-
},
203182
{
204183
"group": "com.google.errorprone",
205184
"module": "error_prone_annotations",
@@ -266,13 +245,6 @@
266245
"requires": "${jspecify.version}"
267246
}
268247
},
269-
{
270-
"group": "org.checkerframework",
271-
"module": "checker-qual",
272-
"version": {
273-
"requires": "${checker.version}"
274-
}
275-
},
276248
{
277249
"group": "com.google.errorprone",
278250
"module": "error_prone_annotations",

0 commit comments

Comments
 (0)