Skip to content

Commit 6a7d71c

Browse files
mernstmernst
authored
Gradle formatting
1 parent c10d86a commit 6a7d71c

7 files changed

Lines changed: 44 additions & 44 deletions

File tree

‎annotation-file-utilities/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ test.dependsOn(testAnnotator)
111111

112112
tasks.register("updateUserOptions") {
113113
dependsOn(
114-
"updateUserOptionsJavadoc",
115-
"updateUserOptionsHtml"
116-
)
114+
"updateUserOptionsJavadoc",
115+
"updateUserOptionsHtml"
116+
)
117117
}
118118

119119
tasks.register("updateUserOptionsJavadoc", Javadoc) {

‎build.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ tasks.register("installGitHooks", Copy) {
9898
}
9999
subprojects { subProject ->
100100
if (subProject.name.equals("checker")
101-
|| subProject.name.equals("annotation-file-utilities")
102-
|| subProject.name.equals("dataflow")
103-
|| subProject.name.equals("framework")) {
101+
|| subProject.name.equals("annotation-file-utilities")
102+
|| subProject.name.equals("dataflow")
103+
|| subProject.name.equals("framework")) {
104104
apply plugin: "com.gradleup.shadow"
105105
shadow {
106106
addShadowVariantIntoJavaComponent = false
@@ -536,13 +536,13 @@ tasks.register("zip", Zip) {
536536

537537
from(layout.projectDirectory) {
538538
exclude("api/**",
539-
"checker/bin/README",
540-
"checker/dist/*.asc",
541-
"docs/tutorial/tests/**",
542-
"docs/tutorial/src/**",
543-
"docs/tutorial/test/**",
544-
"docs/tutorial/Makefile",
545-
"docs/tutorial/README")
539+
"checker/bin/README",
540+
"checker/dist/*.asc",
541+
"docs/tutorial/tests/**",
542+
"docs/tutorial/src/**",
543+
"docs/tutorial/test/**",
544+
"docs/tutorial/Makefile",
545+
"docs/tutorial/README")
546546

547547
include("README.html",
548548
"LICENSE.txt",

‎checker/build.gradle‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -491,10 +491,10 @@ void copyNonannotatedToAnnotatedDirectory(String testdir) {
491491
into(file("tests/${testdir}/annotated"))
492492
filter { String line ->
493493
(line.contains("// :: error:")
494-
// Don't remove unchecked cast warnings, because they're genuinely expected in some all-systems
495-
// tests, such as GenericsCasts.java.
496-
|| (line.contains("// :: warning:") && !line.contains("// :: warning: [unchecked]")))
497-
? null : line
494+
// Don't remove unchecked cast warnings, because they're genuinely expected in some all-systems
495+
// tests, such as GenericsCasts.java.
496+
|| (line.contains("// :: warning:") && !line.contains("// :: warning: [unchecked]")))
497+
? null : line
498498
}
499499
}
500500
// The only file for which expected errors are maintained is ExpectedErrors.java, so we copy it over.
@@ -950,22 +950,22 @@ tasks.register("wpiManyTest", Exec) {
950950
if (
951951
// Ignore the line that WPI echoes with the javac command being run.
952952
line.startsWith("Running ")
953-
// Warnings about bad path elements aren't related to WPI and are ignored.
954-
|| line.startsWith("warning: [path]")
955-
// Ignore bootstrap classpath warning:
956-
|| line.startsWith("warning: [options] bootstrap")
957-
// Ignore the warnings about --add-opens arguments to the JVM
958-
|| line.contains("warning: [options] --add-opens has no effect at compile time")
959-
// Ignore warning about using -source; should use --release instead.
960-
|| line.equals("warning: [options] system modules path not set in conjunction with -source 11")
961-
// Ignore the summary line that reports the total number of warnings (which can be single or plural).
962-
|| line.endsWith(" warning")
963-
|| line.endsWith(" warnings")
964-
|| line.startsWith("warning: No processor claimed any of these annotations: ")
965-
// Ignore debugging output with the prefix "DEBUG: ".
966-
|| line.startsWith("DEBUG: ")
967-
|| line.startsWith("warning: DEBUG: ")
968-
|| line.contains("warning: [DEBUG: ")) {
953+
// Warnings about bad path elements aren't related to WPI and are ignored.
954+
|| line.startsWith("warning: [path]")
955+
// Ignore bootstrap classpath warning:
956+
|| line.startsWith("warning: [options] bootstrap")
957+
// Ignore the warnings about --add-opens arguments to the JVM
958+
|| line.contains("warning: [options] --add-opens has no effect at compile time")
959+
// Ignore warning about using -source; should use --release instead.
960+
|| line.equals("warning: [options] system modules path not set in conjunction with -source 11")
961+
// Ignore the summary line that reports the total number of warnings (which can be single or plural).
962+
|| line.endsWith(" warning")
963+
|| line.endsWith(" warnings")
964+
|| line.startsWith("warning: No processor claimed any of these annotations: ")
965+
// Ignore debugging output with the prefix "DEBUG: ".
966+
|| line.startsWith("DEBUG: ")
967+
|| line.startsWith("warning: DEBUG: ")
968+
|| line.contains("warning: [DEBUG: ")) {
969969
return
970970
}
971971
if (!line.trim().equals("")) {

‎dataflow/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,10 +221,10 @@ final dataflowShadedPom(MavenPublication publication, String shadedPkgName) {
221221
// This should just happen automatically, but I can't figure out how to make it happen with
222222
// a custom Shadow task.
223223
asNode().appendNode("dependencies").appendNode("dependency")
224-
.appendNode("groupId", "org.checkerframework").parent()
225-
.appendNode("artifactId", "checker-qual").parent()
226-
.appendNode("version", version).parent()
227-
.appendNode("scope", "runtime")
224+
.appendNode("groupId", "org.checkerframework").parent()
225+
.appendNode("artifactId", "checker-qual").parent()
226+
.appendNode("version", version).parent()
227+
.appendNode("scope", "runtime")
228228
}
229229
}
230230
}

‎framework/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ tasks.register("copyAndMinimizeAnnotatedJdkFiles", JavaExec) {
8989
// Populate `annotatedForFiles`.
9090
tree.visit { FileVisitDetails fvd ->
9191
if (!fvd.file.isDirectory() && fvd.file.name.matches(".*\\.java")
92-
&& !fvd.file.path.contains("org/checkerframework")) {
92+
&& !fvd.file.path.contains("org/checkerframework")) {
9393
fvd.getFile().readLines().any { line ->
9494
if (line.contains("@AnnotatedFor") || line.contains("org.checkerframework")) {
9595
annotatedForFiles.add(fvd.file.absolutePath)

‎gradle-mvn-push.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ publishing {
77
repositories {
88
maven {
99
url = (isSnapshot
10-
? project.properties.getOrDefault("SNAPSHOT_REPOSITORY_URL", "https://central.sonatype.com/repository/maven-snapshots/")
11-
: project.properties.getOrDefault("RELEASE_REPOSITORY_URL", "https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/")
12-
)
10+
? project.properties.getOrDefault("SNAPSHOT_REPOSITORY_URL", "https://central.sonatype.com/repository/maven-snapshots/")
11+
: project.properties.getOrDefault("RELEASE_REPOSITORY_URL", "https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/")
12+
)
1313
credentials {
1414
username = project.properties.get("SONATYPE_NEXUS_USERNAME")
1515
password = project.properties.get("SONATYPE_NEXUS_PASSWORD")

‎release.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ tasks.register("updateVersionNumbersInDocs", Copy) {
5454

5555
from("docs/") {
5656
include("annotation-file-utilities/annotation-file-utilities.html",
57-
"checker-framework-quick-start.html",
58-
"checker-framework-webpage.html",
59-
"manual/introduction.tex")
57+
"checker-framework-quick-start.html",
58+
"checker-framework-webpage.html",
59+
"manual/introduction.tex")
6060

6161
filter { String line ->
6262
line = line.replaceAll("checker-framework-${releaseVersionRegex}", "checker-framework-${releaseVersion}")

0 commit comments

Comments
 (0)