Add 25 and 26 as options

Author: bowbahdoe

ui/frontend/AdvancedOptionsMenu.tsx

@@ -28,8 +28,10 @@ const AdvancedOptionsMenu: React.FC = () => {
         isNotDefault={!isReleaseDefault}
         onChange={changeRelease}
       >
-        { (runtime != Runtime.EarlyAccess && runtime != Runtime.Valhalla) ? null
-          : <option value={Release.Java23}>23</option> }
+        { runtime == Runtime.EarlyAccess ? <option value={Release.Java26}>26</option> : null}
+        { (runtime == Runtime.EarlyAccess || runtime == Runtime.Latest) ? <option value={Release.Java25}>25</option> : null}
+        { (runtime == Runtime.EarlyAccess || runtime == Runtime.Latest) ? <option value={Release.Java24}>24</option> : null}
+        <option value={Release.Java23}>23</option>
         <option value={Release.Java22}>22</option>
         <option value={Release.Java21}>21</option>
         <option value={Release.Java20}>20</option>

ui/frontend/actions.ts

@@ -538,6 +538,12 @@ function parseRelease(s?: string): Release | null {
       return Release.Java22;
     case '23':
       return Release.Java23;
+    case '24':
+      return Release.Java24;
+    case '25':
+      return Release.Java25;
+    case '26':
+      return Release.Java26;
     default:
       return null;
   }

ui/frontend/reducers/configuration.ts

@@ -49,16 +49,19 @@ const DEFAULT: State = {
   processAssembly: ProcessAssembly.Filter,
   primaryAction: PrimaryActionAuto.Auto,
   runtime: Runtime.Latest,
-  release: Release.Java22,
+  release: Release.Java25,
   preview: Preview.Disabled,
 };
 
 const maxRelease = (runtime: Runtime) => {
-  if ((runtime == Runtime.Valhalla || runtime == Runtime.EarlyAccess)) {
+  if (runtime == Runtime.Valhalla) {
     return Release.Java23;
   }
+  else if (runtime == Runtime.EarlyAccess) {
+    return Release.Java26;
+  }
   else {
-    return Release.Java22;
+    return Release.Java25;
   }
 }
 

ui/frontend/types.ts

@@ -99,7 +99,10 @@ export enum Release {
   Java20 = '20',
   Java21 = '21',
   Java22 = '22',
-  Java23 = '23'
+  Java23 = '23',
+  Java24 = '24',
+  Java25 = '25',
+  Java26 = '26'
 }
 
 export enum Preview {

ui/src/main.rs

@@ -400,6 +400,9 @@ fn parse_release(s: &str) -> Result<Option<sandbox::Release>> {
         "21" => Some(sandbox::Release::_21),
         "22" => Some(sandbox::Release::_22),
         "23" => Some(sandbox::Release::_23),
+        "24" => Some(sandbox::Release::_24),
+        "25" => Some(sandbox::Release::_25),
+        "26" => Some(sandbox::Release::_26),
         value => InvalidReleaseSnafu { value }.fail()?,
     })
 }

ui/src/sandbox.rs

@@ -435,6 +435,9 @@ pub enum Release {
     _21,
     _22,
     _23,
+    _24,
+    _25,
+    _26,
 }
 
 impl Release {
@@ -458,6 +461,9 @@ impl Release {
             _21 => "21",
             _22 => "22",
             _23 => "23",
+            _24 => "24",
+            _25 => "25",
+            _26 => "26",
         }
     }
 }