From c09f788a3e5ffa942c86b3b1c2d1fa44e95cf018 Mon Sep 17 00:00:00 2001 From: Mathieu Acthernoene Date: Sun, 7 Jan 2024 19:31:31 +0100 Subject: [PATCH] Fix AndroidManifest.xml namespace deprecation warning --- .eslintignore | 4 - .eslintrc.js | 2 + .gitattributes | 3 +- .github/workflows/verify.yml | 21 + .gitignore | 21 +- .hooks/pre-commit | 4 - android/build.gradle | 6 + android/src/main/AndroidManifestNew.xml | 3 + .../src/main/res/anim/bootsplash_fade_out.xml | 1 - .../res/drawable-v23/compat_splash_screen.xml | 1 - .../compat_splash_screen_oneui_4.xml | 1 - .../res/drawable/compat_splash_screen.xml | 1 - .../drawable/compat_splash_screen_oneui_4.xml | 1 - android/src/main/res/values-night/styles.xml | 1 - android/src/main/res/values-v23/styles.xml | 1 - android/src/main/res/values-v27/styles.xml | 1 - android/src/main/res/values-v29/styles.xml | 1 - android/src/main/res/values-v30/styles.xml | 1 - android/src/main/res/values-v31/styles.xml | 1 - android/src/main/res/values/attrs.xml | 1 - android/src/main/res/values/public.xml | 1 - android/src/main/res/values/styles.xml | 1 - example/ios/Podfile.lock | 2 +- example/package.json | 4 +- example/yarn.lock | 318 +++++---- package.json | 22 +- yarn.lock | 641 ++++++------------ 27 files changed, 397 insertions(+), 668 deletions(-) delete mode 100644 .eslintignore create mode 100644 .github/workflows/verify.yml delete mode 100755 .hooks/pre-commit create mode 100644 android/src/main/AndroidManifestNew.xml diff --git a/.eslintignore b/.eslintignore deleted file mode 100644 index 62d39e07..00000000 --- a/.eslintignore +++ /dev/null @@ -1,4 +0,0 @@ -example/ -dist/ -react-native.config.js -.eslintrc.js diff --git a/.eslintrc.js b/.eslintrc.js index 0f6bfed6..7254e63b 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,6 +1,8 @@ const path = require("path"); module.exports = { + root: true, + ignorePatterns: ["dist", "example", ".eslintrc.js", "react-native.config.js"], parser: "@typescript-eslint/parser", plugins: ["@typescript-eslint", "react-hooks"], diff --git a/.gitattributes b/.gitattributes index 45a3dcb2..2d3f3475 100644 --- 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/.github/workflows/verify.yml b/.github/workflows/verify.yml new file mode 100644 index 00000000..fbbbd612 --- /dev/null +++ b/.github/workflows/verify.yml @@ -0,0 +1,21 @@ +name: Verify + +on: + push: + branches: [main] + pull_request: + branches: [main] + +jobs: + prepack: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + + - uses: actions/setup-node@v3 + with: + node-version: lts/* + + - run: yarn install --frozen-lockfile + - run: yarn prepack diff --git a/.gitignore b/.gitignore index 99e9bd87..c4f0dee3 100644 --- a/.gitignore +++ b/.gitignore @@ -44,18 +44,6 @@ 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 @@ -63,14 +51,11 @@ yarn-error.log 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/ # CLI paid addon src/addon + +# Temporary files created by Metro to check the health of the file watcher +.metro-health-check* diff --git a/.hooks/pre-commit b/.hooks/pre-commit deleted file mode 100755 index e8d1439a..00000000 --- a/.hooks/pre-commit +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -# https://git-scm.com/docs/githooks - -yarn lint-staged diff --git a/android/build.gradle b/android/build.gradle index 90de8c3d..3c689423 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -27,9 +27,15 @@ android { if (project.android.hasProperty("namespace")) { namespace "com.zoontek.rnbootsplash" + buildFeatures { buildConfig true } + sourceSets { + main { + manifest.srcFile "src/main/AndroidManifestNew.xml" + } + } } defaultConfig { buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()) diff --git a/android/src/main/AndroidManifestNew.xml b/android/src/main/AndroidManifestNew.xml new file mode 100644 index 00000000..9a40236b --- /dev/null +++ b/android/src/main/AndroidManifestNew.xml @@ -0,0 +1,3 @@ + + + diff --git a/android/src/main/res/anim/bootsplash_fade_out.xml b/android/src/main/res/anim/bootsplash_fade_out.xml index 049a8e36..d1444581 100644 --- a/android/src/main/res/anim/bootsplash_fade_out.xml +++ b/android/src/main/res/anim/bootsplash_fade_out.xml @@ -1,5 +1,4 @@ - - diff --git a/android/src/main/res/drawable-v23/compat_splash_screen_oneui_4.xml b/android/src/main/res/drawable-v23/compat_splash_screen_oneui_4.xml index 8463898f..6300267e 100644 --- a/android/src/main/res/drawable-v23/compat_splash_screen_oneui_4.xml +++ b/android/src/main/res/drawable-v23/compat_splash_screen_oneui_4.xml @@ -1,5 +1,4 @@ - diff --git a/android/src/main/res/drawable/compat_splash_screen.xml b/android/src/main/res/drawable/compat_splash_screen.xml index 78231045..740b3fa3 100644 --- a/android/src/main/res/drawable/compat_splash_screen.xml +++ b/android/src/main/res/drawable/compat_splash_screen.xml @@ -1,5 +1,4 @@ - diff --git a/android/src/main/res/drawable/compat_splash_screen_oneui_4.xml b/android/src/main/res/drawable/compat_splash_screen_oneui_4.xml index 78231045..740b3fa3 100644 --- a/android/src/main/res/drawable/compat_splash_screen_oneui_4.xml +++ b/android/src/main/res/drawable/compat_splash_screen_oneui_4.xml @@ -1,5 +1,4 @@ - diff --git a/android/src/main/res/values-night/styles.xml b/android/src/main/res/values-night/styles.xml index 4fe33a82..d7f9e1cf 100644 --- a/android/src/main/res/values-night/styles.xml +++ b/android/src/main/res/values-night/styles.xml @@ -1,5 +1,4 @@ -