forked from FabricMC/fabric-loom
-
Notifications
You must be signed in to change notification settings - Fork 41
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add version check for source roots separator
- Loading branch information
Showing
3 changed files
with
192 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| /* | ||
| * This file is part of fabric-loom, licensed under the MIT License (MIT). | ||
| * | ||
| * Copyright (c) 2024 FabricMC | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
|
|
||
| package net.fabricmc.loom.util; | ||
|
|
||
| import java.util.regex.Matcher; | ||
| import java.util.regex.Pattern; | ||
|
|
||
| import com.google.common.base.Strings; | ||
| import com.google.common.collect.Ordering; | ||
| import org.gradle.util.internal.VersionNumber; | ||
| import org.jetbrains.annotations.NotNull; | ||
| import org.jetbrains.annotations.Nullable; | ||
|
|
||
| /** | ||
| * A simple version class that can be used to compare versions. | ||
| * This class allows for versions that are not strictly following the semver specification, | ||
| * but are still allowed in the context of gradle versioning. | ||
| * <p> | ||
| * This class is intentionally very flexible and does not enforce any specific versioning scheme, | ||
| * and should be very similar to the versioning used by gradle itself. | ||
| */ | ||
| public record Version(int major, int minor, int micro, int patch, @Nullable String qualifier) implements Comparable<Version> { | ||
| private static final Pattern REGEX = Pattern.compile("(\\d+)(?:\\.(\\d+))?(?:\\.(\\d+))?()(?:[.-]([^+\\s]*))?(?:\\+.*)?"); | ||
| private static final Pattern REGEX_WITH_PATCH = Pattern.compile("(\\d+)(?:\\.(\\d+))?(?:\\.(\\d+))?(?:\\.(\\d+))?(?:[+.-]([^+\\s]*))?(?:\\+.*)?"); | ||
| public static final Version UNKNOWN = new Version(0, 0, 0, 0, null); | ||
|
|
||
| public static Version parse(String version) { | ||
| return parse(version, false); | ||
| } | ||
|
|
||
| public static Version parse(String version, boolean withPatch) { | ||
| Matcher matcher = (withPatch ? REGEX_WITH_PATCH : REGEX).matcher(version); | ||
|
|
||
| if (!matcher.matches()) { | ||
| return UNKNOWN; | ||
| } | ||
|
|
||
| int major = Integer.parseInt(matcher.group(1)); | ||
| int minor = !Strings.isNullOrEmpty(matcher.group(2)) ? Integer.parseInt(matcher.group(2)) : 0; | ||
| int micro = !Strings.isNullOrEmpty(matcher.group(3)) ? Integer.parseInt(matcher.group(3)) : 0; | ||
| int patch = !Strings.isNullOrEmpty(matcher.group(4)) ? Integer.parseInt(matcher.group(4)) : 0; | ||
| String qualifier = matcher.group(5); | ||
|
|
||
| return new Version(major, minor, micro, patch, qualifier); | ||
| } | ||
|
|
||
| public VersionNumber asBaseVersion() { | ||
| return new VersionNumber(this.major, this.minor, this.micro, this.patch, null); | ||
| } | ||
|
|
||
| @Override | ||
| public int compareTo(@NotNull Version other) { | ||
| if (this.major != other.major) { | ||
| return this.major - other.major; | ||
| } else if (this.minor != other.minor) { | ||
| return this.minor - other.minor; | ||
| } else if (this.micro != other.micro) { | ||
| return this.micro - other.micro; | ||
| } else { | ||
| return this.patch != other.patch ? this.patch - other.patch | ||
| : Ordering.natural().nullsLast() | ||
| .compare(this.toLowerCase(this.qualifier), this.toLowerCase(other.qualifier)); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object obj) { | ||
| if (this == obj) { | ||
| return true; | ||
| } else if (obj == null || this.getClass() != obj.getClass()) { | ||
| return false; | ||
| } else { | ||
| Version other = (Version) obj; | ||
| return this.major == other.major && this.minor == other.minor && this.micro == other.micro && this.patch == other.patch | ||
| && this.toLowerCase(this.qualifier).equals(this.toLowerCase(other.qualifier)); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| int result = this.major; | ||
| result = 31 * result + this.minor; | ||
| result = 31 * result + this.micro; | ||
| result = 31 * result + this.patch; | ||
| result = 31 * result + this.toLowerCase(this.qualifier).hashCode(); | ||
| return result; | ||
| } | ||
|
|
||
| @Nullable | ||
| private String toLowerCase(@Nullable String string) { | ||
| return string == null ? null : string.toLowerCase(); | ||
| } | ||
| } |
57 changes: 57 additions & 0 deletions
57
src/test/groovy/net/fabricmc/loom/test/unit/VersionTest.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /* | ||
| * This file is part of fabric-loom, licensed under the MIT License (MIT). | ||
| * | ||
| * Copyright (c) 2024 FabricMC | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
|
|
||
| package net.fabricmc.loom.test.unit | ||
|
|
||
|
|
||
| import spock.lang.Specification | ||
|
|
||
| import net.fabricmc.loom.util.Version | ||
|
|
||
| class VersionTest extends Specification { | ||
| def "version comparison"() { | ||
| when: | ||
| def compare = Version.parse(s1) <=> Version.parse(s2) | ||
| // turns compare into 1 or 0 or -1 | ||
| compare = compare <=> 0 | ||
|
|
||
| then: | ||
| compare == expected | ||
|
|
||
| where: | ||
| s1 | s2 | expected | ||
| "1.1.1" | "1.1.1" | 0 | ||
| "1.1.1" | "1.1.0" | 1 | ||
| "1.1.0" | "1.1" | 0 | ||
| "1.0.0" | "1" | 0 | ||
| "1-" | "1" | -1 | ||
| "1.1.1" | "1.1.2" | -1 | ||
| "1.1.1" | "1.1.1-" | 1 | ||
| "1.1.1-beta" | "1.1.1-alpha" | 1 | ||
| "1.1.1-alpha" | "1.1.1-beta" | -1 | ||
| "1.1.1-beta.1" | "1.1.1-beta.2" | -1 | ||
| "1.1.1-beta.1" | "1.1.1-beta.10" | -1 | ||
| "1.1.1+123" | "1.1.1+567" | 0 | ||
| } | ||
| } |