Skip to content

Commit 5e8d05a

Browse files
committed
[Mono.Android] Use 'merge.SourceFile' to set 'ApiSince'.
1 parent a017561 commit 5e8d05a

File tree

3 files changed

+27
-6
lines changed

3 files changed

+27
-6
lines changed

external/Java.Interop

src/Mono.Android/Mono.Android.targets

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@
108108
<_Fixup>--fixup=metadata</_Fixup>
109109
<_Enums1>--preserve-enums --enumflags=enumflags --enumfields=map.csv --enummethods=methodmap.csv</_Enums1>
110110
<_Enums2>--enummetadata=$(IntermediateOutputPath)mcw\enummetadata</_Enums2>
111-
<_Versions>@(_ApiVersion->'--apiversions="%(Identity)"', ' ')</_Versions>
112111
<_Annotations>--annotations="$(AndroidSdkDirectory)\platform-tools\api\annotations.zip"</_Annotations>
113112
<_Assembly>--assembly="Mono.Android, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"</_Assembly>
114113
<_TypeMap>--type-map-report=$(IntermediateOutputPath)mcw\type-mapping.txt</_TypeMap>

src/Mono.Android/metadata

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1596,10 +1596,6 @@
15961596
<attr api-since="30" path="/api/package/interface[contains(@merge.SourceFile,'api-29.xml.in')]" name="unnest">true</attr>
15971597
<attr api-since="30" path="/api/package/class[contains(@merge.SourceFile,'api-29.xml.in')]" name="unnest">true</attr>
15981598

1599-
<!-- This keeps us from creating any Constants classes for interface constants in new DIM-enabled API -->
1600-
<attr api-since="30" path="/api/package/interface[contains(@merge.SourceFile,'api-30.xml.in')]" name="no-alternatives">true</attr>
1601-
<attr api-since="30" path="/api/package/interface[contains(@merge.SourceFile,'api-R.xml.in')]" name="no-alternatives">true</attr>
1602-
16031599
<!-- These members are not explicitly marked as deprecated in Java code, but they are deprecated in Java docs.
16041600
They override explicitly deprecated members, which causes a warning in C#. -->
16051601
<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>
@@ -1628,4 +1624,30 @@
16281624
<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>
16291625
<attr path="/api/package[@name='android.database']/class[@name='CursorJoiner']/method[@name='iterator' and count(parameter)=0]" name="return-not-null">true</attr>
16301626
<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>
1627+
1628+
1629+
<!--
1630+
***********************************************************************
1631+
THE FOLLOWING LINES MUST BE CREATED FOR ANY NEW PLATFORM THAT IS ADDED.
1632+
1633+
PLEASE ADD OTHER METADATA ABOVE THIS SECTION SO THAT WE WILL SEE
1634+
THIS WARNING WHEN WE ADD A NEW PLATFORM TO THIS FILE!
1635+
***********************************************************************
1636+
-->
1637+
1638+
<!-- This keeps us from creating any Constants classes for interface constants in new DIM-enabled API -->
1639+
<attr api-since="30" path="/api/package/interface[contains(@merge.SourceFile,'api-30.xml.in')]" name="no-alternatives">true</attr>
1640+
<attr api-since="30" path="/api/package/interface[contains(@merge.SourceFile,'api-R.xml.in')]" name="no-alternatives">true</attr>
1641+
1642+
<!-- Set ApiSince based on merge sourcefile. -->
1643+
<attr api-since="22" path="/api/package//*[contains(@merge.SourceFile,'api-22.xml.in')]" name="api-since">22</attr>
1644+
<attr api-since="23" path="/api/package//*[contains(@merge.SourceFile,'api-23.xml.in')]" name="api-since">23</attr>
1645+
<attr api-since="24" path="/api/package//*[contains(@merge.SourceFile,'api-24.xml.in')]" name="api-since">24</attr>
1646+
<attr api-since="25" path="/api/package//*[contains(@merge.SourceFile,'api-25.xml.in')]" name="api-since">25</attr>
1647+
<attr api-since="26" path="/api/package//*[contains(@merge.SourceFile,'api-26.xml.in')]" name="api-since">26</attr>
1648+
<attr api-since="27" path="/api/package//*[contains(@merge.SourceFile,'api-27.xml.in')]" name="api-since">27</attr>
1649+
<attr api-since="28" path="/api/package//*[contains(@merge.SourceFile,'api-28.xml.in')]" name="api-since">28</attr>
1650+
<attr api-since="29" path="/api/package//*[contains(@merge.SourceFile,'api-29.xml.in')]" name="api-since">29</attr>
1651+
<attr api-since="30" path="/api/package//*[contains(@merge.SourceFile,'api-30.xml.in')]" name="api-since">30</attr>
1652+
<attr api-since="30" path="/api/package//*[contains(@merge.SourceFile,'api-R.xml.in')]" name="api-since">30</attr>
16311653
</metadata>

0 commit comments

Comments
 (0)