Skip to content

Commit

Permalink
[android] Get rid of deprecated package XML attribute
Browse files Browse the repository at this point in the history
Summary:
We use the namespace everywhere now.

Test Plan:
See if this also works with Buck by importing.

Tags:
  • Loading branch information
passy committed May 22, 2023
1 parent 445b5f1 commit 9b015bf
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 22 deletions.
3 changes: 1 addition & 2 deletions android/no-op/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
~ file in the root directory of this source tree.
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.facebook.flipper">
<manifest>
</manifest>
3 changes: 1 addition & 2 deletions android/plugins/leakcanary/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
~ file in the root directory of this source tree.
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.facebook.flipper.plugins.leakcanary">
<manifest>
</manifest>
3 changes: 1 addition & 2 deletions android/plugins/leakcanary2/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
~ file in the root directory of this source tree.
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.facebook.flipper.plugins.leakcanary2">
<manifest>
</manifest>
3 changes: 1 addition & 2 deletions android/plugins/litho/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
~ file in the root directory of this source tree.
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.facebook.flipper.plugins.litho">
<manifest>
</manifest>
3 changes: 1 addition & 2 deletions android/plugins/network/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
~ file in the root directory of this source tree.
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.facebook.flipper.plugins.network">
<manifest>
</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
~ file in the root directory of this source tree.
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.facebook.flipper.plugins.retrofit2protobuf">
<manifest>
</manifest>
5 changes: 1 addition & 4 deletions android/sample/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.facebook.flipper.sample">
xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.INTERNET" />
<uses-sdk android:minSdkVersion="15"
android:targetSdkVersion="31"/>

<application
android:name=".FlipperSampleApplication"
Expand Down
2 changes: 1 addition & 1 deletion android/sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ android {
buildToolsVersion rootProject.buildToolsVersion
ndkVersion rootProject.ndkVersion
defaultConfig {
minSdkVersion 21
minSdkVersion 23
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
applicationId 'com.facebook.flipper.sample'
targetSdkVersion rootProject.targetSdkVersion
Expand Down
2 changes: 1 addition & 1 deletion android/third-party/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
~ file in the root directory of this source tree.
-->

<manifest package="com.facebook.flipper.thirdparty">
<manifest>
</manifest>
3 changes: 1 addition & 2 deletions android/tutorial/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
~ file in the root directory of this source tree.
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.facebook.flipper.sample.tutorial">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
Expand Down
3 changes: 1 addition & 2 deletions xplat/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
~ file in the root directory of this source tree.
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.facebook.xplat.sonar">
<manifest>
</manifest>

0 comments on commit 9b015bf

Please sign in to comment.