Skip to content

Commit a6eb63f

Browse files
grendellogrendello
committed
Merge branch 'main' into dev/grendel/blobs-in-lib
* main: [build] Bump Android SDK component versions (#8510)
2 parents b8c35a6 + 490737c commit a6eb63f

File tree

10 files changed

+31
-28
lines changed

10 files changed

+31
-28
lines changed

‎.external‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
xamarin/monodroid:dev/grendel/blobs-in-lib@f963325691128b3024d9398b88022d549e5e5c37
1+
xamarin/monodroid:dev/grendel/blobs-in-lib@e8d4be24564f11ecb5486d07e2ef17e48a52ec69
22

‎Configuration.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<XABuildToolsVersion>34</XABuildToolsVersion>
121121
<XABuildToolsFolder Condition="'$(XABuildToolsFolder)' == ''">34.0.0</XABuildToolsFolder>
122122
<XAPlatformToolsPackagePrefix Condition=" '$(HostOS)' == 'Darwin' "></XAPlatformToolsPackagePrefix>
123-
<XAPlatformToolsVersion>34.0.1</XAPlatformToolsVersion>
123+
<XAPlatformToolsVersion>34.0.5</XAPlatformToolsVersion>
124124
<XABundleToolVersion Condition="'$(XABundleToolVersion)' == ''">1.15.1</XABundleToolVersion>
125125
<XAPackagesDir Condition=" '$(XAPackagesDir)' == '' And '$(NUGET_PACKAGES)' != ''">$(NUGET_PACKAGES)</XAPackagesDir>
126126
<XAPackagesDir Condition=" '$(XAPackagesDir)' == '' And '$(HostOS)' == 'Windows'">$(userprofile)\.nuget\packages</XAPackagesDir>
@@ -154,8 +154,8 @@
154154
<AvdManagerToolExe Condition=" '$(AvdManagerToolExe)' == '' and '$(HostOS)' == 'Windows' ">avdmanager.bat</AvdManagerToolExe>
155155
<AndroidToolPath Condition=" '$(AndroidToolPath)' == '' ">$(AndroidSdkFullPath)\tools</AndroidToolPath>
156156
<AndroidToolsBinPath Condition=" '$(AndroidToolsBinPath)' == '' ">$(AndroidToolPath)\bin</AndroidToolsBinPath>
157-
<CommandLineToolsFolder Condition=" '$(CommandLineToolsFolder)' == '' ">7.0</CommandLineToolsFolder>
158-
<CommandLineToolsVersion Condition=" '$(CommandLineToolsVersion)' == '' ">8512546_latest</CommandLineToolsVersion>
157+
<CommandLineToolsFolder Condition=" '$(CommandLineToolsFolder)' == '' ">11.0</CommandLineToolsFolder>
158+
<CommandLineToolsVersion Condition=" '$(CommandLineToolsVersion)' == '' ">10406996_latest</CommandLineToolsVersion>
159159
<CommandLineToolsBinPath Condition=" '$(CommandLineToolsBinPath)' == '' ">$(AndroidSdkFullPath)\cmdline-tools\$(CommandLineToolsFolder)\bin</CommandLineToolsBinPath>
160160
<!-- Version numbers and PkgVersion are found in https://dl-ssl.google.com/android/repository/repository2-3.xml -->
161161
<EmulatorVersion Condition=" '$(EmulatorVersion)' == '' ">9364964</EmulatorVersion>

‎build-tools/automation/azure-pipelines-nightly.yaml‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ stages:
118118
restoreNUnitConsole: false
119119
updateMono: false
120120
xaprepareScenario: EmulatorTestDependencies
121+
jdkTestFolder: $(JAVA_HOME_11_X64)
121122

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

129-
- script: echo "##vso[task.setvariable variable=Java8SdkDirectory]$JAVA_HOME_8_X64"
130-
displayName: set Java8SdkDirectory
131-
132130
- template: yaml-templates/start-stop-emulator.yaml
133131
parameters:
134132
specificImage: true
@@ -158,6 +156,7 @@ stages:
158156
emulatorMSBuildArgs: -p:TestAvdExtraBootArgs=-writable-system
159157
jobName: SystemApplicationTests
160158
jobTimeout: 120
159+
jdkTestFolder: $HOME/android-toolchain/jdk-17
161160
testSteps:
162161
- template: run-nunit-tests.yaml
163162
parameters:
@@ -190,13 +189,18 @@ stages:
190189
steps:
191190
- template: agent-cleanser/v1.yml@yaml-templates
192191

192+
- script: |
193+
echo "##vso[task.setvariable variable=JAVA_HOME]$HOME/android-toolchain/jdk-17"
194+
displayName: set JAVA_HOME to $HOME/android-toolchain/jdk-17
195+
193196
- template: yaml-templates/setup-test-environment.yaml
194197
parameters:
195198
installTestSlicer: true
196199
installLegacyDotNet: false
197200
restoreNUnitConsole: false
198201
updateMono: false
199202
xaprepareScenario: EmulatorTestDependencies
203+
jdkTestFolder: $HOME/android-toolchain/jdk-17
200204

201205
- task: DownloadPipelineArtifact@2
202206
inputs:
@@ -243,13 +247,18 @@ stages:
243247
steps:
244248
- template: agent-cleanser/v1.yml@yaml-templates
245249

250+
- script: |
251+
echo "##vso[task.setvariable variable=JAVA_HOME]$HOME/android-toolchain/jdk-17"
252+
displayName: set JAVA_HOME to $HOME/android-toolchain/jdk-17
253+
246254
- template: yaml-templates/setup-test-environment.yaml
247255
parameters:
248256
installTestSlicer: true
249257
installLegacyDotNet: false
250258
restoreNUnitConsole: false
251259
updateMono: false
252260
xaprepareScenario: EmulatorTestDependencies
261+
jdkTestFolder: $HOME/android-toolchain/jdk-17
253262

254263
- task: DownloadPipelineArtifact@2
255264
inputs:

‎build-tools/automation/azure-pipelines.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,9 +350,9 @@ stages:
350350
forceReinstallCredentialProvider: true
351351

352352
- script: |
353-
echo ##vso[task.setvariable variable=JI_JAVA_HOME]%JAVA_HOME_11_X64%
354-
echo ##vso[task.setvariable variable=JAVA_HOME]%JAVA_HOME_11_X64%
355-
displayName: set JI_JAVA_HOME, JAVA_HOME
353+
echo ##vso[task.setvariable variable=JI_JAVA_HOME]%JAVA_HOME_17_X64%
354+
echo ##vso[task.setvariable variable=JAVA_HOME]%JAVA_HOME_17_X64%
355+
displayName: set JI_JAVA_HOME, JAVA_HOME to $(JAVA_HOME_17_X64)
356356
357357
- task: DownloadPipelineArtifact@2
358358
inputs:

‎build-tools/automation/yaml-templates/build-windows.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ stages:
3838
- template: clean.yaml
3939

4040
- script: |
41-
echo ##vso[task.setvariable variable=JI_JAVA_HOME]%JAVA_HOME_11_X64%
42-
displayName: set JI_JAVA_HOME
41+
echo ##vso[task.setvariable variable=JI_JAVA_HOME]%JAVA_HOME_17_X64%
42+
displayName: set JI_JAVA_HOME to $(JAVA_HOME_17_X64)
4343
4444
- template: use-dot-net.yaml
4545
parameters:

‎build-tools/automation/yaml-templates/run-emulator-tests.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ parameters:
44
emulatorMSBuildArgs: ''
55
jobName: CheckTimeZoneInfoIsCorrectNode1
66
jobTimeout: 360
7+
jdkTestFolder: $(JAVA_HOME_17_X64)
78
testSteps: []
89

910
jobs:
@@ -20,12 +21,17 @@ jobs:
2021
steps:
2122
- template: agent-cleanser/v1.yml@yaml-templates
2223

24+
- script: |
25+
echo "##vso[task.setvariable variable=JAVA_HOME]${{ parameters.jdkTestFolder }}"
26+
displayName: set JAVA_HOME to ${{ parameters.jdkTestFolder }}
27+
2328
- template: setup-test-environment.yaml
2429
parameters:
2530
installLegacyDotNet: false
2631
restoreNUnitConsole: false
2732
updateMono: false
2833
xaprepareScenario: EmulatorTestDependencies
34+
jdkTestFolder: ${{ parameters.jdkTestFolder }}
2935

3036
- task: DownloadPipelineArtifact@2
3137
inputs:

‎build-tools/automation/yaml-templates/setup-test-environment.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
parameters:
22
configuration: $(XA.Build.Configuration)
33
xaSourcePath: $(System.DefaultWorkingDirectory)
4-
jdkTestFolder: $(JAVA_HOME_11_X64)
4+
jdkTestFolder: $(JAVA_HOME_17_X64)
55
remove_dotnet: false
66
installTestSlicer: false
77
installApkDiff: true
@@ -26,13 +26,13 @@ steps:
2626
- script: |
2727
echo "##vso[task.setvariable variable=JI_JAVA_HOME]${{ parameters.jdkTestFolder }}"
2828
echo "##vso[task.setvariable variable=DOTNET_TOOL_PATH]${{ parameters.xaSourcePath }}/bin/${{ parameters.configuration }}/dotnet/dotnet"
29-
displayName: set JI_JAVA_HOME
29+
displayName: set JI_JAVA_HOME to ${{ parameters.jdkTestFolder }}
3030
condition: and(succeeded(), ne(variables['agent.os'], 'Windows_NT'))
3131

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

3838
# Install .NET 6 for legacy tests

‎build-tools/scripts/TestApks.targets‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,6 @@
371371
<!-- SDK component installation can be frail, try a few times. -->
372372
<Exec
373373
Command="&quot;$(CommandLineToolsBinPath)\sdkmanager&quot; &quot;$(SdkManagerImageName)&quot;"
374-
EnvironmentVariables="JAVA_HOME=$(Java8SdkDirectory)"
375374
ContinueOnError="true">
376375
<Output TaskParameter="ExitCode" PropertyName="_SdkManagerExitCode" />
377376
</Exec>
@@ -381,7 +380,6 @@
381380
/>
382381
<Exec
383382
Command="&quot;$(CommandLineToolsBinPath)\sdkmanager&quot; &quot;$(SdkManagerImageName)&quot;"
384-
EnvironmentVariables="JAVA_HOME=$(Java8SdkDirectory)"
385383
ContinueOnError="true"
386384
Condition=" '$(_SdkManagerExitCode)' != '0' ">
387385
<Output TaskParameter="ExitCode" PropertyName="_SdkManagerExitCode" />
@@ -392,7 +390,6 @@
392390
/>
393391
<Exec
394392
Command="&quot;$(CommandLineToolsBinPath)\sdkmanager&quot; &quot;$(SdkManagerImageName)&quot;"
395-
EnvironmentVariables="JAVA_HOME=$(Java8SdkDirectory)"
396393
ContinueOnError="true"
397394
Condition=" '$(_SdkManagerExitCode)' != '0' ">
398395
<Output TaskParameter="ExitCode" PropertyName="_SdkManagerExitCode" />

‎external/xamarin-android-tools‎

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1429,9 +1429,6 @@ public void XA4310 ([Values ("apk", "aab")] string packageFormat)
14291429
[NonParallelizable]
14301430
public void CheckLintErrorsAndWarnings ()
14311431
{
1432-
if (TestEnvironment.IsUsingJdk8)
1433-
Assert.Ignore ("https://github.com/xamarin/xamarin-android/issues/5698");
1434-
14351432
string disabledIssues = "StaticFieldLeak,ObsoleteSdkInt,AllowBackup,ExportedReceiver,RedundantLabel";
14361433

14371434
var proj = new XamarinAndroidApplicationProject () {
@@ -1486,9 +1483,6 @@ public class MainActivity : Activity
14861483
[Test]
14871484
public void CheckLintConfigMerging ()
14881485
{
1489-
if (TestEnvironment.IsUsingJdk8)
1490-
Assert.Ignore ("https://github.com/xamarin/xamarin-android/issues/5698");
1491-
14921486
var proj = new XamarinAndroidApplicationProject ();
14931487
proj.SetProperty ("AndroidLintEnabled", true.ToString ());
14941488
proj.OtherBuildItems.Add (new AndroidItem.AndroidLintConfig ("lint1.xml") {
@@ -1622,9 +1616,6 @@ public void DuplicateValuesInResourceCaseMap ()
16221616
[Test]
16231617
public void CheckLintResourceFileReferencesAreFixed ()
16241618
{
1625-
if (TestEnvironment.IsUsingJdk8)
1626-
Assert.Ignore ("https://github.com/xamarin/xamarin-android/issues/5698");
1627-
16281619
var proj = new XamarinAndroidApplicationProject () {
16291620
PackageReferences = {
16301621
KnownPackages.AndroidSupportV4_27_0_2_1,

0 commit comments

Comments
 (0)