Improve new architecture code (#850)

Author: zoontek

RNPermissions.podspec

@@ -16,6 +16,7 @@ Pod::Spec.new do |s|
 
   s.source       = { :git => package["repository"]["url"], :tag => s.version }
   s.source_files = "ios/*.{h,mm}"
+  # s.frameworks = <frameworks>
 
   if ENV['RCT_NEW_ARCH_ENABLED'] == "1" then
     install_modules_dependencies(s)

android/build.gradle

@@ -1,75 +1,29 @@
-def safeExtGet(prop, fallback) {
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-}
-
 buildscript {
-    // The Android Gradle plugin is only required when opening the android folder stand-alone.
-    // This avoids unnecessary downloads and potential conflicts when the library is included as a
-    // module dependency in an application project.
-    if (project == rootProject) {
-        repositories {
-            google()
-            mavenCentral()
-        }
-        dependencies {
-            classpath("com.android.tools.build:gradle:4.2.2")
-        }
+    ext.safeExtGet = {prop, fallback ->
+        rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
     }
-}
-
-apply plugin: "com.android.library"
-
-def resolveReactNativeDirectory() {
-    // monorepo workaround (react-native can be hoisted or in project's own node_modules)
-    def reactNativeFromProjectNodeModules = file("${rootProject.projectDir}/../node_modules/react-native")
-    if (reactNativeFromProjectNodeModules.exists()) {
-        return reactNativeFromProjectNodeModules
+    repositories {
+        google()
+        gradlePluginPortal()
     }
-
-    def reactNativeFromNodeModulesWithLibrary = file("${projectDir}/../../react-native")
-    if (reactNativeFromNodeModulesWithLibrary.exists()) {
-        return reactNativeFromNodeModulesWithLibrary
+    dependencies {
+        classpath("com.android.tools.build:gradle:7.3.1")
     }
-
-    throw new Exception(
-        "[react-native-permissions] Unable to resolve react-native location in " +
-            "node_modules. You should add project extension property (in app/build.gradle) " +
-            "`REACT_NATIVE_NODE_MODULES_DIR` with path to react-native."
-    )
 }
 
-def REACT_NATIVE_DIR = resolveReactNativeDirectory()
-
-def reactProperties = new Properties()
-file("$REACT_NATIVE_DIR/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
-
-def REACT_NATIVE_VERSION = reactProperties.getProperty("VERSION_NAME")
-def REACT_NATIVE_MINOR_VERSION = REACT_NATIVE_VERSION.startsWith("0.0.0-") ? 1000 : REACT_NATIVE_VERSION.split("\\.")[1].toInteger()
-
 def isNewArchitectureEnabled() {
-    // To opt-in for the New Architecture, you can either:
-    // - Set `newArchEnabled` to true inside the `gradle.properties` file
-    // - Invoke gradle with `-newArchEnabled=true`
-    // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
     return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
 }
 
+apply plugin: "com.android.library"
+
 if (isNewArchitectureEnabled()) {
     apply plugin: "com.facebook.react"
 }
 
 android {
-    // Used to override the NDK path/version on internal CI or by allowing
-    // users to customize the NDK path/version from their root project (e.g. for M1 support)
-    if (rootProject.hasProperty("ndkPath")) {
-        ndkPath rootProject.ext.ndkPath
-    }
-    if (rootProject.hasProperty("ndkVersion")) {
-        ndkVersion rootProject.ext.ndkVersion
-    }
-
-    compileSdkVersion safeExtGet("compileSdkVersion", 33)
     buildToolsVersion safeExtGet("buildToolsVersion", "33.0.0")
+    compileSdkVersion safeExtGet("compileSdkVersion", 33)
 
     if (project.android.hasProperty("namespace")) {
         namespace "com.zoontek.rnpermissions"
@@ -84,40 +38,34 @@ android {
         }
     }
     defaultConfig {
+        buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString())
         minSdkVersion safeExtGet("minSdkVersion", 21)
         targetSdkVersion safeExtGet("targetSdkVersion", 33)
     }
     lintOptions {
         abortOnError false
     }
-    sourceSets.main {
-        java {
-            if (!isNewArchitectureEnabled()) {
-                srcDirs += 'src/paper/java'
+    sourceSets {
+        main {
+            if (isNewArchitectureEnabled()) {
+                java.srcDirs += ["src/newarch"]
+            } else {
+                java.srcDirs += ["src/oldarch"]
             }
         }
     }
 }
 
 repositories {
-    mavenLocal()
-    mavenCentral()
     maven {
         // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-        url "$rootDir/../node_modules/react-native/android"
-    }
-    maven {
-        // Android JSC is installed from npm
-        url "$rootDir/../node_modules/jsc-android/dist"
+        url("$rootDir/../node_modules/react-native/android")
     }
+    mavenCentral()
     google()
 }
 
 dependencies {
-    if (isNewArchitectureEnabled() && REACT_NATIVE_MINOR_VERSION < 71) {
-        implementation project(":ReactAndroid")
-    } else {
-        //noinspection GradleDynamicVersion
-        implementation 'com.facebook.react:react-native:+'
-    }
+    //noinspection GradleDynamicVersion
+    implementation "com.facebook.react:react-native:+" // From node_modules
 }