Skip to content

Ci fix #16

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

Open
aosen-xiong wants to merge 26 commits into
base: master
Choose a base branch
from
Open

Ci fix #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
df2b5e1
Use latest eisop
aosen-xiong Oct 6, 2025
4f0811b
Add versions
aosen-xiong Oct 6, 2025
ba7deeb
Add more versions
aosen-xiong Oct 6, 2025
25fd508
Add more versions
aosen-xiong Oct 6, 2025
66a2422
Add more versions
aosen-xiong Oct 6, 2025
8ce33c7
Use latest eisop
aosen-xiong Oct 6, 2025
354ab44
Use checker.version
aosen-xiong Oct 6, 2025
6dfe27b
Use latest eisop
aosen-xiong Oct 6, 2025
92a7068
Try latest errorprone
aosen-xiong Oct 6, 2025
5b404bb
Try disable errorprone
aosen-xiong Oct 6, 2025
eb23a47
Try disable errorprone
aosen-xiong Oct 6, 2025
db89f0c
Use correct eisop
aosen-xiong Oct 6, 2025
96f69a0
Use artifact from eisop
aosen-xiong Oct 6, 2025
0a68422
Use artifact from eisop
aosen-xiong Oct 6, 2025
6a9efa7
Update Checker Framework to 3.49.5-eisop1
aosen-xiong Jun 16, 2026
b46945d
Remove stale guava-gwt selector
aosen-xiong Jun 16, 2026
f7cb7b8
Align JRE child parent versions
aosen-xiong Jun 16, 2026
1cc936e
Align Android artifact version
aosen-xiong Jun 16, 2026
0bafc7e
Derive Gradle checker version expectation
aosen-xiong Jun 16, 2026
a421065
Update Gradle JRE classpath expectations
aosen-xiong Jun 16, 2026
5d33390
Use EISOP checker group in Gradle metadata
aosen-xiong Jun 16, 2026
9836f52
Handle cross-variant Gradle metadata dependencies
aosen-xiong Jun 16, 2026
8c8c147
Restore Error Prone compiler arg
aosen-xiong Jun 16, 2026
7ed4eb3
Disable Error Prone plugin arg
aosen-xiong Jun 16, 2026
815d0a9
Wire Error Prone compiler plugin path
aosen-xiong Jun 16, 2026
79bdb65
Use JDK 11-compatible Error Prone
aosen-xiong Jun 16, 2026
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
2 changes: 1 addition & 1 deletion android/guava-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<groupId>com.google.guava</groupId>
<artifactId>guava-bom</artifactId>
<version>33.1.0-android</version>
<version>33.1.0.2-android</version>
<packaging>pom</packaging>

