Skip to content

[binderator] Allow extraDependencies to specify an excludedDependency. #780

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
jpobst merged 1 commit into from
Aug 29, 2023
Merged

[binderator] Allow extraDependencies to specify an excludedDependency. #780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 ...in.AndroidBinderator/Xamarin.AndroidBinderator.Tool/Xamarin.AndroidBinderator.Tool.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<PropertyGroup>
<PackageId>Xamarin.AndroidBinderator.Tool</PackageId>
<PackageVersion>0.5.6</PackageVersion>
<PackageVersion>0.5.7</PackageVersion>
<Title>Xamarin Android Binderator</Title>
<PackageDescription>A tool for generating Xamarin.Android Binding projects from Razor templates and Maven Repository data.</PackageDescription>
<PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=2100525</PackageProjectUrl>
Expand Down
16 changes: 13 additions & 3 deletions util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator/Engine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,14 +318,24 @@ static List<BindingProjectModel> BuildProjectModels(BindingConfig config, Dictio
MavenArtifactConfig = mavenArtifact
});

// Gather maven dependencies to try and map out nuget dependencies
foreach (var mavenDep in mavenProject.Dependencies.Concat(ParseExtraDependencies(mavenArtifact.ExtraDependencies)))
{
List<Dependency> dependencies = new List<Dependency>();

// Find all the POM specified dependencies that we need to consider
foreach (var mavenDep in mavenProject.Dependencies) {
FixDependency(config, mavenArtifact, mavenDep, mavenProject);

if (!ShouldIncludeDependency(config, mavenArtifact, mavenDep, exceptions))
continue;

dependencies.Add(mavenDep);
}

// Add any "extraDependencies"
dependencies.AddRange(ParseExtraDependencies(mavenArtifact.ExtraDependencies));

// Try and map out nuget dependencies
foreach (var mavenDep in dependencies)
{
mavenDep.GroupId = mavenDep.GroupId.Replace ("${project.groupId}", mavenProject.GroupId);
mavenDep.Version = mavenDep.Version?.Replace ("${project.version}", mavenProject.Version);

Expand Down
2 changes: 1 addition & 1 deletion util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<PropertyGroup>
<PackageVersion>2.3.6</PackageVersion>
<PackageVersion>2.3.7</PackageVersion>
<PackageId>Xamarin.AndroidBinderator</PackageId>
<Title>Xamarin.AndroidBinderator</Title>
<PackageDescription>An engine to generate Xamarin Binding projects from Maven repositories with a JSON config and razor templates.</PackageDescription>
Expand Down