Skip to content

[build] Bump Android SDK component versions #8510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Nov 29, 2023
Merged

[build] Bump Android SDK component versions #8510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
68b1861
Bump to xat 218
pjcollins Nov 16, 2023
f1c712a
Test android-sdk-installer PR 892
pjcollins Nov 16, 2023
20d92ff
Merge remote-tracking branch 'origin/main' into dev/pjc/tools-34
pjcollins Nov 20, 2023
8a824fe
Bump tools versions, update Lint
pjcollins Nov 21, 2023
c0a6ed4
Back out lint changes that can be merged separately
pjcollins Nov 27, 2023
1156972
Merge remote-tracking branch 'origin/main' into dev/pjc/tools-34
pjcollins Nov 27, 2023
9391b24
Fix nightly
pjcollins Nov 27, 2023
3c38e8e
Bump externals
pjcollins Nov 27, 2023
e948b2e
Bump monodroid
pjcollins Nov 27, 2023
8df3751
Remove all Lint changes
pjcollins Nov 27, 2023
b75ddaf
Fix nightly on on-prem machines
pjcollins Nov 27, 2023
cfd7cbc
Bump monodroid
pjcollins Nov 28, 2023
9be8e6e
Merge remote-tracking branch 'origin/main' into dev/pjc/tools-34
pjcollins Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .external
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
xamarin/monodroid:main@c5f1e77bc732dc660090a8d59048f07de846ccd7
xamarin/monodroid:main@44b5ccb0ae4a7316e93040289832c74230b5217f
6 changes: 3 additions & 3 deletions Configuration.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
<XABuildToolsVersion>34</XABuildToolsVersion>
<XABuildToolsFolder Condition="'$(XABuildToolsFolder)' == ''">34.0.0</XABuildToolsFolder>
<XAPlatformToolsPackagePrefix Condition=" '$(HostOS)' == 'Darwin' "></XAPlatformToolsPackagePrefix>
<XAPlatformToolsVersion>34.0.1</XAPlatformToolsVersion>
<XAPlatformToolsVersion>34.0.5</XAPlatformToolsVersion>
<XABundleToolVersion Condition="'$(XABundleToolVersion)' == ''">1.15.1</XABundleToolVersion>
<XAPackagesDir Condition=" '$(XAPackagesDir)' == '' And '$(NUGET_PACKAGES)' != ''">$(NUGET_PACKAGES)</XAPackagesDir>
<XAPackagesDir Condition=" '$(XAPackagesDir)' == '' And '$(HostOS)' == 'Windows'">$(userprofile)\.nuget\packages</XAPackagesDir>
Expand Down Expand Up @@ -154,8 +154,8 @@
<AvdManagerToolExe Condition=" '$(AvdManagerToolExe)' == '' and '$(HostOS)' == 'Windows' ">avdmanager.bat</AvdManagerToolExe>
<AndroidToolPath Condition=" '$(AndroidToolPath)' == '' ">$(AndroidSdkFullPath)\tools</AndroidToolPath>
<AndroidToolsBinPath Condition=" '$(AndroidToolsBinPath)' == '' ">$(AndroidToolPath)\bin</AndroidToolsBinPath>
<CommandLineToolsFolder Condition=" '$(CommandLineToolsFolder)' == '' ">7.0</CommandLineToolsFolder>
<CommandLineToolsVersion Condition=" '$(CommandLineToolsVersion)' == '' ">8512546_latest</CommandLineToolsVersion>
<CommandLineToolsFolder Condition=" '$(CommandLineToolsFolder)' == '' ">11.0</CommandLineToolsFolder>
<CommandLineToolsVersion Condition=" '$(CommandLineToolsVersion)' == '' ">10406996_latest</CommandLineToolsVersion>
<CommandLineToolsBinPath Condition=" '$(CommandLineToolsBinPath)' == '' ">$(AndroidSdkFullPath)\cmdline-tools\$(CommandLineToolsFolder)\bin</CommandLineToolsBinPath>
<!-- Version numbers and PkgVersion are found in https://dl-ssl.google.com/android/repository/repository2-3.xml -->
<EmulatorVersion Condition=" '$(EmulatorVersion)' == '' ">9364964</EmulatorVersion>
Expand Down
15 changes: 12 additions & 3 deletions build-tools/automation/azure-pipelines-nightly.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ stages:
restoreNUnitConsole: false
updateMono: false
xaprepareScenario: EmulatorTestDependencies
jdkTestFolder: $(JAVA_HOME_11_X64)

- template: yaml-templates/run-dotnet-preview.yaml
parameters:
Expand All @@ -126,9 +127,6 @@ stages:
displayName: prepare java.interop $(XA.Build.Configuration)
continueOnError: false

