Skip to content

Commit

Permalink
Upgrade Gradle and dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
baron1405 committed Dec 6, 2024
1 parent 4a608ef commit 4b281ef
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 8 deletions.
12 changes: 6 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[versions]
java = "17"
checkstyle = "10.18.2"
checkstyle = "10.20.2"
jacoco = "0.8.12"
junit = "5.11.2"
junit = "5.11.3"
spotbugs = "4.8.6"

[plugins]
cthingVersioning = { id = "org.cthing.cthing-versioning", version = "3.0.0" }
dependencyAnalysis = { id = "com.autonomousapps.dependency-analysis", version = "2.2.0" }
spotbugs = { id = "com.github.spotbugs", version = "6.0.25" }
dependencyAnalysis = { id = "com.autonomousapps.dependency-analysis", version = "2.6.0" }
spotbugs = { id = "com.github.spotbugs", version = "6.0.26" }
versions = { id = "com.github.ben-manes.versions", version = "0.51.0" }

[libraries]
Expand All @@ -17,6 +17,6 @@ cthingAnnots = "org.cthing:cthing-annotations:2.0.0"
jspecify = "org.jspecify:jspecify:1.0.0"
junitApi = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
junitEngine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
junitLauncher = "org.junit.platform:junit-platform-launcher:1.11.2"
junitLauncher = "org.junit.platform:junit-platform-launcher:1.11.3"
junitParams = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit" }
spotbugsContrib = "com.mebigfatguy.sb-contrib:sb-contrib:7.6.5"
spotbugsContrib = "com.mebigfatguy.sb-contrib:sb-contrib:7.6.8"
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
rootProject.name = "escapers"

plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version ("0.8.0")
id("org.gradle.toolchains.foojay-resolver-convention") version ("0.9.0")
}
3 changes: 3 additions & 0 deletions src/main/java/org/cthing/escapers/HtmlEscaper.java
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@
* </tr>
* </tbody>
* </table>
*
* <p>
* Characters not listed in the above table are not included in the output (e.g. the null character 0x00 is dropped).
* </p>
Expand Down Expand Up @@ -168,6 +169,7 @@ public enum Option {
* (&amp;pound;). See
* <a href="https://www.w3.org/TR/html40/sgml/entities.html#h-24.2">Section 24.2</a> of the HTML 4
* specification for the complete list of ISO Latin-1 character entities.
*
* <p>
* Note that markup-significant HTML escapes are always applied (e.g. &amp;lt;, &amp;quot;) regardless of
* the use of this option.
Expand All @@ -182,6 +184,7 @@ public enum Option {
* <a href="https://www.w3.org/TR/html40/sgml/entities.html#h-24.3">Section 24.3</a> and
* <a href="https://www.w3.org/TR/html40/sgml/entities.html#h-24.4">Section 24.4 </a> of the HTML 4
* specification for the complete list of these character entities.
*
* <p>
* Note that markup-significant HTML escapes are always applied (e.g. &amp;lt;, &amp;quot;) regardless of
* the use of this option.
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/cthing/escapers/XmlEscaper.java
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@
* </tr>
* </tbody>
* </table>
*
* <p>
* The characters in the above table correspond to the <a href="https://www.w3.org/TR/xml/#charsets">valid XML
* characters</a>. Invalid characters are not included in the output (e.g. the null character 0x00 is dropped).
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/org/cthing/escapers/YamlEscaper.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,15 @@
* <a href="https://yaml.org/spec/1.2.2/#57-escaped-characters">Escaped Characters</a> section of the
* <a href="https://yaml.org/spec/1.2.2/">YAML Ain’t Markup Language</a> specification. The returned string
* may be surrounded by single or double quotes depending on the characters found in the string.
*
* <p>
* The returned string will be surrounded by double quotes under the following conditions:
* </p>
* <ul>
* <li>The string contains a character that requires escaping</li>
* <li>The string contains a double quote, single quote or backslash</li>
* </ul>
*
* <p>
* The returned string will be surrounded by single quotes under the following conditions
* </p>
Expand All @@ -39,9 +41,11 @@
* <li>The string end with the document end character sequence</li>
* <li>The string contains any of the following characters: {@literal # , [ ] { } & * ! | > % @ ? : - /}</li>
* </ul>
*
* <p>
* If none of the above conditions apply, the string is returned without quotes.
* </p>
*
* <p>
* Characters are escaped according to the following table:
* </p>
Expand Down

0 comments on commit 4b281ef

Please sign in to comment.