new meridian maps

Author: arys

react-native-meridian-maps/MeridianMaps.podspec

@@ -10,15 +10,15 @@ Pod::Spec.new do |s|
   s.homepage                 = package["homepage"]
   s.license                  = package["license"]
   s.author                   = package["author"]
-  s.ios.vendored_frameworks  = "ios/Meridian.xcframework"
+  # Use CocoaPods Meridian SDK instead of a vendored XCFramework
+  s.dependency               'MeridianSDK'
 
   s.platform                 = :ios, "15.1"
 
   s.source                   = { :git => "https://github.com/gitamego/react-native-meridian-maps.git", :tag => "#{s.version}" }
 
-  s.source_files              = "ios/**/*.{h,m,mm,cpp}"
+  s.source_files              = "ios/**/*.{h,m,mm,cpp,swift}"
   s.private_header_files      = "ios/**/*.h"
-  s.header_mappings_dir       = "ios/Meridian.xcframework/ios-arm64/Meridian.framework/Headers"
   s.swift_version             = "5.0"
 
  install_modules_dependencies(s)

react-native-meridian-maps/android/build.gradle

@@ -39,6 +39,8 @@ android {
     main {
       java {
         exclude '**/com/meridiansamples/**'
+        exclude '**/com/meridianmaps/old/**'
+        exclude '**/old/**'
       }
     }
   }
@@ -85,23 +87,17 @@ def kotlin_version = getExtOrDefault("kotlinVersion")
 dependencies {
   implementation "com.facebook.react:react-android"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  // implementation(name: 'meridian-11.1.0', ext: 'aar')
   implementation(files("$projectDir/libs/meridian-11.2.0.aar"))
 
-   // Meridian SDK and its dependencies - specify the file path to the AAR file
-    implementation 'com.android.volley:volley:1.2.1'
-    implementation 'com.squareup:otto:1.3.8'
-    implementation 'org.conscrypt:conscrypt-android:2.5.2'
-    implementation 'com.google.android.material:material:1.9.0'
-    implementation 'com.lemmingapex.trilateration:trilateration:1.0.2'
-    implementation 'androidx.preference:preference:1.2.1'
-
-    // Required for GPS on Android devices
-    implementation 'com.google.android.gms:play-services-location:21.0.1'
-
-    // Required for MapFragment UI elements
-    implementation 'org.greenrobot:eventbus:3.3.1'
-    implementation 'ch.acra:acra-mail:5.11.3'
+  implementation 'com.android.volley:volley:1.2.1'
+  implementation 'com.squareup:otto:1.3.8'
+  implementation 'org.conscrypt:conscrypt-android:2.5.2'
+  implementation 'com.google.android.material:material:1.9.0'
+  implementation 'com.lemmingapex.trilateration:trilateration:1.0.2'
+  implementation 'androidx.preference:preference:1.2.1'
+  implementation 'com.google.android.gms:play-services-location:21.0.1'
+  implementation 'org.greenrobot:eventbus:3.3.1'
+  implementation 'ch.acra:acra-mail:5.11.3'
 }
 
 react {

react-native-meridian-maps/android/src/main/AndroidManifest.xml

@@ -30,44 +30,6 @@
 
 
 
-    <application>
-
-        <!-- We don't set android:name here to avoid conflicts with the host app -->
-
-
-
-        <activity
-
-            android:name=".MeridianMapActivity"
-
-            android:exported="false"
-
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
-            <!-- Required for search when using MapSheetFragment -->
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
-
-            <!-- Required for search when using MapSheetFragment -->
-            <meta-data
-                android:name="android.app.searchable"
-                android:resource="@xml/searchable" />
-        </activity>
-
-
-
-        <activity
-
-            android:name=".MeridianMapTestActivity"
-
-            android:label="Meridian Test"
-
-            android:theme="@style/Theme.AppCompat.Light"
-
-            android:exported="false"/>
-
-
-
-    </application>
+    <application />
 
 </manifest>