<parent>
Expand Down
4 changes: 2 additions & 2 deletions android/guava-testlib/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.google.guava</groupId>
<artifactId>guava-parent</artifactId>
<version>33.1.0-android</version>
<version>33.1.0.2-android</version>
</parent>
<artifactId>guava-testlib</artifactId>
<name>Guava Testing Library</name>
Expand All @@ -19,7 +19,7 @@
<artifactId>jsr305</artifactId>
</dependency>
<dependency>
<groupId>org.checkerframework</groupId>
<groupId>io.github.eisop</groupId>
<artifactId>checker-qual</artifactId>
</dependency>
<dependency>
Expand Down
5 changes: 3 additions & 2 deletions android/guava-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.google.guava</groupId>
<artifactId>guava-parent</artifactId>
<version>33.1.0-android</version>
<version>33.1.0.2-android</version>
</parent>
<artifactId>guava-tests</artifactId>
<name>Guava Unit Tests</name>
Expand All @@ -26,8 +26,9 @@
<artifactId>jsr305</artifactId>
</dependency>
<dependency>
<groupId>org.checkerframework</groupId>
<groupId>io.github.eisop</groupId>
<artifactId>checker-qual</artifactId>
<version>${checker.version}</version>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
Expand Down
2 changes: 1 addition & 1 deletion android/guava/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.google.guava</groupId>
<artifactId>guava-parent</artifactId>
<version>33.1.0-android</version>
<version>33.1.0.2-android</version>
</parent>
<artifactId>guava</artifactId>
<packaging>bundle</packaging>
Expand Down
15 changes: 9 additions & 6 deletions android/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.guava</groupId>
<artifactId>guava-parent</artifactId>
<version>33.1.0-android</version>
<version>33.1.0.2-android</version>
<packaging>pom</packaging>
<name>Guava Maven Parent</name>
<description>Parent for guava artifacts</description>
Expand All @@ -16,7 +16,7 @@
<test.include>%regex[.*.class]</test.include>
<truth.version>1.4.2</truth.version>
<jsr305.version>3.0.2</jsr305.version>
<checker.version>3.34.0-eisop1</checker.version>
<checker.version>3.49.5-eisop1</checker.version>
<errorprone.version>2.26.1</errorprone.version>
<j2objc.version>3.0.0</j2objc.version>
<javac.version>9+181-r4173-1</javac.version>
Expand All @@ -29,7 +29,7 @@
<module.status>release</module.status>
<variant.jvmEnvironment>android</variant.jvmEnvironment>
<variant.jvmEnvironmentVariantName>android</variant.jvmEnvironmentVariantName>
<otherVariant.version>33.1.0-jre</otherVariant.version>
<otherVariant.version>33.1.0.2-jre</otherVariant.version>
<otherVariant.jvmEnvironment>standard-jvm</otherVariant.jvmEnvironment>
<otherVariant.jvmEnvironmentVariantName>jre</otherVariant.jvmEnvironmentVariantName>
</properties>
Expand Down Expand Up @@ -141,15 +141,18 @@
<arg>-XDcompilePolicy=simple</arg>
<!-- -Xplugin:ErrorProne is set conditionally by a profile. -->
</compilerArgs>
<!--
<annotationProcessorPaths>
<path>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
<version>2.23.0</version>
<version>${errorprone.version}</version>
</path>
<path>
<groupId>io.github.eisop</groupId>
<artifactId>checker</artifactId>
<version>${checker.version}</version>
</path>
</annotationProcessorPaths>
-->
<!-- Fork:

- for JDK8 because we use a javac9 bootclasspath
Expand Down
2 changes: 1 addition & 1 deletion guava-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<groupId>com.google.guava</groupId>
<artifactId>guava-bom</artifactId>
<version>33.1.0-jre</version>
<version>33.1.0.2-jre</version>
<packaging>pom</packaging>

