Skip to content
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

[GetAndroidDependencies] Add Jdk dependency info #8651

Merged
merged 7 commits into from
Jan 31, 2024
Merged

[GetAndroidDependencies] Add Jdk dependency info #8651

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e8afabb
[GetAndroidDependencies] Add Jdk dependency info
pjcollins Jan 18, 2024
b79490b
Bump XAT
pjcollins Jan 23, 2024
baa772d
Use collection, update naming
pjcollins Jan 23, 2024
57ce254
Merge remote-tracking branch 'origin/main' into dev/pjc/installjdk
pjcollins Jan 25, 2024
0df81d8
Validate JavaDependency output
pjcollins Jan 25, 2024
676bc59
Opt out of Java dependency info by default
pjcollins Jan 29, 2024
883d7b4
Rename and document new prop
pjcollins Jan 30, 2024
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
12 changes: 12 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Tasks/CalculateProjectDependencies.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,16 @@ public class CalculateProjectDependencies : AndroidTask

public bool NdkRequired { get; set; }

public string JdkVersion { get; set; }

public bool GetJavaDependencies { get; set; } = false;

[Output]
public ITaskItem [] Dependencies { get; set; }

[Output]
public ITaskItem[] JavaDependencies { get; set; }

ITaskItem CreateAndroidDependency (string include, string version)
{
if (string.IsNullOrEmpty (version))
Expand All @@ -49,6 +56,7 @@ ITaskItem CreateAndroidDependency (string include, string version)
public override bool RunTask ()
{
var dependencies = new List<ITaskItem> ();
var javaDependencies = new List<ITaskItem> ();
var targetApiLevel = string.IsNullOrEmpty (AndroidApiLevel) ?
MonoAndroidHelper.SupportedVersions.GetApiLevelFromFrameworkVersion (TargetFrameworkVersion) :
MonoAndroidHelper.SupportedVersions.GetApiLevelFromId (AndroidApiLevel);
Expand All @@ -69,7 +77,11 @@ public override bool RunTask ()
if (!string.IsNullOrEmpty (NdkVersion) && NdkRequired) {
dependencies.Add (CreateAndroidDependency ("ndk-bundle", NdkVersion));
}
if (!string.IsNullOrEmpty (JdkVersion) && GetJavaDependencies) {
javaDependencies.Add (CreateAndroidDependency ("jdk", JdkVersion));
}
Dependencies = dependencies.ToArray ();
JavaDependencies = javaDependencies.ToArray ();
return !Log.HasLoggedErrors;
}
}
Expand Down
9 changes: 8 additions & 1 deletion ...Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AndroidDependenciesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public void GetDependencyWhenBuildToolsAreMissingTest ()
}

[Test]
public void GetDependencyWhenSDKIsMissingTest ([Values (true, false)] bool createSdkDirectory)
public void GetDependencyWhenSDKIsMissingTest ([Values (true, false)] bool createSdkDirectory, [Values (true, false)] bool getJavaDeps)
{
var apis = new ApiInfo [] {
};
Expand All @@ -168,9 +168,12 @@ public void GetDependencyWhenSDKIsMissingTest ([Values (true, false)] bool creat
IsRelease = true,
TargetSdkVersion = "26",
};
var requestedJdkVersion = "17.0.8.1";
var parameters = new string [] {
$"TargetFrameworkRootPath={referencesPath}",
$"AndroidSdkDirectory={androidSdkPath}",
$"JavaSdkVersion={requestedJdkVersion}",
$"AndroidGetJavaDependencies={getJavaDeps}",
};

string buildToolsVersion = GetExpectedBuildToolsVersion ();
Expand All @@ -183,6 +186,10 @@ public void GetDependencyWhenSDKIsMissingTest ([Values (true, false)] bool creat
StringAssertEx.Contains ($"platforms/android-{apiLevel}", builder.LastBuildOutput, $"platforms/android-{apiLevel} should be a dependency.");
StringAssertEx.Contains ($"build-tools/{buildToolsVersion}", builder.LastBuildOutput, $"build-tools/{buildToolsVersion} should be a dependency.");
StringAssertEx.Contains ("platform-tools", builder.LastBuildOutput, "platform-tools should be a dependency.");
if (getJavaDeps)
StringAssertEx.ContainsRegex ($@"JavaDependency=\s*jdk\s*Version={requestedJdkVersion}", builder.LastBuildOutput, $"jdk {requestedJdkVersion} should be a dependency.");
else
StringAssertEx.DoesNotContainRegex ($@"JavaDependency=\s*jdk\s*Version={requestedJdkVersion}", builder.LastBuildOutput, $"jdk {requestedJdkVersion} should not be a dependency.");
}
}

Expand Down
6 changes: 5 additions & 1 deletion src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2712,10 +2712,11 @@ because xbuild doesn't support framework reference assemblies.
<Target Name="_BeforeGetAndroidDependencies">
<PropertyGroup>
<_AndroidAllowMissingSdkTooling>True</_AndroidAllowMissingSdkTooling>
<AndroidGetJavaDependencies Condition=" '$(AndroidGetJavaDependencies)' == '' ">false</AndroidGetJavaDependencies>
</PropertyGroup>
</Target>

<Target Name="GetAndroidDependencies" DependsOnTargets="$(GetAndroidDependenciesDependsOn)" Returns="@(AndroidDependency)">
<Target Name="GetAndroidDependencies" DependsOnTargets="$(GetAndroidDependenciesDependsOn)" Returns="@(AndroidDependency);@(JavaDependency)">
<PropertyGroup>
<_ProjectAndroidManifest>$(ProjectDir)$(AndroidManifest)</_ProjectAndroidManifest>
<_NdkRequired Condition="'$(EnableLLVM)' == 'True'">true</_NdkRequired>
Expand All @@ -2731,8 +2732,11 @@ because xbuild doesn't support framework reference assemblies.
PlatformToolsVersion="$(AndroidSdkPlatformToolsVersion)"
NdkVersion="$(AndroidNdkVersion)"
NdkRequired="$(_NdkRequired)"
GetJavaDependencies="$(AndroidGetJavaDependencies)"
JdkVersion="$(JavaSdkVersion)"
>
<Output TaskParameter="Dependencies" ItemName="AndroidDependency" />
<Output TaskParameter="JavaDependencies" ItemName="JavaDependency" />
</CalculateProjectDependencies>
</Target>

Expand Down
Loading