From 5f01cbc994083726c5fdf92b7ad30ca227101831 Mon Sep 17 00:00:00 2001 From: "David P. Baker" Date: Wed, 15 Nov 2023 14:51:17 -0500 Subject: [PATCH 01/15] Refer to the conformance framework library by group:name. --- build.gradle | 2 +- settings.gradle | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 498ebbe..76f08c7 100644 --- a/build.gradle +++ b/build.gradle @@ -45,7 +45,7 @@ dependencies { testImplementation 'com.google.guava:guava:31.1-jre' testImplementation 'org.plumelib:plume-util:1.5.5' testImplementation "org.checkerframework:framework-test:${cfVersion}" - testImplementation project(":conformance") + testImplementation "org.jspecify:conformance" errorproneJavac "com.google.errorprone:javac:9+181-r4173-1" errorprone "com.google.errorprone:error_prone_core:2.18.0" diff --git a/settings.gradle b/settings.gradle index a08c015..9534def 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,6 +2,10 @@ rootProject.name = "jspecify-reference-checker" include 'conformance' +// Lets the main build depend on the conformance subproject as org.jspecify:conformance. +// See https://docs.gradle.org/current/userguide/composite_builds.html#included_build_declaring_substitutions +includeBuild(".") + def initializeProject() { exec { executable './initialize-project' From 4c9344d1e4860548fbbb2e3f2ff55f9a2488db25 Mon Sep 17 00:00:00 2001 From: "David P. Baker" Date: Thu, 16 Nov 2023 14:41:55 -0500 Subject: [PATCH 02/15] Move library versions to a version catalog. --- build.gradle | 38 +++++++++++++++++++------------------- conformance/build.gradle | 6 +++--- settings.gradle | 25 +++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 22 deletions(-) diff --git a/build.gradle b/build.gradle index 76f08c7..fc575e4 100644 --- a/build.gradle +++ b/build.gradle @@ -31,24 +31,24 @@ java { } dependencies { - implementation "org.checkerframework:checker:${cfVersion}" - implementation "org.checkerframework:checker-qual:${cfVersion}" - implementation "org.checkerframework:framework:${cfVersion}" - implementation "org.checkerframework:javacutil:${cfVersion}" + implementation libs.checkerFramework.checker + implementation libs.checkerFramework.checker.qual + implementation libs.checkerFramework.framework + implementation libs.checkerFramework.javacutil - implementation "org.jspecify:jspecify:0.0.0-SNAPSHOT" + implementation libs.jspecify // Testing - testImplementation 'junit:junit:4.12' + testImplementation libs.junit // The jsr305 dep lets us use its annotations in some of the sample inputs we test against. - testImplementation 'com.google.code.findbugs:jsr305:3.0.2' - testImplementation 'com.google.guava:guava:31.1-jre' - testImplementation 'org.plumelib:plume-util:1.5.5' - testImplementation "org.checkerframework:framework-test:${cfVersion}" + testImplementation libs.jsr305 + testImplementation libs.guava + testImplementation libs.plume.util + testImplementation libs.checkerFramework.framework.test testImplementation "org.jspecify:conformance" - errorproneJavac "com.google.errorprone:javac:9+181-r4173-1" - errorprone "com.google.errorprone:error_prone_core:2.18.0" + errorproneJavac libs.errorProne.javac + errorprone libs.errorProne.core } // Assemble checker-framework when assembling the reference checker. @@ -86,14 +86,14 @@ tasks.withType(Test) { // Required because checker-framework uses APIs from these modules. jvmArgs( [ - "code", - "comp", - "main", - "processing", - "tree", - "util" + "code", + "comp", + "main", + "processing", + "tree", + "util" ] - .collect { "--add-opens=jdk.compiler/com.sun.tools.javac.$it=ALL-UNNAMED" }) + .collect { "--add-opens=jdk.compiler/com.sun.tools.javac.$it=ALL-UNNAMED" }) testLogging { showStackTraces = false diff --git a/conformance/build.gradle b/conformance/build.gradle index 661b217..0e7f46c 100644 --- a/conformance/build.gradle +++ b/conformance/build.gradle @@ -14,9 +14,9 @@ java { } dependencies { - api 'com.google.guava:guava:31.1-jre' - implementation "com.google.truth:truth:1.1.3" - implementation "org.jspecify:jspecify:0.0.0-SNAPSHOT" + api libs.guava + implementation libs.truth + implementation libs.jspecify } test { diff --git a/settings.gradle b/settings.gradle index 9534def..23b55a6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -23,3 +23,28 @@ includeBuild("../jdk") { includeBuild("../checker-framework") { initializeProject() } + +dependencyResolutionManagement { + versionCatalogs { + libs { + version("checkerFramework", "3.21.5-SNAPSHOT") + library("checkerFramework-checker", "org.checkerframework", "checker").versionRef("checkerFramework") + library("checkerFramework-checker-qual", "org.checkerframework","checker-qual").versionRef("checkerFramework") + library("checkerFramework-framework", "org.checkerframework","framework").versionRef("checkerFramework") + library("checkerFramework-framework-test", "org.checkerframework","framework-test").versionRef("checkerFramework") + library("checkerFramework-javacutil", "org.checkerframework","javacutil").versionRef("checkerFramework") + + library("jspecify", "org.jspecify:jspecify:0.0.0-SNAPSHOT") + + library("junit","junit:junit:4.12") + library("jsr305", "com.google.code.findbugs:jsr305:3.0.2") + library("guava", "com.google.guava:guava:31.1-jre") + library("plume-util", "org.plumelib:plume-util:1.5.5") + + library("errorProne-javac", "com.google.errorprone:javac:9+181-r4173-1") + library("errorProne-core", "com.google.errorprone:error_prone_core:2.18.0") + + library("truth", "com.google.truth:truth:1.1.3") + } + } +} \ No newline at end of file From 4c21660eb90ba1ddea21f38433768fc0c0f25807 Mon Sep 17 00:00:00 2001 From: "David P. Baker" Date: Thu, 16 Nov 2023 14:42:52 -0500 Subject: [PATCH 03/15] Clean up inter-project references. --- build.gradle | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index fc575e4..1457a26 100644 --- a/build.gradle +++ b/build.gradle @@ -18,12 +18,8 @@ configurations { } ext { - parentDir = file("${rootDir}/../").absolutePath - - cfHome = "${parentDir}/checker-framework" - cfVersion = "3.21.5-SNAPSHOT" - - jspecifyHome = "${parentDir}/jspecify" + checkerFramework = gradle.includedBuild("checker-framework") + jspecify = gradle.includedBuild("jspecify") } java { @@ -52,8 +48,8 @@ dependencies { } // Assemble checker-framework when assembling the reference checker. -assemble.dependsOn(gradle.includedBuild("checker-framework").task(":assemble")) -assemble.dependsOn(gradle.includedBuild("jspecify").task(":assemble")) +assemble.dependsOn(checkerFramework.task(":assemble")) +assemble.dependsOn(jspecify.task(":assemble")) tasks.withType(JavaCompile).all { options.compilerArgs.add("-Xlint:all") @@ -115,7 +111,7 @@ task jspecifySamplesTest(type: Test) { include '**/NullSpecTest$Lenient.class' include '**/NullSpecTest$Strict.class' - inputs.files("${jspecifyHome}/samples") + inputs.files("${jspecify.projectDir}/samples") } TaskProvider conformanceTest(String name, String testDirectory, String reportFile) { @@ -128,9 +124,9 @@ TaskProvider conformanceTest(String name, String testDirectory, String rep } } -conformanceTest('conformanceTest', "${jspecifyHome}/conformance", 'tests/ConformanceTest-report.txt') +conformanceTest('conformanceTest', "${jspecify.projectDir}/conformance", 'tests/ConformanceTest-report.txt') -conformanceTest('conformanceTestOnSamples', "${jspecifyHome}/samples", 'tests/ConformanceTestOnSamples-report.txt') +conformanceTest('conformanceTestOnSamples', "${jspecify.projectDir}/samples", 'tests/ConformanceTestOnSamples-report.txt') clean.doFirst { delete "${rootDir}/tests/build/" @@ -145,15 +141,17 @@ clean.doFirst { See https://github.com/jspecify/jspecify-reference-checker/issues/81 */ -def cfQualJar = file("${cfHome}/checker-qual/build/libs/checker-qual-${cfVersion}.jar") +def cfQualJar = + checkerFramework.projectDir.toPath() + .resolve("checker-qual/build/libs/checker-qual-${libs.versions.checkerFramework.get()}.jar") -if (!cfQualJar.exists()) { +if (!cfQualJar.toFile().exists()) { mkdir(cfQualJar.parent) exec { executable 'jar' args = [ 'cf', - cfQualJar.path, + cfQualJar, buildFile.path // Use this build script file! ] } From 9236ef84a1e9fa55c8dd321fbf9c0ae0d620c0a1 Mon Sep 17 00:00:00 2001 From: "David P. Baker" Date: Thu, 16 Nov 2023 14:43:17 -0500 Subject: [PATCH 04/15] Set conformance test framework version to 0.0. --- conformance/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conformance/build.gradle b/conformance/build.gradle index 0e7f46c..7416b1b 100644 --- a/conformance/build.gradle +++ b/conformance/build.gradle @@ -3,7 +3,7 @@ plugins { } group 'org.jspecify' -version '0.1' +version '0.0' repositories { mavenCentral() From 38146e3f395a0ba89dcb510d62d87a1e2a672519 Mon Sep 17 00:00:00 2001 From: "David P. Baker" Date: Thu, 16 Nov 2023 14:43:52 -0500 Subject: [PATCH 05/15] Clean up Gradle warnings. --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 1457a26..cda2c60 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { assemble.dependsOn(checkerFramework.task(":assemble")) assemble.dependsOn(jspecify.task(":assemble")) -tasks.withType(JavaCompile).all { +tasks.withType(JavaCompile).configureEach { options.compilerArgs.add("-Xlint:all") // ErrorProne makes suppressing these easier options.compilerArgs.add("-Xlint:-fallthrough") @@ -74,7 +74,7 @@ tasks.withType(JavaCompile).all { ].collect { """--add-exports=jdk.compiler/com.sun.tools.javac.$it=ALL-UNNAMED""" }) } -tasks.withType(Test) { +tasks.withType(Test).configureEach { if (!JavaVersion.current().java9Compatible) { jvmArgs "-Xbootclasspath/p:${configurations.errorproneJavac.asPath}" } @@ -105,7 +105,7 @@ test { inputs.files("${rootDir}/tests/minimal") } -task jspecifySamplesTest(type: Test) { +tasks.register('jspecifySamplesTest', Test) { description = 'Run the checker against the JSpecify samples.' group = 'verification' include '**/NullSpecTest$Lenient.class' From 84b80106e6d8962ccaef77180703d74f46414941 Mon Sep 17 00:00:00 2001 From: "David P. Baker" Date: Thu, 16 Nov 2023 15:04:13 -0500 Subject: [PATCH 06/15] Change JSR305 to testRuntimeOnly. Remove unused plumelib dependency. --- build.gradle | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index cda2c60..1c0c85a 100644 --- a/build.gradle +++ b/build.gradle @@ -34,12 +34,9 @@ dependencies { implementation libs.jspecify - // Testing testImplementation libs.junit - // The jsr305 dep lets us use its annotations in some of the sample inputs we test against. - testImplementation libs.jsr305 + testRuntimeOnly libs.jsr305 // jsr305 annotations are in some of the samples testImplementation libs.guava - testImplementation libs.plume.util testImplementation libs.checkerFramework.framework.test testImplementation "org.jspecify:conformance" From b75ce11ade42a8d2fcebb13e5d335372f95a57f0 Mon Sep 17 00:00:00 2001 From: "David P. Baker" Date: Thu, 16 Nov 2023 15:08:12 -0500 Subject: [PATCH 07/15] Change conformance test framework version to "0-SNAPSHOT". Use versionCatalog for the conformance test framework. --- build.gradle | 6 +++--- conformance/build.gradle | 2 +- settings.gradle | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 1c0c85a..87f7fd1 100644 --- a/build.gradle +++ b/build.gradle @@ -34,11 +34,11 @@ dependencies { implementation libs.jspecify + testImplementation libs.checkerFramework.framework.test + testImplementation libs.guava testImplementation libs.junit + testImplementation libs.jspecify.conformance testRuntimeOnly libs.jsr305 // jsr305 annotations are in some of the samples - testImplementation libs.guava - testImplementation libs.checkerFramework.framework.test - testImplementation "org.jspecify:conformance" errorproneJavac libs.errorProne.javac errorprone libs.errorProne.core diff --git a/conformance/build.gradle b/conformance/build.gradle index 7416b1b..4b31763 100644 --- a/conformance/build.gradle +++ b/conformance/build.gradle @@ -3,7 +3,7 @@ plugins { } group 'org.jspecify' -version '0.0' +version '0-SNAPSHOT' repositories { mavenCentral() diff --git a/settings.gradle b/settings.gradle index 23b55a6..d0cb06f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -35,6 +35,7 @@ dependencyResolutionManagement { library("checkerFramework-javacutil", "org.checkerframework","javacutil").versionRef("checkerFramework") library("jspecify", "org.jspecify:jspecify:0.0.0-SNAPSHOT") + library("jspecify-conformance", "org.jspecify:conformance:0-SNAPSHOT") library("junit","junit:junit:4.12") library("jsr305", "com.google.code.findbugs:jsr305:3.0.2") From b5d652d864012aa36570bc9b6849a2880897c61f Mon Sep 17 00:00:00 2001 From: "David P. Baker" Date: Thu, 16 Nov 2023 15:18:12 -0500 Subject: [PATCH 08/15] Formatting. --- build.gradle | 38 ++++++++++---------------------------- 1 file changed, 10 insertions(+), 28 deletions(-) diff --git a/build.gradle b/build.gradle index 87f7fd1..919aac3 100644 --- a/build.gradle +++ b/build.gradle @@ -56,19 +56,10 @@ tasks.withType(JavaCompile).configureEach { options.errorprone.disable("BadImport") options.compilerArgs.addAll( - [ - "api", - "code", - "comp", - "file", - "main", - "model", - "parser", - "processing", - "resources", - "tree", - "util", - ].collect { """--add-exports=jdk.compiler/com.sun.tools.javac.$it=ALL-UNNAMED""" }) + ["api", "code", "comp", "file", "main", "model", "parser", "processing", "resources", "tree", "util"] + .collect { + "--add-exports=jdk.compiler/com.sun.tools.javac.$it=ALL-UNNAMED" + }) } tasks.withType(Test).configureEach { @@ -77,16 +68,10 @@ tasks.withType(Test).configureEach { } // Required because checker-framework uses APIs from these modules. - jvmArgs( - [ - "code", - "comp", - "main", - "processing", - "tree", - "util" - ] - .collect { "--add-opens=jdk.compiler/com.sun.tools.javac.$it=ALL-UNNAMED" }) + jvmArgs(["code", "comp", "main", "processing", "tree", "util"] + .collect { + "--add-opens=jdk.compiler/com.sun.tools.javac.$it=ALL-UNNAMED" + }) testLogging { showStackTraces = false @@ -146,11 +131,8 @@ if (!cfQualJar.toFile().exists()) { mkdir(cfQualJar.parent) exec { executable 'jar' - args = [ - 'cf', - cfQualJar, - buildFile.path // Use this build script file! - ] + // Include just this build script file! + args = ['cf', cfQualJar, buildFile.path] } } From fdefd20d983fb6e3cac93c6472f585a43e7d488e Mon Sep 17 00:00:00 2001 From: "David P. Baker" Date: Thu, 16 Nov 2023 15:19:55 -0500 Subject: [PATCH 09/15] Formatting. --- build.gradle | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 919aac3..9b176d2 100644 --- a/build.gradle +++ b/build.gradle @@ -57,9 +57,7 @@ tasks.withType(JavaCompile).configureEach { options.compilerArgs.addAll( ["api", "code", "comp", "file", "main", "model", "parser", "processing", "resources", "tree", "util"] - .collect { - "--add-exports=jdk.compiler/com.sun.tools.javac.$it=ALL-UNNAMED" - }) + .collect { "--add-exports=jdk.compiler/com.sun.tools.javac.$it=ALL-UNNAMED" }) } tasks.withType(Test).configureEach { @@ -69,9 +67,7 @@ tasks.withType(Test).configureEach { // Required because checker-framework uses APIs from these modules. jvmArgs(["code", "comp", "main", "processing", "tree", "util"] - .collect { - "--add-opens=jdk.compiler/com.sun.tools.javac.$it=ALL-UNNAMED" - }) + .collect { "--add-opens=jdk.compiler/com.sun.tools.javac.$it=ALL-UNNAMED" }) testLogging { showStackTraces = false From 499d4391f88c80dca87bd11f18d98ec68630457f Mon Sep 17 00:00:00 2001 From: "David P. Baker" Date: Thu, 16 Nov 2023 15:21:28 -0500 Subject: [PATCH 10/15] Formatting. --- conformance/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conformance/build.gradle b/conformance/build.gradle index 4b31763..1a7c78e 100644 --- a/conformance/build.gradle +++ b/conformance/build.gradle @@ -15,8 +15,8 @@ java { dependencies { api libs.guava - implementation libs.truth implementation libs.jspecify + implementation libs.truth } test { From 131167954f0641df376285868aa0518d757307ec Mon Sep 17 00:00:00 2001 From: "David P. Baker" Date: Thu, 16 Nov 2023 15:22:33 -0500 Subject: [PATCH 11/15] Remove unused library plume-util. --- settings.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index d0cb06f..633d1c9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -40,7 +40,6 @@ dependencyResolutionManagement { library("junit","junit:junit:4.12") library("jsr305", "com.google.code.findbugs:jsr305:3.0.2") library("guava", "com.google.guava:guava:31.1-jre") - library("plume-util", "org.plumelib:plume-util:1.5.5") library("errorProne-javac", "com.google.errorprone:javac:9+181-r4173-1") library("errorProne-core", "com.google.errorprone:error_prone_core:2.18.0") From 691810e56a6930e594cc34e9950a1aed7d815c4b Mon Sep 17 00:00:00 2001 From: "David P. Baker" Date: Thu, 16 Nov 2023 15:23:46 -0500 Subject: [PATCH 12/15] Formatting --- settings.gradle | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/settings.gradle b/settings.gradle index 633d1c9..dfa96dd 100644 --- a/settings.gradle +++ b/settings.gradle @@ -28,23 +28,20 @@ dependencyResolutionManagement { versionCatalogs { libs { version("checkerFramework", "3.21.5-SNAPSHOT") - library("checkerFramework-checker", "org.checkerframework", "checker").versionRef("checkerFramework") - library("checkerFramework-checker-qual", "org.checkerframework","checker-qual").versionRef("checkerFramework") - library("checkerFramework-framework", "org.checkerframework","framework").versionRef("checkerFramework") - library("checkerFramework-framework-test", "org.checkerframework","framework-test").versionRef("checkerFramework") - library("checkerFramework-javacutil", "org.checkerframework","javacutil").versionRef("checkerFramework") + library("checkerFramework-checker", "org.checkerframework", "checker").versionRef("checkerFramework") + library("checkerFramework-checker-qual", "org.checkerframework", "checker-qual").versionRef("checkerFramework") + library("checkerFramework-framework", "org.checkerframework", "framework").versionRef("checkerFramework") + library("checkerFramework-framework-test", "org.checkerframework", "framework-test").versionRef("checkerFramework") + library("checkerFramework-javacutil", "org.checkerframework", "javacutil").versionRef("checkerFramework") + library("errorProne-core", "com.google.errorprone:error_prone_core:2.18.0") + library("errorProne-javac", "com.google.errorprone:javac:9+181-r4173-1") + library("guava", "com.google.guava:guava:31.1-jre") library("jspecify", "org.jspecify:jspecify:0.0.0-SNAPSHOT") library("jspecify-conformance", "org.jspecify:conformance:0-SNAPSHOT") - - library("junit","junit:junit:4.12") library("jsr305", "com.google.code.findbugs:jsr305:3.0.2") - library("guava", "com.google.guava:guava:31.1-jre") - - library("errorProne-javac", "com.google.errorprone:javac:9+181-r4173-1") - library("errorProne-core", "com.google.errorprone:error_prone_core:2.18.0") - - library("truth", "com.google.truth:truth:1.1.3") + library("junit", "junit:junit:4.12") + library("truth", "com.google.truth:truth:1.1.3") } } } \ No newline at end of file From 75be19487407ac875c6df5132247f499bb047127 Mon Sep 17 00:00:00 2001 From: "David P. Baker" Date: Thu, 16 Nov 2023 15:24:09 -0500 Subject: [PATCH 13/15] Formatting --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index dfa96dd..776f944 100644 --- a/settings.gradle +++ b/settings.gradle @@ -44,4 +44,4 @@ dependencyResolutionManagement { library("truth", "com.google.truth:truth:1.1.3") } } -} \ No newline at end of file +} From 64dde9fbf9c488eb66be8c207a56fa5366e0b613 Mon Sep 17 00:00:00 2001 From: "David P. Baker" Date: Thu, 16 Nov 2023 15:31:34 -0500 Subject: [PATCH 14/15] Formatting --- build.gradle | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 9b176d2..b0d4b1c 100644 --- a/build.gradle +++ b/build.gradle @@ -56,8 +56,20 @@ tasks.withType(JavaCompile).configureEach { options.errorprone.disable("BadImport") options.compilerArgs.addAll( - ["api", "code", "comp", "file", "main", "model", "parser", "processing", "resources", "tree", "util"] - .collect { "--add-exports=jdk.compiler/com.sun.tools.javac.$it=ALL-UNNAMED" }) + [ + "api", + "code", + "comp", + "file", + "main", + "model", + "parser", + "processing", + "resources", + "tree", + "util", + ] + .collect { "--add-exports=jdk.compiler/com.sun.tools.javac.$it=ALL-UNNAMED" }) } tasks.withType(Test).configureEach { @@ -66,7 +78,15 @@ tasks.withType(Test).configureEach { } // Required because checker-framework uses APIs from these modules. - jvmArgs(["code", "comp", "main", "processing", "tree", "util"] + jvmArgs( + [ + "code", + "comp", + "main", + "processing", + "tree", + "util", + ] .collect { "--add-opens=jdk.compiler/com.sun.tools.javac.$it=ALL-UNNAMED" }) testLogging { @@ -121,14 +141,17 @@ clean.doFirst { def cfQualJar = checkerFramework.projectDir.toPath() - .resolve("checker-qual/build/libs/checker-qual-${libs.versions.checkerFramework.get()}.jar") + .resolve("checker-qual/build/libs/checker-qual-${libs.versions.checkerFramework.get()}.jar") if (!cfQualJar.toFile().exists()) { mkdir(cfQualJar.parent) exec { executable 'jar' - // Include just this build script file! - args = ['cf', cfQualJar, buildFile.path] + args = [ + 'cf', + cfQualJar, + buildFile.path // Use this build script file! + ] } } From aa9b3a7dd8a9dad6dae73b596cc07da0e97475d4 Mon Sep 17 00:00:00 2001 From: "David P. Baker" Date: Fri, 17 Nov 2023 17:07:03 -0500 Subject: [PATCH 15/15] Conformance framework version set to 0.0.0-SNAPSHOT. --- conformance/build.gradle | 2 +- settings.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conformance/build.gradle b/conformance/build.gradle index 1a7c78e..b30fb77 100644 --- a/conformance/build.gradle +++ b/conformance/build.gradle @@ -3,7 +3,7 @@ plugins { } group 'org.jspecify' -version '0-SNAPSHOT' +version '0.0.0-SNAPSHOT' repositories { mavenCentral() diff --git a/settings.gradle b/settings.gradle index 776f944..b357d08 100644 --- a/settings.gradle +++ b/settings.gradle @@ -38,7 +38,7 @@ dependencyResolutionManagement { library("errorProne-javac", "com.google.errorprone:javac:9+181-r4173-1") library("guava", "com.google.guava:guava:31.1-jre") library("jspecify", "org.jspecify:jspecify:0.0.0-SNAPSHOT") - library("jspecify-conformance", "org.jspecify:conformance:0-SNAPSHOT") + library("jspecify-conformance", "org.jspecify:conformance:0.0.0-SNAPSHOT") library("jsr305", "com.google.code.findbugs:jsr305:3.0.2") library("junit", "junit:junit:4.12") library("truth", "com.google.truth:truth:1.1.3")