Skip to content

[Mono.Android] Use 'merge.SourceFile' to set 'ApiSince'. #4671

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
merged 2 commits into from
May 13, 2020
Merged

[Mono.Android] Use 'merge.SourceFile' to set 'ApiSince'. #4671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c932be
[Mono.Android] Use 'merge.SourceFile' to set 'ApiSince'.
jpobst May 11, 2020
868786a
[ApiCompat] Update reference assembly.
jpobst May 12, 2020
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 external/Java.Interop
Open in desktop
Submodule Java.Interop updated from 377c4c to 186174
1 change: 0 additions & 1 deletion src/Mono.Android/Mono.Android.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@
<_Fixup>--fixup=metadata</_Fixup>
<_Enums1>--preserve-enums --enumflags=enumflags --enumfields=map.csv --enummethods=methodmap.csv</_Enums1>
<_Enums2>--enummetadata=$(IntermediateOutputPath)mcw\enummetadata</_Enums2>
<_Versions>@(_ApiVersion->'--apiversions="%(Identity)"', ' ')</_Versions>
<_Annotations>--annotations="$(AndroidSdkDirectory)\platform-tools\api\annotations.zip"</_Annotations>
<_Assembly>--assembly="Mono.Android, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"</_Assembly>
<_TypeMap>--type-map-report=$(IntermediateOutputPath)mcw\type-mapping.txt</_TypeMap>
Expand Down
30 changes: 26 additions & 4 deletions src/Mono.Android/metadata
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1596,10 +1596,6 @@
<attr api-since="30" path="/api/package/interface[contains(@merge.SourceFile,'api-29.xml.in')]" name="unnest">true</attr>
<attr api-since="30" path="/api/package/class[contains(@merge.SourceFile,'api-29.xml.in')]" name="unnest">true</attr>

<!-- This keeps us from creating any Constants classes for interface constants in new DIM-enabled API -->
<attr api-since="30" path="/api/package/interface[contains(@merge.SourceFile,'api-30.xml.in')]" name="no-alternatives">true</attr>
<attr api-since="30" path="/api/package/interface[contains(@merge.SourceFile,'api-R.xml.in')]" name="no-alternatives">true</attr>

<!-- These members are not explicitly marked as deprecated in Java code, but they are deprecated in Java docs.
They override explicitly deprecated members, which causes a warning in C#. -->
<attr api-since="15" path="/api/package[@name='android.location']/class[@name='SettingInjectorService']/method[@name='onStart' and count(parameter)=2 and parameter[1][@type='android.content.Intent'] and parameter[2][@type='int']]" name="deprecated">Implement onStartCommand(android.content.Intent, int, int) instead.</attr>
Expand Down Expand Up @@ -1628,4 +1624,30 @@
<attr api-since="9" path="/api/package[@name='java.sql']/class[@name='SQLException']/method[@name='iterator' and count(parameter)=0]" name="return-not-null">true</attr>
<attr path="/api/package[@name='android.database']/class[@name='CursorJoiner']/method[@name='iterator' and count(parameter)=0]" name="return-not-null">true</attr>
<attr api-since="24" path="/api/package[@name='android.icu.text']/class[@name='UnicodeSet']/method[@name='iterator' and count(parameter)=0]" name="return-not-null">true</attr>


<!--
***********************************************************************
THE FOLLOWING LINES MUST BE CREATED FOR ANY NEW PLATFORM THAT IS ADDED.

PLEASE ADD OTHER METADATA ABOVE THIS SECTION SO THAT WE WILL SEE
THIS WARNING WHEN WE ADD A NEW PLATFORM TO THIS FILE!
***********************************************************************
-->

<!-- This keeps us from creating any Constants classes for interface constants in new DIM-enabled API -->
<attr api-since="30" path="/api/package/interface[contains(@merge.SourceFile,'api-30.xml.in')]" name="no-alternatives">true</attr>
<attr api-since="30" path="/api/package/interface[contains(@merge.SourceFile,'api-R.xml.in')]" name="no-alternatives">true</attr>

<!-- Set ApiSince based on merge sourcefile. -->
<attr api-since="22" path="/api//*[contains(@merge.SourceFile,'api-22.xml.in')]" name="api-since">22</attr>
<attr api-since="23" path="/api//*[contains(@merge.SourceFile,'api-23.xml.in')]" name="api-since">23</attr>
<attr api-since="24" path="/api//*[contains(@merge.SourceFile,'api-24.xml.in')]" name="api-since">24</attr>
<attr api-since="25" path="/api//*[contains(@merge.SourceFile,'api-25.xml.in')]" name="api-since">25</attr>
<attr api-since="26" path="/api//*[contains(@merge.SourceFile,'api-26.xml.in')]" name="api-since">26</attr>
<attr api-since="27" path="/api//*[contains(@merge.SourceFile,'api-27.xml.in')]" name="api-since">27</attr>
<attr api-since="28" path="/api//*[contains(@merge.SourceFile,'api-28.xml.in')]" name="api-since">28</attr>
<attr api-since="29" path="/api//*[contains(@merge.SourceFile,'api-29.xml.in')]" name="api-since">29</attr>
<attr api-since="30" path="/api//*[contains(@merge.SourceFile,'api-30.xml.in')]" name="api-since">30</attr>
<attr api-since="30" path="/api//*[contains(@merge.SourceFile,'api-R.xml.in')]" name="api-since">30</attr>
</metadata>
42 changes: 1 addition & 41 deletions tests/api-compatibility/acceptable-breakages-v10.0.txt
View file
Open in desktop

Large diffs are not rendered by default.

42 changes: 2 additions & 40 deletions tests/api-compatibility/acceptable-breakages-v8.0.txt
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions tests/api-compatibility/acceptable-breakages-v9.0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,3 @@ TypesMustExist : Type 'Android.Telephony.CellIdentityCdma.InterfaceConsts' does
TypesMustExist : Type 'Android.Telephony.CellIdentityGsm.InterfaceConsts' does not exist in the implementation but it does exist in the contract.
TypesMustExist : Type 'Android.Telephony.CellIdentityLte.InterfaceConsts' does not exist in the implementation but it does exist in the contract.
TypesMustExist : Type 'Android.Telephony.CellIdentityWcdma.InterfaceConsts' does not exist in the implementation but it does exist in the contract.
CannotChangeAttribute : Attribute 'Android.Runtime.RegisterAttribute' on 'System.Int32 Android.Resource.Attribute.NavigationBarDividerColor' changed from '[RegisterAttribute("navigationBarDividerColor", ApiSince=27)]' in the contract to '[RegisterAttribute("navigationBarDividerColor", ApiSince=28)]' in the implementation.
CannotChangeAttribute : Attribute 'Android.Runtime.RegisterAttribute' on 'System.Int32 Android.Resource.Attribute.WindowLayoutInDisplayCutoutMode' changed from '[RegisterAttribute("windowLayoutInDisplayCutoutMode", ApiSince=27)]' in the contract to '[RegisterAttribute("windowLayoutInDisplayCutoutMode", ApiSince=28)]' in the implementation.
CannotChangeAttribute : Attribute 'Android.Runtime.RegisterAttribute' on 'System.Int32 Android.Resource.Attribute.WindowLightNavigationBar' changed from '[RegisterAttribute("windowLightNavigationBar", ApiSince=27)]' in the contract to '[RegisterAttribute("windowLightNavigationBar", ApiSince=28)]' in the implementation.
Loading