Skip to content

Commit 2a5d26e

Browse files
committed
Try this
1 parent 2299893 commit 2a5d26e

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

.github/workflows/copilot-setup-steps.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
- name: Install Android workload
1919
run: dotnet workload install android
2020

21-
- name: Setup OpenJDK 11
21+
- name: Setup OpenJDK 21
2222
uses: actions/setup-java@v4
2323
with:
2424
distribution: 'microsoft'
25-
java-version: '11'
25+
java-version: '21'
2626

2727
- name: Restore dotnet tools
2828
run: dotnet tool restore

build/ci/setup-environment.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
parameters:
22
installAndroidDependencies: false
33
androidSdkRoot: $(Agent.TempDirectory)/android-sdk
4-
javaSdkRoot: $(Agent.ToolsDirectory)\jdk11
4+
javaSdkRoot: $(Agent.ToolsDirectory)\jdk21
55

66
steps:
77
# before the build starts, make sure the tooling is as expected. Clear the cache on shared agents
@@ -46,18 +46,18 @@ steps:
4646
4747
- bash: |
4848
if [[ "$(Agent.Name)" == *"Azure Pipelines"* ]]; then
49-
echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_11_X64)"
49+
echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_21_X64)"
5050
else
51-
echo "##vso[task.setvariable variable=JAVA_HOME]/Library/Java/JavaVirtualMachines/microsoft-11.jdk/Contents/Home"
51+
echo "##vso[task.setvariable variable=JAVA_HOME]/Library/Java/JavaVirtualMachines/microsoft-21.jdk/Contents/Home"
5252
fi
53-
displayName: Use Java 11 SDK (Mac)
53+
displayName: Use Java 21 SDK (Mac)
5454
condition: eq( variables['Agent.OS'], 'Darwin' )
5555
5656
- task: JavaToolInstaller@0
57-
displayName: Use Java 11 SDK (Windows)
57+
displayName: Use Java 21 SDK (Windows)
5858
condition: and(eq( variables['Agent.OS'], 'Windows_NT' ), ne(${{ parameters.installAndroidDependencies }}, true))
5959
inputs:
60-
versionSpec: '11'
60+
versionSpec: '21'
6161
jdkArchitectureOption: 'x64'
6262
jdkSourceOption: 'PreInstalled'
6363

@@ -90,22 +90,22 @@ steps:
9090
9191
- ${{ if eq(parameters.installAndroidDependencies, true) }}:
9292
- pwsh: |
93-
$url = "https://aka.ms/download-jdk/microsoft-jdk-11.0.26-windows-x64.zip"
93+
$url = "https://aka.ms/download-jdk/microsoft-jdk-21.0.8-windows-x64.zip"
9494
if ($IsMacOS) {
95-
$url = "https://aka.ms/download-jdk/microsoft-jdk-11.0.26-macos-x64.tar.gz"
95+
$url = "https://aka.ms/download-jdk/microsoft-jdk-21.0.8-macos-x64.tar.gz"
9696
}
9797
$fileName = [System.IO.Path]::GetFileName($url)
9898
Invoke-WebRequest -Uri $url -OutFile $fileName
99-
Write-Host "##vso[task.setvariable variable=JDK_11_FILE_PATH]$(Build.StagingDirectory)/$fileName"
100-
displayName: Download Java 11 SDK
99+
Write-Host "##vso[task.setvariable variable=JDK_21_FILE_PATH]$(Build.StagingDirectory)/$fileName"
100+
displayName: Download Java 21 SDK
101101
workingDirectory: $(Build.StagingDirectory)
102102
103103
- task: JavaToolInstaller@0
104-
displayName: Use Java 11 SDK
104+
displayName: Use Java 21 SDK
105105
inputs:
106-
versionSpec: '11'
106+
versionSpec: '21'
107107
jdkArchitectureOption: 'x64'
108108
jdkSourceOption: LocalDirectory
109-
jdkFile: $(JDK_11_FILE_PATH)
109+
jdkFile: $(JDK_21_FILE_PATH)
110110
jdkDestinationDirectory: ${{ parameters.javaSdkRoot }}
111111
cleanDestinationDirectory: true

0 commit comments

Comments
 (0)