Fix AndroidManifest.xml namespace deprecation warning

zoontek · Jan 7, 2024 · e6227be · e6227be
1 parent ff3865f
commit e6227be
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 36 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,2 @@
-# Windows files should use crlf line endings
-# https://help.github.com/articles/dealing-with-line-endings/
 *.bat text eol=crlf
+*.pbxproj -text
diff --git a/.gitignore b/.gitignore
@@ -44,37 +44,15 @@ node_modules/
 npm-debug.log
 yarn-error.log
 
-# fastlane
-#
-# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
-# screenshots whenever they are needed.
-# For more information about the recommended setup visit:
-# https://docs.fastlane.tools/best-practices/source-control/
-
-**/fastlane/report.xml
-**/fastlane/Preview.html
-**/fastlane/screenshots
-**/fastlane/test_output
-
 # Bundle artifact
 *.jsbundle
 
 # Ruby / CocoaPods
 example/ios/Pods/
 example/vendor/bundle/
 
-# Temporary files created by Metro to check the health of the file watcher
-.metro-health-check*
-
-# testing
-/coverage
-
 # Bob
 dist/
 
-# OCaml / Reason
-**/.merlin
-**/lib/bs
-**/lib/ocaml
-*.bs.js
-.bsb.lock
+# Temporary files created by Metro to check the health of the file watcher
+.metro-health-check*
diff --git a/android/build.gradle b/android/build.gradle
@@ -27,6 +27,12 @@ android {
 
     if (project.android.hasProperty("namespace")) {
         namespace "com.zoontek.rnbars"
+
+        sourceSets {
+            main {
+                manifest.srcFile "src/main/AndroidManifestNew.xml"
+            }
+        }
     }
     defaultConfig {
         buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString())
@@ -59,5 +65,4 @@ repositories {
 dependencies {
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+" // From node_modules
-    implementation "androidx.core:core:${safeExtGet("androidXCoreVersion", "1.9.0")}"
 }
diff --git a/android/src/main/AndroidManifestNew.xml b/android/src/main/AndroidManifestNew.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+</manifest>
diff --git a/android/src/main/res/values-night/styles.xml b/android/src/main/res/values-night/styles.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <resources>
     <style name="Theme.EdgeToEdge.DayNight" parent="Theme.EdgeToEdge.Common">
         <item name="darkContentBarsStyle">false</item>

diff --git a/android/src/main/res/values-v23/styles.xml b/android/src/main/res/values-v23/styles.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <resources>
     <style name="Theme.EdgeToEdge" parent="Theme.EdgeToEdge.DayNight">
         <item name="android:windowTranslucentNavigation">true</item>

diff --git a/android/src/main/res/values-v27/styles.xml b/android/src/main/res/values-v27/styles.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <resources>
     <style name="Theme.EdgeToEdge" parent="Theme.EdgeToEdge.DayNight">
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>

diff --git a/android/src/main/res/values-v29/styles.xml b/android/src/main/res/values-v29/styles.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <resources>
     <style name="Theme.EdgeToEdge" parent="Theme.EdgeToEdge.DayNight">
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>

diff --git a/android/src/main/res/values-v30/styles.xml b/android/src/main/res/values-v30/styles.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <resources>
     <style name="Theme.EdgeToEdge" parent="Theme.EdgeToEdge.DayNight">
         <item name="android:windowLayoutInDisplayCutoutMode">always</item>

diff --git a/android/src/main/res/values/attrs.xml b/android/src/main/res/values/attrs.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <resources>
     <attr name="darkContentBarsStyle" format="boolean" />
 </resources>
diff --git a/android/src/main/res/values/public.xml b/android/src/main/res/values/public.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <resources>
     <public name="Theme.EdgeToEdge" type="style" />
     <public name="darkContentBarsStyle" type="attr" />

diff --git a/android/src/main/res/values/styles.xml b/android/src/main/res/values/styles.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <resources>
     <style name="Theme.EdgeToEdge.Common" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="android:fitsSystemWindows">false</item>

diff --git a/package.json b/package.json
@@ -46,7 +46,6 @@
     ]
   },
   "prettier": {
-    "trailingComma": "all",
     "plugins": [
       "prettier-plugin-organize-imports"
     ]