- script: echo "##vso[task.setvariable variable=Java8SdkDirectory]$JAVA_HOME_8_X64"
displayName: set Java8SdkDirectory

- template: yaml-templates/start-stop-emulator.yaml
parameters:
specificImage: true
Expand Down Expand Up @@ -158,6 +156,7 @@ stages:
emulatorMSBuildArgs: -p:TestAvdExtraBootArgs=-writable-system
jobName: SystemApplicationTests
jobTimeout: 120
jdkTestFolder: $HOME/android-toolchain/jdk-17
testSteps:
- template: run-nunit-tests.yaml
parameters:
Expand Down Expand Up @@ -190,13 +189,18 @@ stages:
steps:
- template: agent-cleanser/v1.yml@yaml-templates

- script: |
echo "##vso[task.setvariable variable=JAVA_HOME]$HOME/android-toolchain/jdk-17"
displayName: set JAVA_HOME to $HOME/android-toolchain/jdk-17

- template: yaml-templates/setup-test-environment.yaml
parameters:
installTestSlicer: true
installLegacyDotNet: false
restoreNUnitConsole: false
updateMono: false
xaprepareScenario: EmulatorTestDependencies
jdkTestFolder: $HOME/android-toolchain/jdk-17

- task: DownloadPipelineArtifact@2
inputs:
Expand Down Expand Up @@ -243,13 +247,18 @@ stages:
steps:
- template: agent-cleanser/v1.yml@yaml-templates

- script: |
echo "##vso[task.setvariable variable=JAVA_HOME]$HOME/android-toolchain/jdk-17"
displayName: set JAVA_HOME to $HOME/android-toolchain/jdk-17

- template: yaml-templates/setup-test-environment.yaml
parameters:
installTestSlicer: true
installLegacyDotNet: false
restoreNUnitConsole: false
updateMono: false
xaprepareScenario: EmulatorTestDependencies
jdkTestFolder: $HOME/android-toolchain/jdk-17

- task: DownloadPipelineArtifact@2
inputs:
Expand Down
6 changes: 3 additions & 3 deletions build-tools/automation/azure-pipelines.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,9 +350,9 @@ stages:
forceReinstallCredentialProvider: true

- script: |
echo ##vso[task.setvariable variable=JI_JAVA_HOME]%JAVA_HOME_11_X64%
echo ##vso[task.setvariable variable=JAVA_HOME]%JAVA_HOME_11_X64%
displayName: set JI_JAVA_HOME, JAVA_HOME
echo ##vso[task.setvariable variable=JI_JAVA_HOME]%JAVA_HOME_17_X64%
echo ##vso[task.setvariable variable=JAVA_HOME]%JAVA_HOME_17_X64%
displayName: set JI_JAVA_HOME, JAVA_HOME to $(JAVA_HOME_17_X64)

- task: DownloadPipelineArtifact@2
inputs:
Expand Down
4 changes: 2 additions & 2 deletions build-tools/automation/yaml-templates/build-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ stages:
- template: clean.yaml

- script: |
echo ##vso[task.setvariable variable=JI_JAVA_HOME]%JAVA_HOME_11_X64%
displayName: set JI_JAVA_HOME
echo ##vso[task.setvariable variable=JI_JAVA_HOME]%JAVA_HOME_17_X64%
displayName: set JI_JAVA_HOME to $(JAVA_HOME_17_X64)

- template: use-dot-net.yaml
parameters:
Expand Down
6 changes: 6 additions & 0 deletions build-tools/automation/yaml-templates/run-emulator-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ parameters:
emulatorMSBuildArgs: ''
jobName: CheckTimeZoneInfoIsCorrectNode1
jobTimeout: 360
jdkTestFolder: $(JAVA_HOME_17_X64)
testSteps: []

jobs:
Expand All @@ -20,12 +21,17 @@ jobs:
steps:
- template: agent-cleanser/v1.yml@yaml-templates

- script: |
echo "##vso[task.setvariable variable=JAVA_HOME]${{ parameters.jdkTestFolder }}"
displayName: set JAVA_HOME to ${{ parameters.jdkTestFolder }}

- template: setup-test-environment.yaml
parameters:
installLegacyDotNet: false
restoreNUnitConsole: false
updateMono: false
xaprepareScenario: EmulatorTestDependencies
jdkTestFolder: ${{ parameters.jdkTestFolder }}

