|
1 | 1 | parameters:
|
2 | 2 | installAndroidDependencies: false
|
3 | 3 | androidSdkRoot: $(Agent.TempDirectory)/android-sdk
|
4 |
| - javaSdkRoot: $(Agent.ToolsDirectory)\jdk11 |
| 4 | + javaSdkRoot: $(Agent.ToolsDirectory)\jdk21 |
5 | 5 |
|
6 | 6 | steps:
|
7 | 7 | # before the build starts, make sure the tooling is as expected. Clear the cache on shared agents
|
@@ -46,18 +46,18 @@ steps:
|
46 | 46 |
|
47 | 47 | - bash: |
|
48 | 48 | 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)" |
50 | 50 | 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" |
52 | 52 | fi
|
53 |
| - displayName: Use Java 11 SDK (Mac) |
| 53 | + displayName: Use Java 21 SDK (Mac) |
54 | 54 | condition: eq( variables['Agent.OS'], 'Darwin' )
|
55 | 55 |
|
56 | 56 | - task: JavaToolInstaller@0
|
57 |
| - displayName: Use Java 11 SDK (Windows) |
| 57 | + displayName: Use Java 21 SDK (Windows) |
58 | 58 | condition: and(eq( variables['Agent.OS'], 'Windows_NT' ), ne(${{ parameters.installAndroidDependencies }}, true))
|
59 | 59 | inputs:
|
60 |
| - versionSpec: '11' |
| 60 | + versionSpec: '21' |
61 | 61 | jdkArchitectureOption: 'x64'
|
62 | 62 | jdkSourceOption: 'PreInstalled'
|
63 | 63 |
|
@@ -90,22 +90,22 @@ steps:
|
90 | 90 |
|
91 | 91 | - ${{ if eq(parameters.installAndroidDependencies, true) }}:
|
92 | 92 | - 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" |
94 | 94 | 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" |
96 | 96 | }
|
97 | 97 | $fileName = [System.IO.Path]::GetFileName($url)
|
98 | 98 | 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 |
101 | 101 | workingDirectory: $(Build.StagingDirectory)
|
102 | 102 |
|
103 | 103 | - task: JavaToolInstaller@0
|
104 |
| - displayName: Use Java 11 SDK |
| 104 | + displayName: Use Java 21 SDK |
105 | 105 | inputs:
|
106 |
| - versionSpec: '11' |
| 106 | + versionSpec: '21' |
107 | 107 | jdkArchitectureOption: 'x64'
|
108 | 108 | jdkSourceOption: LocalDirectory
|
109 |
| - jdkFile: $(JDK_11_FILE_PATH) |
| 109 | + jdkFile: $(JDK_21_FILE_PATH) |
110 | 110 | jdkDestinationDirectory: ${{ parameters.javaSdkRoot }}
|
111 | 111 | cleanDestinationDirectory: true
|
0 commit comments