@maplibre/maplibre-react-native 10.0.0-beta.15 → 10.0.0-beta.17

package/README.md

@@ -27,7 +27,7 @@ diverged, it has become necessary to separate the projects into specific wrapper
 
 ## Documentation
 
-- [Getting Started](/docs/guides/setup/Getting-Started)
+- [Getting Started](/docs/guides/setup/Getting-Started.md)
 - Installation
   - [Expo](/docs/guides/setup/Expo.md)
   - [React Native](/docs/guides/setup/React-Native.md)
@@ -80,4 +80,4 @@ set up your local development environment.
 
 ## Community
 
-Join the `#maplibre-react-native` or `#maplibre` [Slack channels at OSMUS](https://slack.openstreetmap.us/).
+Join the `#maplibre-react-native` or `#maplibre` [on the Open Street Map Slack](https://slack.openstreetmap.us/).

package/android/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
   // Buildscript is evaluated before everything else so we can't use getExtOrDefault
-  def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["MapLibreReactNative_kotlinVersion"]
+  def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["org.maplibre.reactnative.kotlinVersion"]
 
   repositories {
     google()
@@ -32,11 +32,15 @@ apply plugin: "kotlin-android"
 // }
 
 def getExtOrDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["MapLibreReactNative_" + name]
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["org.maplibre.reactnative." + name]
+}
+
+def getConfigurableExtOrDefault(name) {
+    return rootProject.ext.has("org.maplibre.reactnative." + name) ? rootProject.ext.get("org.maplibre.reactnative." + name) : project.properties["org.maplibre.reactnative." + name]
 }
 
 def getExtOrIntegerDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["MapLibreReactNative_" + name]).toInteger()
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["org.maplibre.reactnative." + name]).toInteger()
 }
 
 def supportsNamespace() {
@@ -68,6 +72,20 @@ android {
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
   }
 
+  sourceSets {
+    main {
+      java.srcDirs = ['src/main/java']
+
+      if (getConfigurableExtOrDefault("locationEngine") == "default") {
+        java.srcDirs += 'src/main/location-engine-default'
+      } else if (getConfigurableExtOrDefault("locationEngine") == "google") {
+        java.srcDirs += 'src/main/location-engine-google'
+      } else {
+        throw new GradleException("org.maplibre.reactnative.locationEngine.locationEngine should be one of [\"default\", \"google\"]`. \"${getConfigurableExtOrDefault("locationEngine")}\" was provided.")
+      }
+    }
+  }
+
   buildTypes {
     release {
       minifyEnabled false
@@ -106,11 +124,16 @@ dependencies {
   implementation "androidx.vectordrawable:vectordrawable:1.1.0"
   implementation "androidx.annotation:annotation:1.7.0"
   implementation "androidx.appcompat:appcompat:1.6.1"
-  implementation "com.squareup.okhttp3:okhttp:${getExtOrDefault('okhttpVersion')}"
-  implementation "com.squareup.okhttp3:okhttp-urlconnection:${getExtOrDefault('okhttpVersion')}"
+  implementation "com.squareup.okhttp3:okhttp:${getConfigurableExtOrDefault('okhttpVersion')}"
+  implementation "com.squareup.okhttp3:okhttp-urlconnection:${getConfigurableExtOrDefault('okhttpVersion')}"
 
-  // MapLibre plugins
+  // MapLibre Plugins
   implementation ("org.maplibre.gl:android-plugin-localization-v9:3.0.1")
   implementation ("org.maplibre.gl:android-plugin-annotation-v9:3.0.1")
   implementation ("org.maplibre.gl:android-plugin-markerview-v9:3.0.1")
+
+  // Dependencies for Google Location Engine
+  if (getConfigurableExtOrDefault("locationEngine") == "google") {
+    implementation "com.google.android.gms:play-services-location:21.3.0"
+  }
 }

package/android/gradle.properties

@@ -1,7 +1,12 @@
-MapLibreReactNative_kotlinVersion=1.7.0
-MapLibreReactNative_minSdkVersion=21
-MapLibreReactNative_targetSdkVersion=31
-MapLibreReactNative_compileSdkVersion=31
-MapLibreReactNative_ndkversion=21.4.7075529
+org.maplibre.reactnative.kotlinVersion=1.7.0
+org.maplibre.reactnative.minSdkVersion=21
+org.maplibre.reactnative.targetSdkVersion=31
+org.maplibre.reactnative.compileSdkVersion=31
+org.maplibre.reactnative.ndkVersion=21.4.7075529
 
-MapLibreReactNative_okhttpVersion=4.9.0
+# MapLibre React Native Customizations
+
+org.maplibre.reactnative.okhttpVersion=4.9.0
+
+# Available values: default, google
+org.maplibre.reactnative.locationEngine=default

package/android/src/main/java/org/maplibre/reactnative/location/LocationManager.java

@@ -7,21 +7,14 @@ import android.util.Log;
 
 import org.maplibre.android.location.engine.LocationEngine;
 import org.maplibre.android.location.engine.LocationEngineCallback;
-
-/*
-import com.mapbox.android.core.location.LocationEngineListener;
-import com.mapbox.android.core.location.LocationEnginePriority;
-*/
-
-import org.maplibre.android.location.engine.LocationEngineDefault;
 import org.maplibre.android.location.engine.LocationEngineRequest;
 import org.maplibre.android.location.engine.LocationEngineResult;
 import org.maplibre.android.location.permissions.PermissionsManager;
+import org.maplibre.reactnative.location.engine.LocationEngineProvider;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
 @SuppressWarnings({"MissingPermission"})
 public class LocationManager implements LocationEngineCallback<LocationEngineResult> {
@@ -58,8 +51,10 @@ public class LocationManager implements LocationEngineCallback<LocationEngineRes
         this.buildEngineRequest();
 
     }
+
     private void buildEngineRequest() {
-        locationEngine = LocationEngineDefault.INSTANCE.getDefaultLocationEngine(this.context.getApplicationContext());
+        locationEngine = new LocationEngineProvider().getLocationEngine(context);
+
         locationEngineRequest = new LocationEngineRequest.Builder(DEFAULT_INTERVAL_MILLIS)
                 .setFastestInterval(DEFAULT_FASTEST_INTERVAL_MILLIS)
                 .setPriority(LocationEngineRequest.PRIORITY_HIGH_ACCURACY)
@@ -78,9 +73,11 @@ public class LocationManager implements LocationEngineCallback<LocationEngineRes
             listeners.remove(listener);
         }
     }
+
     public void setMinDisplacement(float minDisplacement) {
         mMinDisplacement = minDisplacement;
     }
+
     public void enable() {
         if (!PermissionsManager.areLocationPermissionsGranted(context)) {
             return;
@@ -134,8 +131,7 @@ public class LocationManager implements LocationEngineCallback<LocationEngineRes
 
         try {
             locationEngine.getLastLocation(callback);
-        }
-        catch(Exception exception) {
+        } catch (Exception exception) {
             Log.w(LOG_TAG, exception);
             callback.onFailure(exception);
         }

package/android/src/main/java/org/maplibre/reactnative/location/engine/DefaultLocationEngineProvider.java

@@ -0,0 +1,18 @@
+package org.maplibre.reactnative.location.engine;
+
+import android.content.Context;
+import android.util.Log;
+
+import org.maplibre.android.location.engine.LocationEngine;
+import org.maplibre.android.location.engine.LocationEngineDefault;
+
+public class DefaultLocationEngineProvider implements LocationEngineProvidable {
+    private static final String LOG_TAG = "DefaultLocationEngineProvider";
+
+    @Override
+    public LocationEngine getLocationEngine(Context context) {
+        LocationEngine locationEngine = LocationEngineDefault.INSTANCE.getDefaultLocationEngine(context.getApplicationContext());
+        Log.d(LOG_TAG, "DefaultLocationEngine will be used.");
+        return locationEngine;
+    }
+}

package/android/src/main/java/org/maplibre/reactnative/location/engine/LocationEngineProvidable.java

@@ -0,0 +1,9 @@
+package org.maplibre.reactnative.location.engine;
+
+import android.content.Context;
+
+import org.maplibre.android.location.engine.LocationEngine;
+
+public interface LocationEngineProvidable {
+    LocationEngine getLocationEngine(Context context);
+}

package/android/src/main/location-engine-default/org/maplibre/reactnative/location/engine/LocationEngineProvider.java

@@ -0,0 +1,12 @@
+package org.maplibre.reactnative.location.engine;
+
+import android.content.Context;
+
+import org.maplibre.android.location.engine.LocationEngine;
+
+public class LocationEngineProvider implements LocationEngineProvidable {
+    @Override
+    public LocationEngine getLocationEngine(Context context) {
+        return new DefaultLocationEngineProvider().getLocationEngine(context);
+    }
+}

package/android/src/main/location-engine-google/org/maplibre/reactnative/location/engine/GoogleLocationEngineImpl.java

@@ -0,0 +1,151 @@
+package org.maplibre.reactnative.location.engine;
+
+import android.annotation.SuppressLint;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.location.Location;
+import android.os.Looper;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+
+import com.google.android.gms.location.FusedLocationProviderClient;
+import com.google.android.gms.location.LocationCallback;
+import com.google.android.gms.location.LocationRequest;
+import com.google.android.gms.location.LocationResult;
+import com.google.android.gms.location.LocationServices;
+import com.google.android.gms.location.Priority;
+import com.google.android.gms.tasks.OnFailureListener;
+import com.google.android.gms.tasks.OnSuccessListener;
+
+import org.maplibre.android.location.engine.LocationEngineCallback;
+import org.maplibre.android.location.engine.LocationEngineImpl;
+import org.maplibre.android.location.engine.LocationEngineRequest;
+import org.maplibre.android.location.engine.LocationEngineResult;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Wraps implementation of Fused Location Provider
+ */
+public class GoogleLocationEngineImpl implements LocationEngineImpl<LocationCallback> {
+    private final FusedLocationProviderClient fusedLocationProviderClient;
+
+    @VisibleForTesting
+    GoogleLocationEngineImpl(FusedLocationProviderClient fusedLocationProviderClient) {
+        this.fusedLocationProviderClient = fusedLocationProviderClient;
+    }
+
+    public GoogleLocationEngineImpl(@NonNull Context context) {
+        this.fusedLocationProviderClient = LocationServices.getFusedLocationProviderClient(context);
+    }
+
+    @NonNull
+    @Override
+    public LocationCallback createListener(LocationEngineCallback<LocationEngineResult> callback) {
+        return new GoogleLocationEngineCallbackTransport(callback);
+    }
+
+    @SuppressLint("MissingPermission")
+    @Override
+    public void getLastLocation(@NonNull LocationEngineCallback<LocationEngineResult> callback)
+            throws SecurityException {
+        GoogleLastLocationEngineCallbackTransport transport =
+                new GoogleLastLocationEngineCallbackTransport(callback);
+        fusedLocationProviderClient.getLastLocation().addOnSuccessListener(transport).addOnFailureListener(transport);
+    }
+
+    @SuppressLint("MissingPermission")
+    @Override
+    public void requestLocationUpdates(@NonNull LocationEngineRequest request,
+                                       @NonNull LocationCallback listener,
+                                       @Nullable Looper looper) throws SecurityException {
+        fusedLocationProviderClient.requestLocationUpdates(toGMSLocationRequest(request), listener, looper);
+    }
+
+    @SuppressLint("MissingPermission")
+    @Override
+    public void requestLocationUpdates(@NonNull LocationEngineRequest request,
+                                       @NonNull PendingIntent pendingIntent) throws SecurityException {
+        fusedLocationProviderClient.requestLocationUpdates(toGMSLocationRequest(request), pendingIntent);
+    }
+
+    @Override
+    public void removeLocationUpdates(@NonNull LocationCallback listener) {
+        if (listener != null) {
+            fusedLocationProviderClient.removeLocationUpdates(listener);
+        }
+    }
+
+    @Override
+    public void removeLocationUpdates(PendingIntent pendingIntent) {
+        if (pendingIntent != null) {
+            fusedLocationProviderClient.removeLocationUpdates(pendingIntent);
+        }
+    }
+
+    private static LocationRequest toGMSLocationRequest(LocationEngineRequest request) {
+        LocationRequest.Builder builder = new LocationRequest.Builder(request.getInterval());
+        builder.setMinUpdateIntervalMillis(request.getFastestInterval());
+        builder.setMinUpdateDistanceMeters(request.getDisplacement());
+        builder.setMaxUpdateDelayMillis(request.getMaxWaitTime());
+        builder.setPriority(toGMSLocationPriority(request.getPriority()));
+        return builder.build();
+    }
+
+    private static int toGMSLocationPriority(int enginePriority) {
+        switch (enginePriority) {
+            case LocationEngineRequest.PRIORITY_HIGH_ACCURACY:
+                return Priority.PRIORITY_HIGH_ACCURACY;
+            case LocationEngineRequest.PRIORITY_BALANCED_POWER_ACCURACY:
+                return Priority.PRIORITY_BALANCED_POWER_ACCURACY;
+            case LocationEngineRequest.PRIORITY_LOW_POWER:
+                return Priority.PRIORITY_LOW_POWER;
+            case LocationEngineRequest.PRIORITY_NO_POWER:
+            default:
+                return Priority.PRIORITY_PASSIVE;
+        }
+    }
+
+    private static final class GoogleLocationEngineCallbackTransport extends LocationCallback {
+        private final LocationEngineCallback<LocationEngineResult> callback;
+
+        GoogleLocationEngineCallbackTransport(LocationEngineCallback<LocationEngineResult> callback) {
+            this.callback = callback;
+        }
+
+        @Override
+        public void onLocationResult(LocationResult locationResult) {
+            super.onLocationResult(locationResult);
+            List<Location> locations = locationResult.getLocations();
+            if (!locations.isEmpty()) {
+                callback.onSuccess(LocationEngineResult.create(locations));
+            } else {
+                callback.onFailure(new Exception("Unavailable location"));
+            }
+        }
+    }
+
+    @VisibleForTesting
+    static final class GoogleLastLocationEngineCallbackTransport
+            implements OnSuccessListener<Location>, OnFailureListener {
+        private final LocationEngineCallback<LocationEngineResult> callback;
+
+        GoogleLastLocationEngineCallbackTransport(LocationEngineCallback<LocationEngineResult> callback) {
+            this.callback = callback;
+        }
+
+        @Override
+        public void onSuccess(Location location) {
+            callback.onSuccess(location != null ? LocationEngineResult.create(location) :
+                    LocationEngineResult.create(Collections.<Location>emptyList()));
+        }
+
+        @Override
+        public void onFailure(@NonNull Exception e) {
+            callback.onFailure(e);
+        }
+    }
+}

package/android/src/main/location-engine-google/org/maplibre/reactnative/location/engine/GoogleLocationEngineProvider.java

@@ -0,0 +1,24 @@
+package org.maplibre.reactnative.location.engine;
+
+import android.content.Context;
+import android.util.Log;
+
+import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.GoogleApiAvailability;
+
+import org.maplibre.android.location.engine.LocationEngine;
+import org.maplibre.android.location.engine.LocationEngineProxy;
+
+public class GoogleLocationEngineProvider implements LocationEngineProvidable {
+    private static final String LOG_TAG = "GoogleLocationEngineProvider";
+
+    public LocationEngine getLocationEngine(Context context) {
+        if (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context) == ConnectionResult.SUCCESS) {
+            LocationEngine locationEngine = new LocationEngineProxy<>(new GoogleLocationEngineImpl(context.getApplicationContext()));
+            Log.d(LOG_TAG, "GoogleLocationEngine will be used.");
+            return locationEngine;
+        } else {
+            return new DefaultLocationEngineProvider().getLocationEngine(context);
+        }
+    }
+}

package/android/src/main/location-engine-google/org/maplibre/reactnative/location/engine/LocationEngineProvider.java

@@ -0,0 +1,12 @@
+package org.maplibre.reactnative.location.engine;
+
+import android.content.Context;
+
+import org.maplibre.android.location.engine.LocationEngine;
+
+public class LocationEngineProvider implements LocationEngineProvidable {
+    @Override
+    public LocationEngine getLocationEngine(Context context) {
+        return new GoogleLocationEngineProvider().getLocationEngine(context);
+    }
+}

package/lib/commonjs/plugin/ios.js

@@ -0,0 +1,97 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.applyPodfilePostInstall = applyPodfilePostInstall;
+exports.ios = void 0;
+var _configPlugins = require("@expo/config-plugins");
+var _generateCode = require("@expo/config-plugins/build/utils/generateCode");
+/**
+ * Only the post-install block is required, the post installer block is used for SPM (Swift Package Manager) which Expo
+ * doesn't currently support.
+ */
+function applyPodfilePostInstall(contents) {
+  const result = (0, _generateCode.mergeContents)({
+    tag: `@maplibre/maplibre-react-native-post_installer`,
+    src: contents,
+    newSrc: `    $MLRN.post_install(installer)`,
+    anchor: new RegExp(`post_install do \\|installer\\|`),
+    offset: 1,
+    comment: "#"
+  });
+  if (result.didMerge || result.didClear) {
+    return result.contents;
+  }
+  return contents;
+}
+const withPodfilePostInstall = config => {
+  return (0, _configPlugins.withPodfile)(config, c => {
+    c.modResults.contents = applyPodfilePostInstall(c.modResults.contents);
+    return c;
+  });
+};
+
+/**
+ * Exclude building for arm64 on simulator devices in the pbxproj project.
+ * Without this, production builds targeting simulators will fail.
+ */
+function setExcludedArchitectures(project) {
+  const configurations = project.pbxXCBuildConfigurationSection();
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  for (const {
+    name,
+    buildSettings
+  } of Object.values(configurations || {})) {
+    // Guessing that this is the best way to emulate Xcode.
+    // Using `project.addToBuildSettings` modifies too many targets.
+    if (name === "Release" && typeof buildSettings?.PRODUCT_NAME !== "undefined") {
+      buildSettings['"EXCLUDED_ARCHS[sdk=iphonesimulator*]"'] = '"arm64"';
+    }
+  }
+  return project;
+}
+const withoutSignatures = config => {
+  return (0, _configPlugins.withXcodeProject)(config, async c => {
+    c.modResults.addBuildPhase([], "PBXShellScriptBuildPhase", "Remove signature files (Xcode workaround)", null, {
+      shellPath: "/bin/sh",
+      shellScript: `
+          echo "Remove signature files (Xcode workaround)";
+          rm -rf "$CONFIGURATION_BUILD_DIR/MapLibre.xcframework-ios.signature";
+        `
+    });
+    return c;
+  });
+};
+
+/**
+ *  Set the Debug Information Format to DWARF with dSYM File during EAS Build for Managed App
+ *  https://github.com/expo/eas-cli/issues/968
+ *
+ *  Set `artifactPath` in `eas.json`:
+ *  ```json
+ *  "ios": {
+ *    "artifactPath": "ios/build/*"
+ *  }
+ *  ```
+ */
+const withDwarfDsym = config => {
+  return (0, _configPlugins.withXcodeProject)(config, async c => {
+    c.modResults.debugInformationFormat = "dwarf-with-dsym";
+    return c;
+  });
+};
+const withExcludedSimulatorArchitectures = config => {
+  return (0, _configPlugins.withXcodeProject)(config, c => {
+    c.modResults = setExcludedArchitectures(c.modResults);
+    return c;
+  });
+};
+const ios = exports.ios = {
+  withPodfilePostInstall,
+  withoutSignatures,
+  withDwarfDsym,
+  withExcludedSimulatorArchitectures
+};
+//# sourceMappingURL=ios.js.map

package/lib/commonjs/plugin/ios.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_configPlugins","require","_generateCode","applyPodfilePostInstall","contents","result","mergeContents","tag","src","newSrc","anchor","RegExp","offset","comment","didMerge","didClear","withPodfilePostInstall","config","withPodfile","c","modResults","setExcludedArchitectures","project","configurations","pbxXCBuildConfigurationSection","name","buildSettings","Object","values","PRODUCT_NAME","withoutSignatures","withXcodeProject","addBuildPhase","shellPath","shellScript","withDwarfDsym","debugInformationFormat","withExcludedSimulatorArchitectures","ios","exports"],"sourceRoot":"../../../src","sources":["plugin/ios.ts"],"mappings":";;;;;;;AAAA,IAAAA,cAAA,GAAAC,OAAA;AAMA,IAAAC,aAAA,GAAAD,OAAA;AAEA;AACA;AACA;AACA;AACO,SAASE,uBAAuBA,CAACC,QAAgB,EAAU;EAChE,MAAMC,MAAM,GAAG,IAAAC,2BAAa,EAAC;IAC3BC,GAAG,EAAE,gDAAgD;IACrDC,GAAG,EAAEJ,QAAQ;IACbK,MAAM,EAAE,mCAAmC;IAC3CC,MAAM,EAAE,IAAIC,MAAM,CAAC,iCAAiC,CAAC;IACrDC,MAAM,EAAE,CAAC;IACTC,OAAO,EAAE;EACX,CAAC,CAAC;EAEF,IAAIR,MAAM,CAACS,QAAQ,IAAIT,MAAM,CAACU,QAAQ,EAAE;IACtC,OAAOV,MAAM,CAACD,QAAQ;EACxB;EAEA,OAAOA,QAAQ;AACjB;AAEA,MAAMY,sBAAoC,GAAIC,MAAM,IAAK;EACvD,OAAO,IAAAC,0BAAW,EAACD,MAAM,EAAGE,CAAC,IAAK;IAChCA,CAAC,CAACC,UAAU,CAAChB,QAAQ,GAAGD,uBAAuB,CAACgB,CAAC,CAACC,UAAU,CAAChB,QAAQ,CAAC;IAEtE,OAAOe,CAAC;EACV,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA;AACA,SAASE,wBAAwBA,CAACC,OAAqB,EAAgB;EACrE,MAAMC,cAAc,GAAGD,OAAO,CAACE,8BAA8B,CAAC,CAAC;EAC/D;EACA;EACA,KAAK,MAAM;IAAEC,IAAI;IAAEC;EAAc,CAAC,IAAIC,MAAM,CAACC,MAAM,CAACL,cAAc,IAAI,CAAC,CAAC,CAAC,EAAE;IACzE;IACA;IACA,IACEE,IAAI,KAAK,SAAS,IAClB,OAAOC,aAAa,EAAEG,YAAY,KAAK,WAAW,EAClD;MACAH,aAAa,CAAC,wCAAwC,CAAC,GAAG,SAAS;IACrE;EACF;EAEA,OAAOJ,OAAO;AAChB;AAEA,MAAMQ,iBAA+B,GAAIb,MAAM,IAAK;EAClD,OAAO,IAAAc,+BAAgB,EAACd,MAAM,EAAE,MAAOE,CAAC,IAAK;IAC3CA,CAAC,CAACC,UAAU,CAACY,aAAa,CACxB,EAAE,EACF,0BAA0B,EAC1B,2CAA2C,EAC3C,IAAI,EACJ;MACEC,SAAS,EAAE,SAAS;MACpBC,WAAW,EAAE;AACrB;AACA;AACA;IACM,CACF,CAAC;IAED,OAAOf,CAAC;EACV,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMgB,aAA2B,GAAIlB,MAAM,IAAK;EAC9C,OAAO,IAAAc,+BAAgB,EAACd,MAAM,EAAE,MAAOE,CAAC,IAAK;IAC3CA,CAAC,CAACC,UAAU,CAACgB,sBAAsB,GAAG,iBAAiB;IAEvD,OAAOjB,CAAC;EACV,CAAC,CAAC;AACJ,CAAC;AAED,MAAMkB,kCAAgD,GAAIpB,MAAM,IAAK;EACnE,OAAO,IAAAc,+BAAgB,EAACd,MAAM,EAAGE,CAAC,IAAK;IACrCA,CAAC,CAACC,UAAU,GAAGC,wBAAwB,CAACF,CAAC,CAACC,UAAU,CAAC;IAErD,OAAOD,CAAC;EACV,CAAC,CAAC;AACJ,CAAC;AAEM,MAAMmB,GAAG,GAAAC,OAAA,CAAAD,GAAA,GAAG;EACjBtB,sBAAsB;EACtBc,iBAAiB;EACjBK,aAAa;EACbE;AACF,CAAC","ignoreList":[]}

package/lib/commonjs/plugin/withMapLibre.js

@@ -3,16 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.addInstallerBlock = addInstallerBlock;
-exports.addMapLibreInstallerBlock = addMapLibreInstallerBlock;
-exports.applyCocoaPodsModifications = applyCocoaPodsModifications;
 exports.default = void 0;
-exports.setExcludedArchitectures = setExcludedArchitectures;
 var _configPlugins = require("@expo/config-plugins");
-var _generateCode = require("@expo/config-plugins/build/utils/generateCode");
-var _nodeFs = require("node:fs");
-var _nodePath = _interopRequireDefault(require("node:path"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+var _ios = require("./ios.js");
 let pkg = {
   name: "@maplibre/maplibre-react-native"
 };
@@ -21,129 +14,13 @@ try {
 } catch {
   // empty catch block
 }
-/**
- * Dangerously adds the custom installer hooks to the Podfile.
- * In the future this should be removed in favor of some custom hooks provided by Expo autolinking.
- *
- * https://github.com/maplibre/maplibre-react-native/blob/main/docs/guides/setup/iOS.md
- */
-const withCocoaPodsInstallerBlocks = c => {
-  return (0, _configPlugins.withDangerousMod)(c, ["ios",
-  // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-  async config => {
-    const file = _nodePath.default.join(config.modRequest.platformProjectRoot, "Podfile");
-    const contents = await _nodeFs.promises.readFile(file, "utf8");
-    await _nodeFs.promises.writeFile(file, applyCocoaPodsModifications(contents), "utf-8");
-    return config;
-  }]);
-};
-
-// Only the post-install block is required, the post installer block is
-// used for spm (swift package manager) which Expo doesn't currently support.
-function applyCocoaPodsModifications(contents) {
-  // Ensure installer blocks exist
-  let src = addInstallerBlock(contents, "post");
-  src = addMapLibreInstallerBlock(src, "post");
-  return src;
-}
-function addInstallerBlock(src, blockName) {
-  const matchBlock = new RegExp(`${blockName}_install do \\|installer\\|`);
-  const tag = `${blockName}_installer`;
-  for (const line of src.split("\n")) {
-    const contents = line.trim();
-    // Ignore comments
-    if (!contents.startsWith("#")) {
-      // Prevent adding the block if it exists outside of comments.
-      if (contents.match(matchBlock)) {
-        // This helps to still allow revisions, since we enabled the block previously.
-        // Only continue if the generated block exists...
-        const modified = (0, _generateCode.removeGeneratedContents)(src, tag);
-        if (!modified) {
-          return src;
-        }
-      }
-    }
-  }
-  return (0, _generateCode.mergeContents)({
-    tag,
-    src,
-    newSrc: [`  ${blockName}_install do |installer|`, "  end"].join("\n"),
-    anchor: /use_react_native/,
-    // We can't go after the use_react_native block because it might have parameters, causing it to be multi-line (see react-native template).
-    offset: 0,
-    comment: "#"
-  }).contents;
-}
-function addMapLibreInstallerBlock(src, blockName) {
-  return (0, _generateCode.mergeContents)({
-    tag: `@maplibre/maplibre-react-native-${blockName}_installer`,
-    src,
-    newSrc: `    $MLRN.${blockName}_install(installer)`,
-    anchor: new RegExp(`${blockName}_install do \\|installer\\|`),
-    offset: 1,
-    comment: "#"
-  }).contents;
-}
-
-/**
- * Exclude building for arm64 on simulator devices in the pbxproj project.
- * Without this, production builds targeting simulators will fail.
- */
-function setExcludedArchitectures(project) {
-  const configurations = project.pbxXCBuildConfigurationSection();
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-ignore
-  for (const {
-    name,
-    buildSettings
-  } of Object.values(configurations || {})) {
-    // Guessing that this is the best way to emulate Xcode.
-    // Using `project.addToBuildSettings` modifies too many targets.
-    if (name === "Release" && typeof buildSettings?.PRODUCT_NAME !== "undefined") {
-      buildSettings['"EXCLUDED_ARCHS[sdk=iphonesimulator*]"'] = '"arm64"';
-    }
-  }
-  return project;
-}
-const withoutSignatures = config => {
-  const shellScript = `
-    echo "Remove signature files (Xcode workaround)";
-    rm -rf "$CONFIGURATION_BUILD_DIR/MapLibre.xcframework-ios.signature";
-  `;
-  return (0, _configPlugins.withXcodeProject)(config, async config => {
-    const xcodeProject = config.modResults;
-    xcodeProject.addBuildPhase([], "PBXShellScriptBuildPhase", "Remove signature files (Xcode workaround)", null, {
-      shellPath: "/bin/sh",
-      shellScript
-    });
-    return config;
-  });
-};
-
-/**
- *  Set the Debug Information Format to DWARF with dSYM File during EAS Build for Managed App
- *  https://github.com/expo/eas-cli/issues/968
- *  // Set artifactPath in eas.json
- *  "ios": {
- *    "artifactPath": "ios/build/*"
- *  }
- */
-const withDwarfDsym = config => {
-  return (0, _configPlugins.withXcodeProject)(config, async config => {
-    const xcodeProject = config.modResults;
-    xcodeProject.debugInformationFormat = "dwarf-with-dsym";
-    return config;
-  });
-};
-const withExcludedSimulatorArchitectures = c => {
-  return (0, _configPlugins.withXcodeProject)(c, config => {
-    config.modResults = setExcludedArchitectures(config.modResults);
-    return config;
-  });
-};
 const withMapLibre = config => {
-  config = withoutSignatures(withDwarfDsym(withExcludedSimulatorArchitectures(config)));
-  return withCocoaPodsInstallerBlocks(config);
+  // iOS
+  config = _ios.ios.withExcludedSimulatorArchitectures(config);
+  config = _ios.ios.withDwarfDsym(config);
+  config = _ios.ios.withoutSignatures(config);
+  config = _ios.ios.withPodfilePostInstall(config);
+  return config;
 };
 var _default = exports.default = (0, _configPlugins.createRunOncePlugin)(withMapLibre, pkg.name, pkg.version);
 //# sourceMappingURL=withMapLibre.js.map

package/lib/commonjs/plugin/withMapLibre.js.map

@@ -1 +1 @@
-{"version":3,"names":["_configPlugins","require","_generateCode","_nodeFs","_nodePath","_interopRequireDefault","e","__esModule","default","pkg","name","withCocoaPodsInstallerBlocks","c","withDangerousMod","config","file","path","join","modRequest","platformProjectRoot","contents","promises","readFile","writeFile","applyCocoaPodsModifications","src","addInstallerBlock","addMapLibreInstallerBlock","blockName","matchBlock","RegExp","tag","line","split","trim","startsWith","match","modified","removeGeneratedContents","mergeContents","newSrc","anchor","offset","comment","setExcludedArchitectures","project","configurations","pbxXCBuildConfigurationSection","buildSettings","Object","values","PRODUCT_NAME","withoutSignatures","shellScript","withXcodeProject","xcodeProject","modResults","addBuildPhase","shellPath","withDwarfDsym","debugInformationFormat","withExcludedSimulatorArchitectures","withMapLibre","_default","exports","createRunOncePlugin","version"],"sourceRoot":"../../../src","sources":["plugin/withMapLibre.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_configPlugins","require","_ios","pkg","name","withMapLibre","config","ios","withExcludedSimulatorArchitectures","withDwarfDsym","withoutSignatures","withPodfilePostInstall","_default","exports","default","createRunOncePlugin","version"],"sourceRoot":"../../../src","sources":["plugin/withMapLibre.ts"],"mappings":";;;;;;AAAA,IAAAA,cAAA,GAAAC,OAAA;AAEA,IAAAC,IAAA,GAAAD,OAAA;AAEA,IAAIE,GAAuC,GAAG;EAC5CC,IAAI,EAAE;AACR,CAAC;AACD,IAAI;EACFD,GAAG,GAAGF,OAAO,CAAC,8CAA8C,CAAC;AAC/D,CAAC,CAAC,MAAM;EACN;AAAA;AAGF,MAAMI,YAA0B,GAAIC,MAAM,IAAK;EAC7C;EACAA,MAAM,GAAGC,QAAG,CAACC,kCAAkC,CAACF,MAAM,CAAC;EACvDA,MAAM,GAAGC,QAAG,CAACE,aAAa,CAACH,MAAM,CAAC;EAClCA,MAAM,GAAGC,QAAG,CAACG,iBAAiB,CAACJ,MAAM,CAAC;EACtCA,MAAM,GAAGC,QAAG,CAACI,sBAAsB,CAACL,MAAM,CAAC;EAE3C,OAAOA,MAAM;AACf,CAAC;AAAC,IAAAM,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAEa,IAAAC,kCAAmB,EAACV,YAAY,EAAEF,GAAG,CAACC,IAAI,EAAED,GAAG,CAACa,OAAO,CAAC","ignoreList":[]}