Consume a single conformance test ZIP

build.gradle

@@ -15,12 +15,7 @@ repositories {
 
 configurations {
     errorproneJavac
-    conformanceTestAssertions {
-        attributes {
-            attribute(DocsType.DOCS_TYPE_ATTRIBUTE, objects.named(DocsType, DocsType.SOURCES))
-        }
-    }
-    conformanceTestDeps
+    conformanceTestSuite
 }
 
 ext {
@@ -46,19 +41,8 @@ dependencies {
     testImplementation libs.jspecify.conformanceTestFramework
     testRuntimeOnly libs.jsr305 // jsr305 annotations are in some of the samples
 
-    conformanceTestAssertions("org.jspecify.conformance:conformance-tests:0.0.0-SNAPSHOT") {
-        capabilities {
-            // Depend on the assertion sources
-            requireCapability "org.jspecify.conformance:conformance-tests-assertions"
-        }
-    }
-
-    conformanceTestDeps("org.jspecify.conformance:conformance-tests:0.0.0-SNAPSHOT") {
-        capabilities {
-            // Depend on the assertion dependencies
-            requireCapability "org.jspecify.conformance:conformance-tests-deps"
-        }
-    }
+    // TODO: Depend on a group:artifact:version rather than a file.
+    conformanceTestSuite files("${jspecify.projectDir}/conformance-tests/build/distributions/conformance-tests-0.0.0-SNAPSHOT.zip")
 
     errorproneJavac libs.errorProne.javac
     errorprone libs.errorProne.core
@@ -144,18 +128,23 @@ TaskProvider<Test> conformanceTest(String name, String testDirectory, String rep
     }
 }
 
-tasks.register('unzipConformanceTestAssertions', Copy) {
-    dependsOn configurations.conformanceTestAssertions
-    from zipTree(configurations.conformanceTestAssertions.singleFile)
-    exclude 'META-INF/'
-    into "${buildDir}/conformanceTests"
+tasks.register('unzipConformanceTestSuite', Copy) {
+    // TODO: Don't explicitly depend on an included build's task.
+    dependsOn jspecify.task(':conformance-tests:build')
+    dependsOn configurations.conformanceTestSuite
+    from zipTree(configurations.conformanceTestSuite.singleFile)
+    into layout.buildDirectory.dir("conformanceTests")
 }
 
-conformanceTest('conformanceTest', "${buildDir}/conformanceTests/org/jspecify/conformance/tests", 'tests/ConformanceTest-report.txt').configure {
-    dependsOn 'unzipConformanceTestAssertions', configurations.conformanceTestDeps
-    inputs.files(configurations.conformanceTestDeps)
-    systemProperty("JSpecifyConformanceTest.testDeps", configurations.conformanceTestDeps.join(":"))
-}
+conformanceTest('conformanceTest',
+        "${unzipConformanceTestSuite.destinationDir}/assertions/org/jspecify/conformance/tests",
+        'tests/ConformanceTest-report.txt')
+        .configure {
+            dependsOn unzipConformanceTestSuite
+            inputs.dir(unzipConformanceTestSuite.destinationDir)
+            systemProperty("JSpecifyConformanceTest.testDeps",
+                    fileTree("${unzipConformanceTestSuite.destinationDir}/deps").join(":"))
+        }
 
 conformanceTest('conformanceTestOnSamples', "${jspecify.projectDir}/samples", 'tests/ConformanceTestOnSamples-report.txt')
 

tests/ConformanceTest-report.txt

@@ -1,4 +1,4 @@
-# 10 pass; 6 fail; 16 total; 62.5% score
+# 12 pass; 6 fail; 18 total; 66.7% score
 PASS: Basic.java:26 test:expression-type:Object?:nullable
 PASS: Basic.java:26 test:sink-type:Object!:return
 PASS: Basic.java:26 test:cannot-convert:Object? to Object!
@@ -15,3 +15,5 @@ FAIL: Irrelevant.java:43 test:irrelevant-annotation:Nullable
 FAIL: Irrelevant.java:47 test:irrelevant-annotation:NullMarked
 FAIL: Irrelevant.java:49 test:irrelevant-annotation:NullUnmarked
 FAIL: Irrelevant.java: no unexpected facts
+PASS: UsesDep.java:24 test:cannot-convert:null? to Dep*
+PASS: UsesDep.java: no unexpected facts