Merge pull request #212 from keizer619/master

Remove ballerina to bal change message

gradle.properties

@@ -5,8 +5,8 @@ ballerinaJreVersion=0.8.0
 # For test purpose
 swan-lake-version=slp1
 swan-lake-spec-version=v2020-06-18
-swan-lake-latest-version=slbeta6
-swan-lake-latest-spec-version=2021R1
+swan-lake-latest-version=2201.0.0
+swan-lake-latest-spec-version=2022R1
 1-x-channel-version=1.2.0
 1-x-channel-spec-version=2020R1
 1-x-channel-latest-version=1.2.16

resources/scripts/install

@@ -85,11 +85,6 @@ then
     chmod 755 /Library/Ballerina/bin/bal
 fi
 
-echo "The ‘ballerina’ command was changed to ‘bal’. Please use ‘bal’ command from now onwards."
-echo "Ie : $ bal build"
-echo "     $ bal dist list"
-echo "     $ bal dist update"
-
 echo "Update tool version updated to the latest version: @version@"
 echo "Cleaning old files..."
 

resources/scripts/install.bat

@@ -43,11 +43,6 @@ if %errorlevel% neq 0 (
     exit /b %errorlevel%
 )
 
-echo The ‘ballerina’ command was changed to ‘bal’. Please use ‘bal’ command from now onwards.
-echo Ie : $ bal build
-echo      $ bal dist list
-echo      $ bal dist update
-
 echo Tool version updated to the latest version: @version@
 echo Cleaning old files...
 

src/test/java/org/ballerinalang/distribution/TestUtils.java

@@ -240,6 +240,11 @@ public static String getVersionOutput(String ballerinaVersion, String specVersio
                     "\n" + toolText + " " + toolVersion + "\n";
         }
 
+        if (isSwanLakeGA(ballerinaVersion)) {
+            return "Ballerina " + versionDisplayText + " (Swan Lake)\n" + "Language specification " + specVersion +
+                    "\n" + toolText + " " + toolVersion + "\n";
+        }
+
         String ballerinaReference = isSupportedRelease(ballerinaVersion) ? "jBallerina" : "Ballerina";
         return ballerinaReference + " " + ballerinaVersion + "\n" + "Language specification " + specVersion + "\n" +
                 toolText + " " + toolVersion + "\n";
@@ -275,7 +280,7 @@ private static boolean isSupportedRelease(String version) {
      * @return returns distribution path for the version
      */
     public static Path getDistPath (String version) {
-        String type = version.contains("sl") ? "ballerina" : "jballerina";
+        String type = version.contains("sl") ? "ballerina" : isSwanLakeGA(version) ? "ballerina" : "jballerina";
         return DIST_PATH.resolve(type + "-" + version);
     }
 
@@ -286,6 +291,10 @@ public static Path getDistPath (String version) {
      * @return returns display text
      */
     public static String getDisplayText(String version) {
+        if (isSwanLakeGA(version)) {
+            return version;
+        }
+
         char lastChar = version.charAt(version.length() - 1);
         if (version.contains("slp")) {
             return "Preview " + lastChar;
@@ -294,4 +303,20 @@ public static String getDisplayText(String version) {
             return versionId.substring(0, 1).toUpperCase() + versionId.substring(1);
         }
     }
+
+    /**
+     * Check current version is a Swan Lake GA or later release
+     * @param version current version text
+     * @return is a Swan Lake GA or later release
+     */
+    public static boolean isSwanLakeGA(String version) {
+        String[] versions = version.split("\\.");
+        if (versions.length == 3) {
+            int releaseVersion = Integer.parseInt(versions[0]);
+            if(releaseVersion >= 2201) {
+                return true;
+            }
+        }
+        return false;
+    }
 }