Merge pull request #15 from rn-bridge/newarch_support

Support New Architecture

Author: sriharshamadamanchi

Diff for: README.md

@@ -2,9 +2,9 @@
 
 # @rn-bridge/react-native-geofencing
 
-Native module to determine if a location is within defined geographical boundaries. Geofencing combines awareness of the user's current location with awareness of the user's proximity to locations that may be of interest. To mark a location of interest, you specify its latitude and longitude. To adjust the proximity for the location, you add a radius. The latitude, longitude, and radius define a geofence, creating a circular area, or fence, around the location of interest.
+React native module to determine if a location is within defined geographical boundaries. Geofencing combines awareness of the user's current location with awareness of the user's proximity to locations that may be of interest. To mark a location of interest, you specify its latitude and longitude. To adjust the proximity for the location, you add a radius. The latitude, longitude, and radius define a geofence, creating a circular area, or fence, around the location of interest.
 
-Fully compatible with TypeScript.
+Fully compatible with TypeScript & Turbomodules.
 
 ## Supported platforms
 

Diff for: android/build.gradle

@@ -52,11 +52,18 @@ static def supportsNamespace() {
 android {
     if (supportsNamespace()) {
         namespace "com.rnbridge.geofencing"
+    }
 
-        sourceSets {
-            main {
+    sourceSets {
+        main {
+            if (supportsNamespace()) {
                 manifest.srcFile "src/main/AndroidManifestNew.xml"
             }
+            if (isNewArchitectureEnabled()) {
+                java.srcDirs += ['src/newarch']
+            } else {
+                java.srcDirs += ['src/oldarch']
+            }
         }
     }
 
@@ -65,7 +72,7 @@ android {
     defaultConfig {
         minSdkVersion getExtOrIntegerDefault("minSdkVersion")
         targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
-
+        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
     }
 
     buildTypes {
@@ -77,6 +84,10 @@ android {
     lintOptions {
         disable "GradleCompatible"
     }
+
+    buildFeatures {
+        buildConfig true
+    }
 }
 
 repositories {

Diff for: android/gradle.properties

@@ -11,9 +11,9 @@
 # https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
 # org.gradle.parallel=true
 #Fri Aug 16 11:45:03 IST 2024
-ReactNativeGeofencing_compileSdkVersion=33
-ReactNativeGeofencing_kotlinVersion=1.9.24
-ReactNativeGeofencing_minSdkVersion=21
-ReactNativeGeofencing_ndkversion=26.1.10909125
-ReactNativeGeofencing_targetSdkVersion=33
+ReactNativeGeofencing_compileSdkVersion=35
+ReactNativeGeofencing_kotlinVersion=2.0.21
+ReactNativeGeofencing_minSdkVersion=24
+ReactNativeGeofencing_ndkversion=27.1.12297006
+ReactNativeGeofencing_targetSdkVersion=34
 android.useAndroidX=true

Diff for: android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

Diff for: android/src/main/java/com/rnbridge/geofencing/GeofencingPackage.kt

@@ -0,0 +1,41 @@
+package com.rnbridge.geofencing
+
+import com.facebook.react.BaseReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.model.ReactModuleInfo
+import com.facebook.react.module.model.ReactModuleInfoProvider
+import com.facebook.react.uimanager.ViewManager
+
+class RNGeofencingPackage : BaseReactPackage() {
+    override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
+        return listOf(RNGeofencingModule(reactContext))
+    }
+
+    override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
+        return emptyList()
+    }
+
+    override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
+        return when (name) {
+            "RNGeofencing" -> RNGeofencingModule(reactContext)
+            else -> null
+        }
+    }
+
+    override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
+        return ReactModuleInfoProvider {
+            val moduleInfos: MutableMap<String, ReactModuleInfo> = HashMap()
+            val isTurboModule: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+            moduleInfos["RNGeofencing"] = ReactModuleInfo(
+                "RNGeofencing",
+                "RNGeofencing",
+                false,
+                false,
+                false,
+                isTurboModule
+            )
+            moduleInfos
+        }
+    }
+}

Diff for: android/src/main/java/com/rnbridge/geofencing/RNGeofencingPackage.kt

@@ -0,0 +1,55 @@
+package com.rnbridge.geofencing
+
+import android.location.Location
+import com.facebook.react.bridge.Callback
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReadableMap
+
+class RNGeofencingModule(reactContext: ReactApplicationContext) :
+    NativeGeofencingSpec(reactContext) {
+
+    private val geofenceManager = GeofenceManager(reactApplicationContext)
+
+    override fun getName(): String {
+        return NAME
+    }
+
+    override fun getCurrentLocation(promise: Promise) {
+        geofenceManager.getCurrentLocation(promise)
+    }
+
+    override fun getRegisteredGeofences(promise: Promise) {
+        geofenceManager.getRegisteredGeofences(promise)
+    }
+
+    override fun addGeofence(params: ReadableMap, promise: Promise) {
+        val id = params.getString("id") as String
+        val latitude = params.getDouble("latitude")
+        val longitude = params.getDouble("longitude")
+        val radius = params.getDouble("radius")
+
+        val location = Location("").apply {
+            this.latitude = latitude
+            this.longitude = longitude
+        }
+
+        geofenceManager.addGeofence(id, location, radius.toFloat(), promise)
+    }
+
+    override fun removeGeofence(id: String, promise: Promise) {
+        geofenceManager.removeGeofence(id, promise)
+    }
+
+    override fun removeAllGeofence(promise: Promise) {
+        geofenceManager.removeAllGeofence(promise)
+    }
+
+    override fun requestLocation(params: ReadableMap, response: Callback) {}
+
+    override fun getLocationAuthorizationStatus(promise: Promise) {}
+
+    companion object {
+        const val NAME = "RNGeofencing"
+    }
+}

Diff for: android/src/newarch/com/rnbridge/geofencing/RNGeofencingModule.kt

@@ -7,7 +7,7 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableMap
 
-class GeofencingModule(reactContext: ReactApplicationContext) :
+class RNGeofencingModule(reactContext: ReactApplicationContext) :
     ReactContextBaseJavaModule(reactContext) {
 
     private val geofenceManager = GeofenceManager(reactApplicationContext)
@@ -52,6 +52,6 @@ class GeofencingModule(reactContext: ReactApplicationContext) :
     }
 
     companion object {
-        const val NAME = "Geofencing"
+        const val NAME = "RNGeofencing"
     }
 }

Diff for: android/src/main/java/com/rnbridge/geofencing/GeofencingModule.kt renamed to android/src/oldarch/com/rnbridge/geofencing/RNGeofencingModule.kt

@@ -6,3 +6,5 @@ ruby ">= 2.6.10"
 # Exclude problematic versions of cocoapods and activesupport that causes build failures.
 gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
 gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
+gem 'xcodeproj', '< 1.26.0'
+gem 'concurrent-ruby', '< 1.3.4'

Diff for: example/Gemfile

@@ -0,0 +1,118 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.7)
+      base64
+      nkf
+      rexml
+    activesupport (7.2.2.1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    algoliasearch (1.27.5)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
+    atomos (0.1.3)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
+    claide (1.1.0)
+    cocoapods (1.15.2)
+      addressable (~> 2.8)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.15.2)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 2.1, < 3.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.6.0, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
+      colored2 (~> 3.1)
+      escape (~> 0.0.4)
+      fourflusher (>= 2.3.0, < 3.0)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.8.0)
+      nap (~> 1.0)
+      ruby-macho (>= 2.3.0, < 3.0)
+      xcodeproj (>= 1.23.0, < 2.0)
+    cocoapods-core (1.15.2)
+      activesupport (>= 5.0, < 8)
+      addressable (~> 2.8)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
+      fuzzy_match (~> 2.0.4)
+      nap (~> 1.0)
+      netrc (~> 0.11)
+      public_suffix (~> 4.0)
+      typhoeus (~> 1.0)
+    cocoapods-deintegrate (1.0.5)
+    cocoapods-downloader (2.1)
+    cocoapods-plugins (1.0.0)
+      nap
+    cocoapods-search (1.0.1)
+    cocoapods-trunk (1.6.0)
+      nap (>= 0.8, < 2.0)
+      netrc (~> 0.11)
+    cocoapods-try (1.2.0)
+    colored2 (3.1.2)
+    concurrent-ruby (1.3.3)
+    connection_pool (2.5.0)
+    drb (2.2.1)
+    escape (0.0.4)
+    ethon (0.16.0)
+      ffi (>= 1.15.0)
+    ffi (1.17.1)
+    fourflusher (2.3.1)
+    fuzzy_match (2.0.4)
+    gh_inspector (1.1.3)
+    httpclient (2.8.3)
+    i18n (1.14.7)
+      concurrent-ruby (~> 1.0)
+    json (2.10.1)
+    logger (1.6.6)
+    minitest (5.25.4)
+    molinillo (0.8.0)
+    nanaimo (0.3.0)
+    nap (1.1.0)
+    netrc (0.11.0)
+    nkf (0.2.0)
+    public_suffix (4.0.7)
+    rexml (3.4.0)
+    ruby-macho (2.5.1)
+    securerandom (0.4.1)
+    typhoeus (1.4.1)
+      ethon (>= 0.9.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    xcodeproj (1.25.1)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.3.0)
+      rexml (>= 3.3.6, < 4.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (>= 6.1.7.5, != 7.1.0)
+  cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
+  concurrent-ruby (< 1.3.4)
+  xcodeproj (< 1.26.0)
+
+RUBY VERSION
+   ruby 3.2.2p53
+
+BUNDLED WITH
+   2.6.3

Diff for: example/Gemfile.lock

@@ -9,6 +9,7 @@ import com.facebook.react.ReactPackage
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
 import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
 import com.facebook.react.defaults.DefaultReactNativeHost
+import com.facebook.react.soloader.OpenSourceMergedSoMapping
 import com.facebook.soloader.SoLoader
 
 class MainApplication : Application(), ReactApplication {
@@ -34,7 +35,7 @@ class MainApplication : Application(), ReactApplication {
 
   override fun onCreate() {
     super.onCreate()
-    SoLoader.init(this, false)
+    SoLoader.init(this, OpenSourceMergedSoMapping)
     if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
       // If you opted-in for the New Architecture, we load the native entry point for this app.
       load()

Diff for: example/android/app/src/main/java/rnbridge/reactnativegeofencing/example/MainApplication.kt

@@ -1,11 +1,11 @@
 buildscript {
     ext {
-        buildToolsVersion = "34.0.0"
-        minSdkVersion = 23
-        compileSdkVersion = 34
+        buildToolsVersion = "35.0.0"
+        minSdkVersion = 24
+        compileSdkVersion = 35
         targetSdkVersion = 34
-        ndkVersion = "26.1.10909125"
-        kotlinVersion = "1.9.24"
+        ndkVersion = "27.1.12297006"
+        kotlinVersion = "2.0.21"
     }
     repositories {
         google()

Diff for: example/android/build.gradle

@@ -32,7 +32,7 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
 # your application. You should enable this flag either if you want
 # to write custom TurboModules/Fabric components OR use libraries that
 # are providing them.
-newArchEnabled=false
+newArchEnabled=true
 
 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.

Diff for: example/android/gradle.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME