From 272419693414962aec1a1f59739d73f41a077ff1 Mon Sep 17 00:00:00 2001 From: Fabien Drault Date: Tue, 20 Aug 2024 17:40:52 +0200 Subject: [PATCH 1/2] fix(namespace): Namespace required in module level for AGP>=8 --- android/build.gradle | 24 ++++++++++++++++++++++++ android/src/main/AndroidManifestNew.xml | 15 +++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 android/src/main/AndroidManifestNew.xml diff --git a/android/build.gradle b/android/build.gradle index fb515a6..55f0b45 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,3 +1,5 @@ +import com.android.Version + def DEFAULT_COMPILE_SDK_VERSION = 30 def DEFAULT_BUILD_TOOLS_VERSION = '30.0.2' def DEFAULT_MIN_SDK_VERSION = 16 @@ -30,7 +32,29 @@ if (isNewArchitectureEnabled()) { apply plugin: 'com.facebook.react' } +// https://github.com/react-native-community/discussions-and-proposals/issues/671 +// https://developer.android.com/build/releases/past-releases/agp-8-0-0-release-notes#namespace-dsl +// Namespace is required in module-level when AGP version >=7.3 +def supportsNamespace() { + def parsed = Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.') + def major = parsed[0].toInteger() + def minor = parsed[1].toInteger() + + // Namespace support was added in 7.3.0 + return (major == 7 && minor >= 3) || major >= 8 +} + android { + if (supportsNamespace()) { + namespace "com.betomorrow.rnfilelogger" + + sourceSets { + main { + manifest.srcFile "src/main/AndroidManifestNew.xml" + } + } + } + compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION) buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION) defaultConfig { diff --git a/android/src/main/AndroidManifestNew.xml b/android/src/main/AndroidManifestNew.xml new file mode 100644 index 0000000..21c0bd7 --- /dev/null +++ b/android/src/main/AndroidManifestNew.xml @@ -0,0 +1,15 @@ + + + + + + + + + From 674bf7833e76d007573e95ad7a54a679b4ad636d Mon Sep 17 00:00:00 2001 From: Fabien Drault Date: Thu, 22 Aug 2024 11:47:37 +0200 Subject: [PATCH 2/2] chore: Update package.lock --- example/package-lock.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/example/package-lock.json b/example/package-lock.json index 3fb9c0c..347a5c9 100644 --- a/example/package-lock.json +++ b/example/package-lock.json @@ -34,13 +34,15 @@ } }, "..": { - "version": "0.5.5", + "version": "0.5.6", "license": "MIT", "devDependencies": { "@babel/preset-env": "^7.19.0", + "@release-it/conventional-changelog": "^8.0.1", "prettier": "^2.7.1", "react": "^18.2.0", "react-native": "0.71.1", + "release-it": "^17.6.0", "rimraf": "^3.0.2", "typescript": "^4.8.2" },