Skip to content

Commit 58860a4

Browse files
jdneojdneo
authored
build - Update java to 21 (#1767)
1 parent b8ff4c5 commit 58860a4

File tree

5 files changed

+24
-23
lines changed

5 files changed

+24
-23
lines changed

‎.azure-pipelines/vscode-java-test-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ extends:
4444
- checkout: self
4545
fetchTags: false
4646
- task: JavaToolInstaller@0
47-
displayName: Use Java 17
47+
displayName: Use Java 21
4848
inputs:
49-
versionSpec: "17"
49+
versionSpec: "21"
5050
jdkArchitectureOption: x64
5151
jdkSourceOption: PreInstalled
5252
- task: Npm@1

‎.azure-pipelines/vscode-java-test-nightly.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,20 +48,20 @@ extends:
4848
version: '20.x'
4949
# The image does not have jdk preinstalled, we need to download it first.
5050
- task: PowerShell@2
51-
displayName: Download JDK 17
51+
displayName: Download JDK 21
5252
inputs:
5353
targetType: 'inline'
5454
script: |-
5555
New-Item -ItemType Directory -Path "$env:AGENT_TEMPDIRECTORY\downloadjdk"
56-
Invoke-WebRequest -Uri "https://aka.ms/download-jdk/microsoft-jdk-17-windows-x64.zip" -OutFile "$env:AGENT_TEMPDIRECTORY\downloadjdk\microsoft-jdk-17-windows-x64.zip"
56+
Invoke-WebRequest -Uri "https://aka.ms/download-jdk/microsoft-jdk-21-windows-x64.zip" -OutFile "$env:AGENT_TEMPDIRECTORY\downloadjdk\microsoft-jdk-21-windows-x64.zip"
5757
- task: JavaToolInstaller@0
58-
displayName: Use Java 17
58+
displayName: Use Java 21
5959
inputs:
60-
versionSpec: "17"
60+
versionSpec: "21"
6161
jdkArchitectureOption: x64
6262
jdkSourceOption: LocalDirectory
63-
jdkFile: $(Agent.TempDirectory)/downloadjdk/microsoft-jdk-17-windows-x64.zip
64-
jdkDestinationDirectory: $(Agent.ToolsDirectory)/ms-jdk17
63+
jdkFile: $(Agent.TempDirectory)/downloadjdk/microsoft-jdk-21-windows-x64.zip
64+
jdkDestinationDirectory: $(Agent.ToolsDirectory)/ms-jdk21
6565
- script: java --version
6666
displayName: 'Check Java installation'
6767
- task: Npm@1

‎.azure-pipelines/vscode-java-test-rc.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,20 @@ extends:
4343
version: '20.x'
4444
# The image does not have jdk preinstalled, we need to download it first.
4545
- task: PowerShell@2
46-
displayName: Download JDK 17
46+
displayName: Download JDK 21
4747
inputs:
4848
targetType: 'inline'
4949
script: |-
5050
New-Item -ItemType Directory -Path "$env:AGENT_TEMPDIRECTORY\downloadjdk"
51-
Invoke-WebRequest -Uri "https://aka.ms/download-jdk/microsoft-jdk-17-windows-x64.zip" -OutFile "$env:AGENT_TEMPDIRECTORY\downloadjdk\microsoft-jdk-17-windows-x64.zip"
51+
Invoke-WebRequest -Uri "https://aka.ms/download-jdk/microsoft-jdk-21-windows-x64.zip" -OutFile "$env:AGENT_TEMPDIRECTORY\downloadjdk\microsoft-jdk-21-windows-x64.zip"
5252
- task: JavaToolInstaller@0
53-
displayName: Use Java 17
53+
displayName: Use Java 21
5454
inputs:
55-
versionSpec: "17"
55+
versionSpec: "21"
5656
jdkArchitectureOption: x64
5757
jdkSourceOption: LocalDirectory
58-
jdkFile: $(Agent.TempDirectory)/downloadjdk/microsoft-jdk-17-windows-x64.zip
59-
jdkDestinationDirectory: $(Agent.ToolsDirectory)/ms-jdk17
58+
jdkFile: $(Agent.TempDirectory)/downloadjdk/microsoft-jdk-21-windows-x64.zip
59+
jdkDestinationDirectory: $(Agent.ToolsDirectory)/ms-jdk21
6060
- script: java --version
6161
displayName: 'Check Java installation'
6262
- task: Npm@1

‎.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Setup Node.js environment
3030
uses: actions/setup-node@v2
3131
with:
32-
node-version: 16
32+
node-version: 20
3333

3434
- name: Install Node.js modules
3535
run: npm install
@@ -65,7 +65,7 @@ jobs:
6565
- name: Setup Node.js environment
6666
uses: actions/setup-node@v2
6767
with:
68-
node-version: 16
68+
node-version: 20
6969

7070
- name: Install Node.js modules
7171
run: npm install
@@ -101,7 +101,7 @@ jobs:
101101
- name: Setup Node.js environment
102102
uses: actions/setup-node@v2
103103
with:
104-
node-version: 16
104+
node-version: 20
105105

106106
- name: Install Node.js modules
107107
run: npm install

‎test/index.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,16 @@ async function main(): Promise {
1212
const [cli, ...args] = resolveCliArgsFromVSCodeExecutablePath(vscodeExecutablePath);
1313

1414
// Resolve redhat.java dependency
15-
cp.spawnSync(cli, [...args, '--install-extension', 'redhat.java', '--pre-release'], {
15+
const options: cp.SpawnSyncOptionsWithStringEncoding = {
1616
encoding: 'utf-8',
1717
stdio: 'inherit',
18-
});
18+
};
19+
if (process.platform === 'win32') {
20+
options.shell = true;
21+
}
22+
cp.spawnSync(cli, [...args, '--install-extension', 'redhat.java', '--pre-release'], options);
1923

20-
cp.spawnSync(cli, [...args, '--install-extension', 'vscjava.vscode-java-debug', '--pre-release'], {
21-
encoding: 'utf-8',
22-
stdio: 'inherit',
23-
});
24+
cp.spawnSync(cli, [...args, '--install-extension', 'vscjava.vscode-java-debug', '--pre-release'], options);
2425

2526
// The folder containing the Extension Manifest package.json
2627
// Passed to `--extensionDevelopmentPath`

0 commit comments

Comments
 (0)