Skip to content

Commit

Permalink
Add JSpecify as a build dependency without using it yet.
Browse files Browse the repository at this point in the history
The CL in which I begin using it has gotten very large, so I'm splitting it up where possible.

(progress toward jspecify/jspecify#239)

RELNOTES=n/a
PiperOrigin-RevId: 707910697
  • Loading branch information
cpovirk authored and Google Java Core Libraries committed Dec 19, 2024
1 parent e25ee0c commit df037c5
Show file tree
Hide file tree
Showing 10 changed files with 66 additions and 0 deletions.
4 changes: 4 additions & 0 deletions android/guava-testlib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
unit testing - particularly to assist the tests for Guava itself.
</description>
<dependencies>
<dependency>
<groupId>org.jspecify</groupId>
<artifactId>jspecify</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
Expand Down
4 changes: 4 additions & 0 deletions android/guava-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jspecify</groupId>
<artifactId>jspecify</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
Expand Down
4 changes: 4 additions & 0 deletions android/guava/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
<artifactId>listenablefuture</artifactId>
<version>9999.0-empty-to-avoid-conflict-with-guava</version>
</dependency>
<dependency>
<groupId>org.jspecify</groupId>
<artifactId>jspecify</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
Expand Down
6 changes: 6 additions & 0 deletions android/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<!-- Override this with -Dtest.include="**/SomeTest.java" on the CLI -->
<test.include>%regex[.*.class]</test.include>
<truth.version>1.4.4</truth.version>
<jspecify.version>1.0.0</jspecify.version>
<jsr305.version>3.0.2</jsr305.version>
<checker.version>3.43.0</checker.version>
<errorprone.version>2.36.0</errorprone.version>
Expand Down Expand Up @@ -417,6 +418,11 @@
</distributionManagement>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jspecify</groupId>
<artifactId>jspecify</artifactId>
<version>${jspecify.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
Expand Down
4 changes: 4 additions & 0 deletions guava-testlib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
unit testing - particularly to assist the tests for Guava itself.
</description>
<dependencies>
<dependency>
<groupId>org.jspecify</groupId>
<artifactId>jspecify</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
Expand Down
4 changes: 4 additions & 0 deletions guava-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jspecify</groupId>
<artifactId>jspecify</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
Expand Down
28 changes: 28 additions & 0 deletions guava/module.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,13 @@
"requires": "9999.0-empty-to-avoid-conflict-with-guava"
}
},
{
"group": "org.jspecify",
"module": "jspecify",
"version": {
"requires": "${jspecify.version}"
}
},
{
"group": "com.google.code.findbugs",
"module": "jsr305",
Expand Down Expand Up @@ -113,6 +120,13 @@
"requires": "9999.0-empty-to-avoid-conflict-with-guava"
}
},
{
"group": "org.jspecify",
"module": "jspecify",
"version": {
"requires": "${jspecify.version}"
}
},
{
"group": "com.google.code.findbugs",
"module": "jsr305",
Expand Down Expand Up @@ -186,6 +200,13 @@
"requires": "9999.0-empty-to-avoid-conflict-with-guava"
}
},
{
"group": "org.jspecify",
"module": "jspecify",
"version": {
"requires": "${jspecify.version}"
}
},
{
"group": "com.google.code.findbugs",
"module": "jsr305",
Expand Down Expand Up @@ -259,6 +280,13 @@
"requires": "9999.0-empty-to-avoid-conflict-with-guava"
}
},
{
"group": "org.jspecify",
"module": "jspecify",
"version": {
"requires": "${jspecify.version}"
}
},
{
"group": "com.google.code.findbugs",
"module": "jsr305",
Expand Down
4 changes: 4 additions & 0 deletions guava/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
<artifactId>listenablefuture</artifactId>
<version>9999.0-empty-to-avoid-conflict-with-guava</version>
</dependency>
<dependency>
<groupId>org.jspecify</groupId>
<artifactId>jspecify</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
Expand Down
2 changes: 2 additions & 0 deletions integration-tests/gradle/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ val expectedReducedRuntimeClasspathAndroidVersion =
"guava-${guavaVersionJre.replace("jre", "android")}.jar",
"failureaccess-1.0.2.jar",
"j2objc-annotations-3.0.0.jar",
"jspecify-1.0.0.jar",
"jsr305-3.0.2.jar",
"checker-qual-3.43.0.jar",
"error_prone_annotations-2.36.0.jar",
Expand All @@ -19,6 +20,7 @@ val expectedReducedRuntimeClasspathJreVersion =
"guava-$guavaVersionJre.jar",
"failureaccess-1.0.2.jar",
"j2objc-annotations-3.0.0.jar",
"jspecify-1.0.0.jar",
"jsr305-3.0.2.jar",
"checker-qual-3.43.0.jar",
"error_prone_annotations-2.36.0.jar",
Expand Down
6 changes: 6 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<!-- Override this with -Dtest.include="**/SomeTest.java" on the CLI -->
<test.include>%regex[.*.class]</test.include>
<truth.version>1.4.4</truth.version>
<jspecify.version>1.0.0</jspecify.version>
<jsr305.version>3.0.2</jsr305.version>
<checker.version>3.43.0</checker.version>
<errorprone.version>2.36.0</errorprone.version>
Expand Down Expand Up @@ -412,6 +413,11 @@
</distributionManagement>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jspecify</groupId>
<artifactId>jspecify</artifactId>
<version>${jspecify.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
Expand Down

0 comments on commit df037c5

Please sign in to comment.