Fix build-logic API version assignment

Signed-off-by: Gabriel Harris-Rouquette <[email protected]>
SpongePowered · Jan 8, 2022 · c70f9a1 · c70f9a1
1 parent 533f058
commit c70f9a1
Showing 1 changed file with 23 additions and 7 deletions.
diff --git a/build-logic/src/main/java/org/spongepowered/gradle/impl/SpongeImplementationExtension.java b/build-logic/src/main/java/org/spongepowered/gradle/impl/SpongeImplementationExtension.java
@@ -47,14 +47,32 @@ public String generateImplementationVersionString(final String apiVersion, final
     }
 
     public String generateImplementationVersionString(final String apiVersion, final String minecraftVersion, final String implRecommendedVersion, final String addedVersionInfo) {
-        final String[] apiSplit = apiVersion.replace("-SNAPSHOT", "").split("\\.");
-        final String minor = apiSplit.length > 1 ? apiSplit[1] : apiSplit.length > 0 ?  apiSplit[apiSplit.length - 1] : "-1";
-        final String apiReleaseVersion = apiSplit[0] + '.' + minor;
-        return Stream.of(minecraftVersion, addedVersionInfo, apiReleaseVersion + '.' + implRecommendedVersion)
+        final String latestApiVersion = generateApiReleasedVersion(apiVersion);
+        final String implementationVersion = latestApiVersion + "." + implRecommendedVersion;
+
+        return Stream.of(minecraftVersion, addedVersionInfo, implementationVersion)
             .filter(Objects::nonNull)
             .collect(Collectors.joining("-"));
     }
 
+    private static String generateApiReleasedVersion(final String apiVersion) {
+        final String[] apiSplit = apiVersion.replace("-SNAPSHOT", "").split("\\.");
+        final boolean isSnapshot = apiVersion.contains("-SNAPSHOT");
+
+        // This is to determine if the split api version has at the least a minimum version.
+        final String apiMajor = apiSplit[0];
+        final String minorVersion;
+        if (apiSplit.length > 1) {
+            minorVersion = apiSplit[1];
+        } else {
+            minorVersion = "0";
+        }
+        final int latestReleasedVersion = Math.max(Integer.parseInt(minorVersion) - 1, 0);
+        // And then here, we determine if the api version still has a patch version, to just ignore it.
+        final String latestReleasedApiMinor = isSnapshot ? String.valueOf(latestReleasedVersion) : minorVersion;
+        return apiMajor + "." + latestReleasedApiMinor;
+    }
+
     public String generatePlatformBuildVersionString(final String apiVersion, final String minecraftVersion, final String implRecommendedVersion) {
         return this.generatePlatformBuildVersionString(apiVersion, minecraftVersion, implRecommendedVersion, null);
     }
@@ -63,9 +81,7 @@ public String generatePlatformBuildVersionString(final String apiVersion, final
         final boolean isRelease = !implRecommendedVersion.endsWith("-SNAPSHOT");
 
         this.logger.lifecycle("Detected Implementation Version {} as {}", implRecommendedVersion, isRelease ? "Release" : "Snapshot");
-        final String[] apiSplit = apiVersion.replace("-SNAPSHOT", "").split("\\.");
-        final String minor = apiSplit.length > 1 ? apiSplit[1] : apiSplit.length > 0 ?  apiSplit[apiSplit.length - 1] : "-1";
-        final String apiReleaseVersion = apiSplit[0] + '.' + minor;
+        final String apiReleaseVersion = generateApiReleasedVersion(apiVersion);
         final String rawBuildNumber = System.getenv("BUILD_NUMBER");
         final int buildNumber = Integer.parseInt(rawBuildNumber == null ? "0" : rawBuildNumber);
         final String implVersionAsReleaseCandidateOrRecommended;