Skip to content

Commit 0aaa542

Browse files
jpobstjpobst
authored
Use <AndroidNamespaceReplacement> instead of metadata to rename namespaces. (#555)
1 parent 35a66a2 commit 0aaa542

File tree

237 files changed

+202
-4448
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

237 files changed

+202
-4448
lines changed

‎Directory.Build.props‎

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,123 @@
4141
<AndroidXNuGetTargetFolders Include="buildTransitive\monoandroid12.0" />
4242
<AndroidXNuGetTargetFolders Include="buildTransitive\net6.0-android31.0" />
4343
</ItemGroup>
44+
45+
<ItemGroup>
46+
<!-- Company namespace changes -->
47+
<AndroidNamespaceReplacement Include='androidx.' Replacement='AndroidX' />
48+
<AndroidNamespaceReplacement Include='com.google.gson' Replacement='GoogleGson' />
49+
<AndroidNamespaceReplacement Include='com.google.crypto' Replacement='Xamarin.Google.Crypto' />
50+
<AndroidNamespaceReplacement Include='com.google.' Replacement='Google' />
51+
<AndroidNamespaceReplacement Include='kotlinx.coroutines.' Replacement='Xamarin.KotlinX.Coroutines' />
52+
<AndroidNamespaceReplacement Include='org.reactivestreams.' Replacement='ReactiveStreams' />
53+
<AndroidNamespaceReplacement Include='org.intellij' Replacement='IntelliJ' />
54+
<AndroidNamespaceReplacement Include='org.jetbrains' Replacement='JetBrains' />
55+
<AndroidNamespaceReplacement Include='org.chromium' Replacement='AndroidX.WebKit' />
56+
<AndroidNamespaceReplacement Include='com.xamarin' Replacement='Xamarin' />
57+
<AndroidNamespaceReplacement Include='io.reactivex.' Replacement='ReactiveX' />
58+
<AndroidNamespaceReplacement Include='kotlinx' Replacement='KotlinX' />
59+
<AndroidNamespaceReplacement Include='support_lib_boundary' Replacement='ChromiumLibBoundary' />
60+
61+
<!-- Remove some redundant words -->
62+
<AndroidNamespaceReplacement Include='androidx.dynamicanimation.animation' Replacement='AndroidX.DynamicAnimation' />
63+
64+
<!-- Preferred plural words -->
65+
<AndroidNamespaceReplacement Include='androidx.annotation' Replacement='AndroidX.Annotations' />
66+
<AndroidNamespaceReplacement Include='androidx.core.content.res' Replacement='AndroidX.Core.Content.Resources' />
67+
<AndroidNamespaceReplacement Include='androidx.transition' Replacement='AndroidX.Transitions' />
68+
<AndroidNamespaceReplacement Include='config' Replacement='Configs' />
69+
<AndroidNamespaceReplacement Include='executor' Replacement='Executors' />
70+
<AndroidNamespaceReplacement Include='profileinstaller' Replacement='ProfileInstallers' />
71+
72+
<!-- Un-capitalization of 2-letter abbreviations -->
73+
<AndroidNamespaceReplacement Include='tv' Replacement='Tv' />
74+
<AndroidNamespaceReplacement Include='db' Replacement='Db' />
75+
76+
<!-- Preferred capitalization for combined words -->
77+
<AndroidNamespaceReplacement Include='accessibilityservice' Replacement='AccessibilityService' />
78+
<AndroidNamespaceReplacement Include='appbar' Replacement='AppBar' />
79+
<AndroidNamespaceReplacement Include='appcompat' Replacement='AppCompat' />
80+
<AndroidNamespaceReplacement Include='asynclayoutinflater' Replacement='AsyncLayoutInflater' />
81+
<AndroidNamespaceReplacement Include='auto.value' Replacement='AutoValue' />
82+
<AndroidNamespaceReplacement Include='autofill' Replacement='AutoFill' />
83+
<AndroidNamespaceReplacement Include='baseadapters' Replacement='BaseAdapters' />
84+
<AndroidNamespaceReplacement Include='bottomappbar' Replacement='BottomAppBar' />
85+
<AndroidNamespaceReplacement Include='bottomnavigation' Replacement='BottomNavigation' />
86+
<AndroidNamespaceReplacement Include='bottomsheet' Replacement='BottomSheet' />
87+
<AndroidNamespaceReplacement Include='browseractions' Replacement='BrowserActions' />
88+
<AndroidNamespaceReplacement Include='cardview' Replacement='CardView' />
89+
<AndroidNamespaceReplacement Include='checkbox' Replacement='CheckBox' />
90+
<AndroidNamespaceReplacement Include='circularreveal' Replacement='CircularReveal' />
91+
<AndroidNamespaceReplacement Include='constraintlayout' Replacement='ConstraintLayout' />
92+
<AndroidNamespaceReplacement Include='contentpager' Replacement='ContentPager' />
93+
<AndroidNamespaceReplacement Include='contextaware' Replacement='ContextAware' />
94+
<AndroidNamespaceReplacement Include='coordinatorlayout' Replacement='CoordinatorLayout' />
95+
<AndroidNamespaceReplacement Include='cursoradapter' Replacement='CursorAdapter' />
96+
<AndroidNamespaceReplacement Include='customtabs' Replacement='CustomTabs' />
97+
<AndroidNamespaceReplacement Include='customview' Replacement='CustomView' />
98+
<AndroidNamespaceReplacement Include='daead' Replacement='DAead' />
99+
<AndroidNamespaceReplacement Include='databinding' Replacement='DataBinding' />
100+
<AndroidNamespaceReplacement Include='datepicker' Replacement='DatePicker' />
101+
<AndroidNamespaceReplacement Include='documentfile' Replacement='DocumentFile' />
102+
<AndroidNamespaceReplacement Include='drawerlayout' Replacement='DrawerLayout' />
103+
<AndroidNamespaceReplacement Include='dynamicanimation' Replacement='DynamicAnimation' />
104+
<AndroidNamespaceReplacement Include='exifinterface' Replacement='ExifInterface' />
105+
<AndroidNamespaceReplacement Include='exoplayer' Replacement='ExoPlayer' />
106+
<AndroidNamespaceReplacement Include='externalreferrer' Replacement='ExternalReferrer' />
107+
<AndroidNamespaceReplacement Include='flatbuffer' Replacement='FlatBuffer' />
108+
<AndroidNamespaceReplacement Include='floatingactionbutton' Replacement='FloatingActionButton' />
109+
<AndroidNamespaceReplacement Include='gridlayout' Replacement='GridLayout' />
110+
<AndroidNamespaceReplacement Include='imageview' Replacement='ImageView' />
111+
<AndroidNamespaceReplacement Include='immutablelist' Replacement='ImmutableList' />
112+
<AndroidNamespaceReplacement Include='immutablemap' Replacement='ImmutableMap' />
113+
<AndroidNamespaceReplacement Include='immutableset' Replacement='ImmutableSet' />
114+
<AndroidNamespaceReplacement Include='inputmethod' Replacement='InputMethod' />
115+
<AndroidNamespaceReplacement Include='installreferrer' Replacement='InstallReferrer' />
116+
<AndroidNamespaceReplacement Include='itemdecorators' Replacement='ItemDecorators' />
117+
<AndroidNamespaceReplacement Include='livedata' Replacement='LiveData' />
118+
<AndroidNamespaceReplacement Include='localbroadcastmanager' Replacement='LocalBroadcastManager' />
119+
<AndroidNamespaceReplacement Include='mediarouter' Replacement='MediaRouter' />
120+
<AndroidNamespaceReplacement Include='multicast' Replacement='MultiCast' />
121+
<AndroidNamespaceReplacement Include='multiprocess' Replacement='MultiProcess' />
122+
<AndroidNamespaceReplacement Include='navigationrail' Replacement='NavigationRail' />
123+
<AndroidNamespaceReplacement Include='nestedscroll' Replacement='NestedScroll' />
124+
<AndroidNamespaceReplacement Include='percentlayout' Replacement='PercentLayout' />
125+
<AndroidNamespaceReplacement Include='persistentorderedmap' Replacement='PersistentOrderedMap' />
126+
<AndroidNamespaceReplacement Include='persistentorderedset' Replacement='PersistentOrderedSet' />
127+
<AndroidNamespaceReplacement Include='progressindicator' Replacement='ProgressIndicator' />
128+
<AndroidNamespaceReplacement Include='radiobutton' Replacement='RadioButton' />
129+
<AndroidNamespaceReplacement Include='recyclerview' Replacement='RecyclerView' />
130+
<AndroidNamespaceReplacement Include='resourceinspection' Replacement='ResourceInspection' />
131+
<AndroidNamespaceReplacement Include='rxjava2' Replacement='RxJava2' />
132+
<AndroidNamespaceReplacement Include='rxjava3' Replacement='RxJava3' />
133+
<AndroidNamespaceReplacement Include='savedstate' Replacement='SavedState' />
134+
<AndroidNamespaceReplacement Include='signin' Replacement='SignIn' />
135+
<AndroidNamespaceReplacement Include='slidingpanelayout' Replacement='SlidingPaneLayout' />
136+
<AndroidNamespaceReplacement Include='splashscreen' Replacement='SplashScreen' />
137+
<AndroidNamespaceReplacement Include='streamingaead' Replacement='StreamingAead' />
138+
<AndroidNamespaceReplacement Include='strictmode' Replacement='StrictMode' />
139+
<AndroidNamespaceReplacement Include='swiperefreshlayout' Replacement='SwipeRefreshLayout' />
140+
<AndroidNamespaceReplacement Include='switchmaterial' Replacement='SwitchMaterial' />
141+
<AndroidNamespaceReplacement Include='systemalarm' Replacement='SystemAlarm' />
142+
<AndroidNamespaceReplacement Include='systemjob' Replacement='SystemJob' />
143+
<AndroidNamespaceReplacement Include='taskexecutor' Replacement='TaskExecutor' />
144+
<AndroidNamespaceReplacement Include='textfield' Replacement='TextField' />
145+
<AndroidNamespaceReplacement Include='textview' Replacement='TextView' />
146+
<AndroidNamespaceReplacement Include='timepicker' Replacement='TimePicker' />
147+
<AndroidNamespaceReplacement Include='toprettystring' Replacement='ToPrettyString' />
148+
<AndroidNamespaceReplacement Include='twotone' Replacement='TwoTone' />
149+
<AndroidNamespaceReplacement Include='tvprovider' Replacement='TvProvider' />
150+
<AndroidNamespaceReplacement Include='unusedapprestrictions' Replacement='UnusedAppRestrictions' />
151+
<AndroidNamespaceReplacement Include='uxrestrictions' Replacement='UXRestrictions' />
152+
<AndroidNamespaceReplacement Include='vectordrawable' Replacement='VectorDrawable' />
153+
<AndroidNamespaceReplacement Include='versionedparcelable' Replacement='VersionedParcelable' />
154+
<AndroidNamespaceReplacement Include='viewbinding' Replacement='ViewBinding' />
155+
<AndroidNamespaceReplacement Include='viewpager' Replacement='ViewPager' />
156+
<AndroidNamespaceReplacement Include='viewpager2' Replacement='ViewPager2' />
157+
<AndroidNamespaceReplacement Include='viewsintegration' Replacement='ViewsIntegration' />
158+
<AndroidNamespaceReplacement Include='wear-ongoing' Replacement='Ongoing' />
159+
<AndroidNamespaceReplacement Include='wear-phone-interactions' Replacement='PhoneInteractions' />
160+
<AndroidNamespaceReplacement Include='wear-remote-interactions' Replacement='RemoveInteractions' />
161+
<AndroidNamespaceReplacement Include='webkit' Replacement='WebKit' />
162+
</ItemGroup>
44163
</Project>

‎source/Xamarin.Jetbrains.Annotations/Transforms/Metadata.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,4 @@
88
<remove-node path="/api/package[@name='android.support.v4.content']/class[@name='CursorLoader']/method[@name='loadInBackground']" />
99
-->
1010

11-
<!-- fix namespaces -->
12-
<attr path="/api/package[@name='org.intellij.lang.annotations']" name="managedName">IntelliJ.Lang.Annotations</attr>
13-
<attr path="/api/package[@name='org.jetbrains.annotations']" name="managedName">JetBrains.Annotations</attr>
14-
1511
</metadata>

‎source/androidx.activity/activity-ktx/Transforms/Metadata.Namespaces.xml‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎source/androidx.activity/activity/Transforms/Metadata.Namespaces.xml‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎source/androidx.ads/ads-identifier-common/Transforms/Metadata.Namespaces.xml‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎source/androidx.ads/ads-identifier-provider/Transforms/Metadata.Namespaces.xml‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎source/androidx.ads/ads-identifier/Transforms/Metadata.Namespaces.xml‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎source/androidx.annotation/annotation-experimental/Transforms/Metadata.Namespaces.xml‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎source/androidx.annotation/annotation/Transforms/Metadata.Namespaces.xml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎source/androidx.appcompat/appcompat-resources/Transforms/Metadata.Namespaces.xml‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)