<parent>
Expand Down
2 changes: 1 addition & 1 deletion guava-gwt/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.google.guava</groupId>
<artifactId>guava-parent</artifactId>
<version>33.1.0-jre</version>
<version>33.1.0.2-jre</version>
</parent>
<artifactId>guava-gwt</artifactId>
<name>Guava GWT compatible libs</name>
Expand Down
3 changes: 2 additions & 1 deletion guava-testlib/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.google.guava</groupId>
<artifactId>guava-parent</artifactId>
<version>33.1.0-jre</version>
<version>33.1.0.2-jre</version>
</parent>
<artifactId>guava-testlib</artifactId>
<name>Guava Testing Library</name>
Expand All @@ -21,6 +21,7 @@
<dependency>
<groupId>io.github.eisop</groupId>
<artifactId>checker-qual</artifactId>
<version>${checker.version}</version>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
Expand Down
3 changes: 2 additions & 1 deletion guava-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.google.guava</groupId>
<artifactId>guava-parent</artifactId>
<version>33.1.0-jre</version>
<version>33.1.0.2-jre</version>
</parent>
<artifactId>guava-tests</artifactId>
<name>Guava Unit Tests</name>
Expand All @@ -28,6 +28,7 @@
<dependency>
<groupId>io.github.eisop</groupId>
<artifactId>checker-qual</artifactId>
<version>${checker.version}</version>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
Expand Down
2 changes: 1 addition & 1 deletion guava/cfMavenCentral.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<dependency>
<groupId>io.github.eisop</groupId>
<artifactId>checker-qual</artifactId>
<version>3.42.0-eisop5</version>
<version>3.49.5-eisop1</version>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
Expand Down
8 changes: 4 additions & 4 deletions guava/module.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
}
},
{
"group": "org.checkerframework",
"group": "io.github.eisop",
"module": "checker-qual",
"version": {
"requires": "${checker.version}"
Expand Down Expand Up @@ -121,7 +121,7 @@
}
},
{
"group": "org.checkerframework",
"group": "io.github.eisop",
"module": "checker-qual",
"version": {
"requires": "${checker.version}"
Expand Down Expand Up @@ -187,7 +187,7 @@
}
},
{
"group": "org.checkerframework",
"group": "io.github.eisop",
"module": "checker-qual",
"version": {
"requires": "${checker.version}"
Expand Down Expand Up @@ -260,7 +260,7 @@
}
},
{
"group": "org.checkerframework",
"group": "io.github.eisop",
"module": "checker-qual",
"version": {
"requires": "${checker.version}"
Expand Down
3 changes: 3 additions & 0 deletions guava/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,17 @@
<dependency>
<groupId>io.github.eisop</groupId>
<artifactId>checker-qual</artifactId>
<version>${checker.version}</version>
</dependency>
<dependency>
<groupId>io.github.eisop</groupId>
<artifactId>checker-util</artifactId>
<version>${checker.version}</version>
</dependency>
<dependency>
<groupId>io.github.eisop</groupId>
<artifactId>checker</artifactId>
<version>${checker.version}</version>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
Expand Down
75 changes: 65 additions & 10 deletions integration-tests/gradle/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,70 @@
val runningGradle5 = gradle.gradleVersion.startsWith("5.")

val pomText = file("../../pom.xml").readText()
val androidPomText = file("../../android-pom.xml").readText()
val guavaVersionJre =
"<version>(.*)</version>".toRegex().find(file("../../pom.xml").readText())?.groups?.get(1)?.value
"<version>(.*)</version>".toRegex().find(pomText)?.groups?.get(1)?.value
?: error("version not found in pom")
val checkerVersion =
"<checker.version>(.*)</checker.version>".toRegex().find(pomText)?.groups?.get(1)?.value
?: error("checker.version not found in pom")
val errorProneVersionJre =
"<errorprone.version>(.*)</errorprone.version>".toRegex().find(pomText)?.groups?.get(1)?.value
?: error("errorprone.version not found in pom")
val errorProneVersionAndroid =
"<errorprone.version>(.*)</errorprone.version>".toRegex().find(androidPomText)?.groups?.get(1)?.value
?: error("errorprone.version not found in android pom")

val expectedReducedRuntimeClasspathAndroidVersion =
setOf(
"guava-${guavaVersionJre.replace("jre", "android")}.jar",
"failureaccess-1.0.2.jar",
"jsr305-3.0.2.jar",
"checker-qual-3.46.0.jar",
"error_prone_annotations-2.26.1.jar",
"checker-qual-$checkerVersion.jar",
"error_prone_annotations-$errorProneVersionAndroid.jar",
"listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
)
val expectedReducedRuntimeClasspathJreVersion =
setOf(
"guava-$guavaVersionJre.jar",
"failureaccess-1.0.2.jar",
"jsr305-3.0.2.jar",
"checker-qual-3.46.0.jar",
"error_prone_annotations-2.26.1.jar",
"checker-qual-$checkerVersion.jar",
"error_prone_annotations-$errorProneVersionJre.jar",
"listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
)
val expectedReducedRuntimeClasspathAndroidVersionFromJreMetadata =
setOf(
"guava-${guavaVersionJre.replace("jre", "android")}.jar",
"failureaccess-1.0.2.jar",
"jsr305-3.0.2.jar",
"checker-qual-$checkerVersion.jar",
"error_prone_annotations-$errorProneVersionJre.jar",
"listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
)
val expectedReducedRuntimeClasspathJreVersionFromAndroidMetadata =
setOf(
"guava-$guavaVersionJre.jar",
"failureaccess-1.0.2.jar",
"jsr305-3.0.2.jar",
"checker-qual-$checkerVersion.jar",
"error_prone_annotations-$errorProneVersionAndroid.jar",
"listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
)
val expectedCompileClasspathAndroidVersion =
expectedReducedRuntimeClasspathAndroidVersion + setOf("j2objc-annotations-3.0.0.jar")
val expectedCompileClasspathJreVersion =
expectedReducedRuntimeClasspathJreVersion + setOf("j2objc-annotations-3.0.0.jar")
val expectedCompileClasspathAndroidVersionFromJreMetadata =
expectedReducedRuntimeClasspathAndroidVersionFromJreMetadata + setOf("j2objc-annotations-3.0.0.jar")
val expectedCompileClasspathJreVersionFromAndroidMetadata =
expectedReducedRuntimeClasspathJreVersionFromAndroidMetadata + setOf("j2objc-annotations-3.0.0.jar")
val expectedPomClasspathJreVersion =
expectedCompileClasspathJreVersion +
setOf(
"checker-$checkerVersion.jar",
"checker-util-$checkerVersion.jar"
)

val extraLegacyDependencies = setOf("google-collections-1.0.jar")

Expand Down Expand Up @@ -62,7 +101,7 @@ subprojects {
if (name.startsWith("android")) {
expectedCompileClasspathAndroidVersion + extraLegacyDependencies
} else {
expectedCompileClasspathJreVersion + extraLegacyDependencies
expectedPomClasspathJreVersion + extraLegacyDependencies
}
} else {
// with Gradle Module Metadata
Expand All @@ -72,10 +111,18 @@ subprojects {
if (name.contains("Android") && !name.contains("JreConstraint")) {
when {
name.contains("RuntimeClasspath") -> {
expectedReducedRuntimeClasspathAndroidVersion
if (name.startsWith("android")) {
expectedReducedRuntimeClasspathAndroidVersion
} else {
expectedReducedRuntimeClasspathAndroidVersionFromJreMetadata
}
}
name.contains("CompileClasspath") -> {
expectedCompileClasspathAndroidVersion
if (name.startsWith("android")) {
expectedCompileClasspathAndroidVersion
} else {
expectedCompileClasspathAndroidVersionFromJreMetadata
}
}
else -> {
error("unexpected classpath type: $name")
Expand All @@ -84,10 +131,18 @@ subprojects {
} else {
when {
name.contains("RuntimeClasspath") -> {
expectedReducedRuntimeClasspathJreVersion
if (name.startsWith("android")) {
expectedReducedRuntimeClasspathJreVersionFromAndroidMetadata
} else {
expectedReducedRuntimeClasspathJreVersion
}
}
name.contains("CompileClasspath") -> {
expectedCompileClasspathJreVersion
if (name.startsWith("android")) {
expectedCompileClasspathJreVersionFromAndroidMetadata
} else {
expectedCompileClasspathJreVersion
}
}
else -> {
error("unexpected classpath type: $name")
Expand Down
11 changes: 7 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<test.include>%regex[.*.class]</test.include>
<truth.version>1.4.2</truth.version>
<jsr305.version>3.0.2</jsr305.version>
<checker.version>3.42.0-eisop5</checker.version>
<checker.version>3.49.5-eisop1</checker.version>
<errorprone.version>2.26.1</errorprone.version>
<j2objc.version>3.0.0</j2objc.version>
<javac.version>9+181-r4173-1</javac.version>
Expand Down Expand Up @@ -144,15 +144,18 @@
<arg>-XDcompilePolicy=simple</arg>
<!-- -Xplugin:ErrorProne is set conditionally by a profile. -->
</compilerArgs>
<!--
<annotationProcessorPaths>
<path>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
<version>2.23.0</version>
<version>${errorprone.version}</version>
</path>
<path>
<groupId>io.github.eisop</groupId>
<artifactId>checker</artifactId>
<version>${checker.version}</version>
</path>
</annotationProcessorPaths>
-->
<!-- Fork:

- for JDK8 because we use a javac9 bootclasspath
Expand Down
3 changes: 2 additions & 1 deletion util/gradle_integration_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -eu

./mvnw clean install --projects '!guava-testlib,!guava-tests,!guava-bom,!guava-gwt' -Dmaven.test.skip=true -Dmaven.javadoc.skip=true

@aosen-xiong aosen-xiong Jun 16, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

disable because we had this commented out.

guava/pom.xml

Line 74 in 52ae9f9

<!-- Disable Google Web Toolkit - we don't need and has build problems.

./mvnw clean install --projects '!guava-testlib,!guava-tests,!guava-bom' -Dmaven.test.skip=true -Dmaven.javadoc.skip=true
./mvnw clean install --projects '!guava-testlib,!guava-tests,!guava-bom' -Dmaven.test.skip=true -Dmaven.javadoc.skip=true -f android

# Gradle Wrapper overwrites some files when it runs.
Expand All @@ -24,6 +24,7 @@ trap 'rm -rf "${GRADLE_TEMP}"' EXIT
# (And the file needs to be two directory levels up from the Gradle build file.)
# TODO(cpovirk): Find a better way to give them that information.
cp pom.xml "${GRADLE_TEMP}"
cp android/pom.xml "${GRADLE_TEMP}/android-pom.xml"

for version in 5.6.4 7.0.2; do
# Enter a subshell so that we return to the current directory afterward.
Expand Down
Loading