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

Jump to bottom

Fix parameters JavaSourceJar and JavaDocJar paths #422

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix parameters JavaSourceJar and JavaDocJar paths #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04966de
paths corrected for JavaSourceJar and JavaDocJar + fix for tooling error
moljac Nov 9, 2021
20223bd
metadata fixes
moljac Nov 9, 2021
050ebc2
Update dependencies.json
moljac Nov 22, 2021
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
4 changes: 4 additions & 0 deletions mappings/dependencies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1110,6 +1110,10 @@
"id": "Xamarin.AndroidX.MultiDex",
"dependencies": []
},
{
"id": "Xamarin.AndroidX.Migration.Tool",
"dependencies": []
},
{
"id": "Xamarin.AndroidX.Navigation.Common",
"dependencies": [
Expand Down
8 changes: 6 additions & 2 deletions source/AndroidXProject.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,17 @@
<ItemGroup>
@foreach (var art in @Model.MavenArtifacts)
{
if (@Model.NuGetPackageId == "Xamarin.AndroidX.DataBinding.DataBindingCommon" )
{
continue;
}
<JavaSourceJar
Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-sources.jar"
Condition="Exists('..\..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-sources.jar')"
Condition="Exists('..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-sources.jar')"
/>
<JavaDocJar
Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-javadoc.jar"
Condition="Exists('..\..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-javadoc.jar')"
Condition="Exists('..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-javadoc.jar')"
/>
}
</ItemGroup>
Expand Down
5 changes: 5 additions & 0 deletions source/androidx.appcompat/appcompat/Transforms/Metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,4 +223,9 @@
<attr path="/api/package[@name='androidx.appcompat.graphics.drawable']/class[@name='AnimatedStateListDrawableCompat']/method[@name='getChangingConfigurations' and count(parameter)=0]" name="managedReturn">Android.Content.PM.ConfigChanges</attr>
<attr path="/api/package[@name='androidx.appcompat.widget']/class[@name='ActivityChooserModel.ActivityResolveInfo']/method[@name='compareTo' and count(parameter)=1 and parameter[1][@type='androidx.appcompat.widget.ActivityChooserModel.ActivityResolveInfo']]/parameter[1]" name="managedType">Java.Lang.Object</attr>


<remove-node
path="/api/package[@name='androidx.appcompat.widget']/class[@name='ActionBarContextView']/method[@name='setVisibility' and count(parameter)=1 and parameter[1][@type='int']]"
/>

</metadata>