Just install Java 21

Author: mattleibow

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

@@ -18,11 +18,11 @@ jobs:
     - name: Install Android workload
       run: dotnet workload install android
 
-    - name: Setup OpenJDK 11
+    - name: Setup OpenJDK 21
       uses: actions/setup-java@v4
       with:
         distribution: 'microsoft'
-        java-version: '11'
+        java-version: '21'
 
     - name: Restore dotnet tools
       run: dotnet tool restore

azure-pipelines-public.yml

@@ -18,7 +18,6 @@ stages:
         demands:
         - ImageOverride -equals $(WindowsPoolImageNetCorePublic)
       use1ESTemplate: false
-      installAndroidDependencies: true
 
 - stage: build_mac
   displayName: Build - Mac
@@ -38,4 +37,3 @@ stages:
       name: $(NetCorePublicPoolName)
       demands:
       - ImageOverride -equals $(WindowsPoolImageNetCorePublic)
-    installAndroidDependencies: true

build/ci/build.yml

@@ -7,7 +7,6 @@ parameters:
   timeoutInMinutes: 600                                             # Max job runtime in minutes
   runAPIScan: false                                                 # Run APIScan analysis
   use1ESTemplate: true
-  installAndroidDependencies: false
   androidSdkRoot: $(Agent.TempDirectory)/android-sdk
 
   # Reporting/Analysis Parameters
@@ -37,7 +36,6 @@ jobs:
   steps:
     - template: setup-environment.yml
       parameters:
-        installAndroidDependencies: ${{ parameters.installAndroidDependencies }}
         androidSdkRoot: ${{ parameters.androidSdkRoot }}
 
     - template: build-and-test.yml

build/ci/job-extended-tests.yml

@@ -7,7 +7,6 @@ parameters:
   testFilter:                                     # Test category filter 
   testProject:                                    # The test .csproj to build
   testAssembly:                                   # The test .dll to execute
-  installAndroidDependencies: false
 
 jobs:
 - job: ${{ parameters.jobName }}_package_tests
@@ -19,8 +18,6 @@ jobs:
 
   steps:
   - template: setup-environment.yml
-    parameters:
-      installAndroidDependencies: ${{ parameters.installAndroidDependencies }}
 
   - task: DownloadPipelineArtifact@2
     inputs:

build/ci/setup-environment.yml

@@ -1,7 +1,5 @@
 parameters:
-  installAndroidDependencies: false
   androidSdkRoot: $(Agent.TempDirectory)/android-sdk
-  javaSdkRoot: $(Agent.ToolsDirectory)\jdk11
 
 steps:
   # before the build starts, make sure the tooling is as expected. Clear the cache on shared agents
@@ -44,22 +42,11 @@ steps:
       }
     displayName: Install .NET Workloads
 
-  - bash: |
-      if [[ "$(Agent.Name)" == *"Azure Pipelines"* ]]; then
-          echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_11_X64)"
-      else
-          echo "##vso[task.setvariable variable=JAVA_HOME]/Library/Java/JavaVirtualMachines/microsoft-11.jdk/Contents/Home"
-      fi
-    displayName: Use Java 11 SDK (Mac)
-    condition: eq( variables['Agent.OS'], 'Darwin' )
-
   - task: JavaToolInstaller@0
-    displayName: Use Java 11 SDK (Windows)
-    condition: and(eq( variables['Agent.OS'], 'Windows_NT' ), ne(${{ parameters.installAndroidDependencies }}, true))
+    displayName: Use Java 21 SDK
     inputs:
-      versionSpec: '11'
+      versionSpec: '21'
       jdkArchitectureOption: 'x64'
-      jdkSourceOption: 'PreInstalled'
 
   - task: DotNetCoreCLI@2
     displayName: Install android dependencies GoogleV2
@@ -87,25 +74,3 @@ steps:
       Write-Host "##vso[task.setvariable variable=AndroidSdkDirectory]${{ parameters.androidSdkRoot }}"
       Write-Host "##vso[task.setvariable variable=ANDROID_SDK_ROOT]${{ parameters.androidSdkRoot }}"
     displayName: Set ANDROID_SDK_ROOT to ${{ parameters.androidSdkRoot }}
-
-  - ${{ if eq(parameters.installAndroidDependencies, true) }}:
-    - pwsh: |
-        $url = "https://aka.ms/download-jdk/microsoft-jdk-11.0.26-windows-x64.zip"
-        if ($IsMacOS) {
-            $url = "https://aka.ms/download-jdk/microsoft-jdk-11.0.26-macos-x64.tar.gz"
-        }
-        $fileName = [System.IO.Path]::GetFileName($url)
-        Invoke-WebRequest -Uri $url -OutFile $fileName
-        Write-Host "##vso[task.setvariable variable=JDK_11_FILE_PATH]$(Build.StagingDirectory)/$fileName"
-      displayName: Download Java 11 SDK
-      workingDirectory: $(Build.StagingDirectory)
-
-    - task: JavaToolInstaller@0
-      displayName: Use Java 11 SDK
-      inputs:
-        versionSpec: '11'
-        jdkArchitectureOption: 'x64'
-        jdkSourceOption: LocalDirectory
-        jdkFile: $(JDK_11_FILE_PATH)
-        jdkDestinationDirectory: ${{ parameters.javaSdkRoot }}
-        cleanDestinationDirectory: true

build/ci/stage-standard-tests.yml

@@ -3,7 +3,6 @@
 parameters:
   buildPool:                                                        # VM pool information
   stageCondition: and(succeeded(), ne('$(skipUnitTests)', 'true'))  # When to run this stage
-  installAndroidDependencies: false
 
 stages:
 - stage: standard_tests
@@ -21,4 +20,3 @@ stages:
       testProject: $(standardTestProject)
       testAssembly: $(standardTestAssembly)
       buildPool: ${{ parameters.buildPool }}
-      installAndroidDependencies: ${{ parameters.installAndroidDependencies }}