Skip to content

[Xamarin.Android.Tools.AndroidSdk] Update SDK component for API-32 #169

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
jonpryor merged 8 commits into from
Jun 15, 2022
Merged

[Xamarin.Android.Tools.AndroidSdk] Update SDK component for API-32 #169

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d55aa64
[Xamarin.Android.Tools.AndroidSdk] Update SDK component for API-32
jonpryor Jun 7, 2022
982afd8
`$(AndroidSdkPlatformToolsVersion)`=33.0.2
jonpryor Jun 11, 2022
7244444
Revert NDK change; use NDK=22.1.7171670
jonpryor Jun 11, 2022
0bb3695
Revert "Revert NDK change; use NDK=22.1.7171670"
jonpryor Jun 13, 2022
ce2b57c
`$(AndroidSdkBuildToolsVersion)`=33.0.0
jonpryor Jun 13, 2022
da5e26f
$(AndroidNdkVersion)=24.0.8215888
jonpryor Jun 15, 2022
29d51ea
`$(AndroidSdkBuildToolsVersion)`=32.0.0
jonpryor Jun 15, 2022
a065619
Fix unit test failure. Doh!
jonpryor Jun 15, 2022
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
10 changes: 5 additions & 5 deletions src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
If this file is changed the submodule for androidtools should be updated,
along with any other repo which references androidtools.
-->
<AndroidSdkBuildToolsVersion Condition="'$(AndroidSdkBuildToolsVersion)' == ''">30.0.3</AndroidSdkBuildToolsVersion>
<AndroidCommandLineToolsVersion Condition=" '$(AndroidCommandLineToolsVersion)' == '' ">5.0</AndroidCommandLineToolsVersion>
<AndroidSdkPlatformToolsVersion Condition="'$(AndroidSdkPlatformToolsVersion)' == ''">31.0.3</AndroidSdkPlatformToolsVersion>
<AndroidSdkBuildToolsVersion Condition="'$(AndroidSdkBuildToolsVersion)' == ''">32.0.0</AndroidSdkBuildToolsVersion>
<AndroidCommandLineToolsVersion Condition=" '$(AndroidCommandLineToolsVersion)' == '' ">7.0</AndroidCommandLineToolsVersion>
<AndroidSdkPlatformToolsVersion Condition="'$(AndroidSdkPlatformToolsVersion)' == ''">33.0.2</AndroidSdkPlatformToolsVersion>
<AndroidSdkEmulatorVersion Condition="'$(AndroidSdkEmulatorVersion)' == ''"></AndroidSdkEmulatorVersion>
<AndroidSdkPlatformVersion Condition="'$(AndroidSdkPlatformVersion)' == ''">android-31</AndroidSdkPlatformVersion>
<AndroidNdkVersion Condition="'$(AndroidNdkVersion)' == ''">22.1.7171670</AndroidNdkVersion>
<AndroidSdkPlatformVersion Condition="'$(AndroidSdkPlatformVersion)' == ''">android-32</AndroidSdkPlatformVersion>
<AndroidNdkVersion Condition="'$(AndroidNdkVersion)' == ''">24.0.8215888</AndroidNdkVersion>

<!-- obsolete; should consider removing eventually -->
<AndroidSdkToolsVersion Condition="'$(AndroidSdkToolsVersion)' == ''">26.1.1</AndroidSdkToolsVersion>
Expand Down
3 changes: 2 additions & 1 deletion tests/Xamarin.Android.Tools.AndroidSdk-Tests/AndroidSdkInfoTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public void Ndk_MultipleNdkVersionsInSdk ()
{
// Must match like-named constants in AndroidSdkBase
const int MinimumCompatibleNDKMajorVersion = 16;
const int MaximumCompatibleNDKMajorVersion = 23;
const int MaximumCompatibleNDKMajorVersion = 24;

CreateSdks(out string root, out string jdk, out string ndk, out string sdk);

Expand All @@ -93,6 +93,7 @@ public void Ndk_MultipleNdkVersionsInSdk ()
"22.0.7026061",
"22.1.7171670",
"23.1.7779620",
"24.0.8215888",
};
string expectedVersion = "23.1.7779620";

@jonathanpeppers jonathanpeppers Jun 15, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you need to update this number to fix the test?

Ndk_MultipleNdkVersionsInSdk
AndroidNdkPath not found inside sdk!
String lengths are both 77. Strings differ at index 66.
Expected: "...nistrator\AppData\Local\Temp\tmp51D5.tmp\sdk\ndk\23.1.7779620"
But was:  "...nistrator\AppData\Local\Temp\tmp51D5.tmp\sdk\ndk\24.0.8215888"

string expectedNdkPath = Path.Combine (sdk, "ndk", expectedVersion);
Expand Down