- task: DownloadPipelineArtifact@2
inputs:
Expand Down
6 changes: 3 additions & 3 deletions build-tools/automation/yaml-templates/setup-test-environment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
parameters:
configuration: $(XA.Build.Configuration)
xaSourcePath: $(System.DefaultWorkingDirectory)
jdkTestFolder: $(JAVA_HOME_11_X64)
jdkTestFolder: $(JAVA_HOME_17_X64)
remove_dotnet: false
installTestSlicer: false
installApkDiff: true
Expand All @@ -26,13 +26,13 @@ steps:
- script: |
echo "##vso[task.setvariable variable=JI_JAVA_HOME]${{ parameters.jdkTestFolder }}"
echo "##vso[task.setvariable variable=DOTNET_TOOL_PATH]${{ parameters.xaSourcePath }}/bin/${{ parameters.configuration }}/dotnet/dotnet"
displayName: set JI_JAVA_HOME
displayName: set JI_JAVA_HOME to ${{ parameters.jdkTestFolder }}
condition: and(succeeded(), ne(variables['agent.os'], 'Windows_NT'))

- script: |
echo ##vso[task.setvariable variable=JI_JAVA_HOME]${{ parameters.jdkTestFolder }}
echo ##vso[task.setvariable variable=DOTNET_TOOL_PATH]${{ parameters.xaSourcePath }}\bin\${{ parameters.configuration }}\dotnet\dotnet.exe
displayName: set JI_JAVA_HOME
displayName: set JI_JAVA_HOME to ${{ parameters.jdkTestFolder }}
condition: and(succeeded(), eq(variables['agent.os'], 'Windows_NT'))

# Install .NET 6 for legacy tests
Expand Down
3 changes: 0 additions & 3 deletions build-tools/scripts/TestApks.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,6 @@
<!-- SDK component installation can be frail, try a few times. -->
<Exec
Command="&quot;$(CommandLineToolsBinPath)\sdkmanager&quot; &quot;$(SdkManagerImageName)&quot;"
EnvironmentVariables="JAVA_HOME=$(Java8SdkDirectory)"
ContinueOnError="true">
<Output TaskParameter="ExitCode" PropertyName="_SdkManagerExitCode" />
</Exec>
Expand All @@ -381,7 +380,6 @@
/>
<Exec
Command="&quot;$(CommandLineToolsBinPath)\sdkmanager&quot; &quot;$(SdkManagerImageName)&quot;"
EnvironmentVariables="JAVA_HOME=$(Java8SdkDirectory)"
ContinueOnError="true"
Condition=" '$(_SdkManagerExitCode)' != '0' ">
<Output TaskParameter="ExitCode" PropertyName="_SdkManagerExitCode" />
Expand All @@ -392,7 +390,6 @@
/>
<Exec
Command="&quot;$(CommandLineToolsBinPath)\sdkmanager&quot; &quot;$(SdkManagerImageName)&quot;"
EnvironmentVariables="JAVA_HOME=$(Java8SdkDirectory)"
ContinueOnError="true"
Condition=" '$(_SdkManagerExitCode)' != '0' ">
<Output TaskParameter="ExitCode" PropertyName="_SdkManagerExitCode" />
Expand Down
2 changes: 1 addition & 1 deletion external/xamarin-android-tools
Open in desktop
Submodule xamarin-android-tools updated from 8d3828 to 08a699
9 changes: 0 additions & 9 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1429,9 +1429,6 @@ public void XA4310 ([Values ("apk", "aab")] string packageFormat)
[NonParallelizable]
public void CheckLintErrorsAndWarnings ()
{
if (TestEnvironment.IsUsingJdk8)
Assert.Ignore ("https://github.com/xamarin/xamarin-android/issues/5698");

string disabledIssues = "StaticFieldLeak,ObsoleteSdkInt,AllowBackup,ExportedReceiver,RedundantLabel";

var proj = new XamarinAndroidApplicationProject () {
Expand Down Expand Up @@ -1486,9 +1483,6 @@ public class MainActivity : Activity
[Test]
public void CheckLintConfigMerging ()
{
if (TestEnvironment.IsUsingJdk8)
Assert.Ignore ("https://github.com/xamarin/xamarin-android/issues/5698");

var proj = new XamarinAndroidApplicationProject ();
proj.SetProperty ("AndroidLintEnabled", true.ToString ());
proj.OtherBuildItems.Add (new AndroidItem.AndroidLintConfig ("lint1.xml") {
Expand Down Expand Up @@ -1622,9 +1616,6 @@ public void DuplicateValuesInResourceCaseMap ()
[Test]
public void CheckLintResourceFileReferencesAreFixed ()
{
if (TestEnvironment.IsUsingJdk8)
Assert.Ignore ("https://github.com/xamarin/xamarin-android/issues/5698");

var proj = new XamarinAndroidApplicationProject () {
PackageReferences = {
KnownPackages.AndroidSupportV4_27_0_2_1,
Expand Down