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 32c4aed commit 50ae4d4
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 9 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,7 +17,7 @@ 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" }
mockito = "org.mockito:mockito-core:5.14.2"
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
Expand Up @@ -3,5 +3,5 @@ rootProject.name = "versionparser"
include("examples")

plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version ("0.4.0")
id("org.gradle.toolchains.foojay-resolver-convention") version ("0.9.0")
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,16 @@
* <li>Modifier according to the <a href="https://semver.org/">Semantic Version</a> specification for pre-release
* versions (specification item 9)</li>
* </ol>
*
* <p>
* With the exception of modifier components, a missing component is always less than a present component of the same
* Except for modifier components, a missing component is always less than a present component of the same
* category.
* </p>
*
* <p>
* The version is considered pre-release if a modifier is present and begins with one of the following identifiers
* (case-insensitive):
* </p>
* <ul>
* <li>{@code alpha}</li>
* <li>{@code beta}</li>
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/org/cthing/versionparser/gem/GemVersion.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,21 @@
/**
* Represents the version of an artifact in the <a href="https://rubygems.org/">RubyGems</a> ecosystem. To obtain
* an instance of this class, call the {@link GemVersionScheme#parseVersion(String)} method.
*
* <p>
* This class processes string versions into comparable values. A version string should normally be a series of
* numbers separated by periods. Each part (digits separated by periods) is considered its own number, and these
* are used for sorting. For instance, 3.10 sorts higher than 3.2 because ten is greater than two.
* </p>
*
* <p>
* If any part of the version string contains letters (currently only a-z and A-Z are supported) then that version
* is considered pre-release. Versions with a pre-release part in the Nth part sort less than versions with N-1
* parts. Pre-release parts are sorted alphabetically using the normal string sorting rules. If a pre-release part
* contains both letters and numbers, it will be broken into multiple parts to provide the expected sort behavior
* (e.g. 1.0.a10 becomes 1.0.a.10, and is greater than 1.0.a9).
* </p>
*
* <p>
* Pre-release versions sort between real releases (newest to oldest):
* </p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
* Represents the version scheme used by the Gradle build tool. To parse a version string, call the
* {@link #parseVersion(String)} method. To parse a version constraint expression, call the
* {@link #parseConstraint(String)} method.
*
* <p>
* The following are examples of version constraint expressions supported by Gradle:
* </p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
* <li>1.4.2_151-b034</li>
* <li>1.4.2_151-internal-b034</li>
* </ul>
*
* <p>
* An instance of {@link JavaVersion} representing the runtime Java version is available as {@link #RUNTIME_VERSION}.
* </p>
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/org/cthing/versionparser/maven/MvnVersion.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,13 @@
/**
* Represents the version of an artifact in the <a href="https://maven.apache.org">Maven</a> ecosystem. To obtain
* an instance of this class, call the {@link MvnVersionScheme#parseVersion(String)} method.
*
* <p>
* Versions are interpreted as a sequence of numeric and alphabetic components. The characters '-', '_', and '.' as
* well as the transitions from digit to letter and vice versa delimit the version components. Delimiters are
* considered equivalent.
* </p>
*
* <p>
* Numeric components are compared mathematically. Alphabetic components are treated as case-insensitive and compared
* lexicographically. However, the following qualifier strings are treated specially with the following ordering:
Expand All @@ -56,11 +58,13 @@
* well-known qualifiers are considered smaller/older than other strings. An empty component or string is equivalent to
* 0.
* </p>
*
* <p>
* In addition to the above mentioned qualifiers, the tokens {@code min} and {@code max} may be used as the last
* version component to denote the smallest/greatest version having a given prefix. For example, "1.2.min" denotes
* the smallest version in the 1.2 line, and "1.2.max" denotes the greatest version in the 1.2 line.
* </p>
*
* <p>
* Numbers and strings are considered incomparable when compared against each other. Where version components of
* a different kind collide, comparison assumes that the previous components are padded with trailing 0 or "ga"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
* Represents the version scheme used by the NPM ecosystem. To parse a version string, call the
* {@link #parseVersion(String)} method. To parse a version constraint expression, call the
* {@link #parseConstraint(String)} method.
*
* <p>
* Artifacts in the NPM ecosystem are versioned using the <a href="https://semver.org/">Semantic Version</a>
* specification. Therefore the {@link #parseVersion(String)} method returns an instance of a {@link SemanticVersion}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
/**
* Represents an artifact version adhering to the <a href="https://semver.org/">Semantic Versioning 2.0</a>
* specification. To create an instance of this class, call the {@link #parse(String)} method.
*
* <p>
* Note that the natural ordering of this class is <b>not</b> consistent with {@link #equals(Object)}
* due to the build metadata being ignored when version precedence is determined but considered for equality.
Expand Down

0 comments on commit 50ae4d4

Please sign in to comment.