Resolve Merge Conflicts

This commit is contained in:
Gregory Mitchell 2024-09-11 14:49:52 +00:00 committed by GitHub
commit d3a91fa39c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 93197 additions and 4417 deletions

View file

@ -10,6 +10,7 @@ import {SemeruDistribution} from './semeru/installer';
import {CorrettoDistribution} from './corretto/installer';
import {OracleDistribution} from './oracle/installer';
import {DragonwellDistribution} from './dragonwell/installer';
import {SapMachineDistribution} from './sapmachine/installer';
import {JetBrainsDistribution} from "./jetbrains/installer";
enum JavaDistribution {
@ -25,7 +26,8 @@ enum JavaDistribution {
Corretto = 'corretto',
Oracle = 'oracle',
Dragonwell = 'dragonwell',
JetBrains = 'jetbrains',
SapMachine = 'sapmachine',
JetBrains = 'jetbrains'
}
export function getJavaDistribution(
@ -66,6 +68,8 @@ export function getJavaDistribution(
return new OracleDistribution(installerOptions);
case JavaDistribution.Dragonwell:
return new DragonwellDistribution(installerOptions);
case JavaDistribution.SapMachine:
return new SapMachineDistribution(installerOptions);
case JavaDistribution.JetBrains:
return new JetBrainsDistribution(installerOptions);
default: