@maplibre/maplibre-react-native 11.3.1 → 11.3.3

package/MapLibreReactNative.podspec

@@ -1,4 +1,5 @@
 require "json"
+require "securerandom"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
@@ -15,19 +16,31 @@ $MLRN_SPM_SPEC ||= {
 
 $MLRN = Object.new
 
+# Prevent UUID collisions https://github.com/maplibre/maplibre-react-native/issues/1499
+def $MLRN._mlrn_unique_uuid(project)
+  loop do
+    candidate = SecureRandom.hex(12).upcase
+    return candidate unless project.objects_by_uuid.key?(candidate)
+  end
+end
+
 def $MLRN._add_spm_to_target(project, target, url, requirement, product_name)
   pkg_class = Xcodeproj::Project::Object::XCRemoteSwiftPackageReference
   ref_class = Xcodeproj::Project::Object::XCSwiftPackageProductDependency
   pkg = project.root_object.package_references.find { |p| p.class == pkg_class && p.repositoryURL == url }
   if !pkg
-    pkg = project.new(pkg_class)
+    pkg_uuid = self._mlrn_unique_uuid(project)
+    pkg = pkg_class.new(project, pkg_uuid)
+    project.objects_by_uuid[pkg_uuid] = pkg
     pkg.repositoryURL = url
     project.root_object.package_references << pkg
   end
   pkg.requirement = requirement
   ref = target.package_product_dependencies.find { |r| r.class == ref_class && r.package == pkg && r.product_name == product_name }
   if !ref
-    ref = project.new(ref_class)
+    ref_uuid = self._mlrn_unique_uuid(project)
+    ref = ref_class.new(project, ref_uuid)
+    project.objects_by_uuid[ref_uuid] = ref
     ref.package = pkg
     ref.product_name = product_name
     target.package_product_dependencies << ref

package/android/src/main/java/org/maplibre/reactnative/components/sources/MLRNSource.kt

@@ -136,20 +136,26 @@ abstract class MLRNSource<T : Source?>(
     }
 
     fun removeLayer(childPosition: Int) {
+        val queuedLayers = mQueuedLayers
         val layer: MLRNLayer? =
-            if (mQueuedLayers != null && mQueuedLayers!!.isNotEmpty()) {
-                mQueuedLayers!![childPosition]
+            if (!queuedLayers.isNullOrEmpty()) {
+                queuedLayers.getOrNull(childPosition)
             } else {
-                mLayers[childPosition]
+                mLayers.getOrNull(childPosition)
             }
+
+        if (layer == null) return
+
         removeLayerFromMap(layer, childPosition)
     }
 
     fun getLayerAt(childPosition: Int): MLRNLayer? {
-        if (mQueuedLayers != null && mQueuedLayers!!.isNotEmpty()) {
-            return mQueuedLayers!![childPosition]
+        val queuedLayers = mQueuedLayers
+        if (!queuedLayers.isNullOrEmpty()) {
+            return queuedLayers.getOrNull(childPosition)
         }
-        return mLayers[childPosition]
+
+        return mLayers.getOrNull(childPosition)
     }
 
     protected fun addLayerToMap(

package/lib/commonjs/plugin/android.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.withGradleProperties = exports.mergeGradleProperties = exports.getGradleProperties = exports.android = exports.GRADLE_PROPERTIES_PREFIX = void 0;
-var _configPlugins = require("@expo/config-plugins");
+var _configPlugins = require("expo/config-plugins");
 const GRADLE_PROPERTIES_PREFIX = exports.GRADLE_PROPERTIES_PREFIX = "org.maplibre.reactnative.";
 const getGradleProperties = props => {
   return Object.entries(props?.android || {}).reduce((properties, [key, value]) => {

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

@@ -1 +1 @@
-{"version":3,"names":["_configPlugins","require","GRADLE_PROPERTIES_PREFIX","exports","getGradleProperties","props","Object","entries","android","reduce","properties","key","value","push","type","toString","mergeGradleProperties","oldProperties","newProperties","merged","filter","item","startsWith","withGradleProperties","config","gradleProperties","withGradlePropertiesExpo","c","modResults"],"sourceRoot":"../../../src","sources":["plugin/android.ts"],"mappings":";;;;;;AAAA,IAAAA,cAAA,GAAAC,OAAA;AAcO,MAAMC,wBAAwB,GAAAC,OAAA,CAAAD,wBAAA,GAAG,2BAA2B;AAE5D,MAAME,mBAAmB,GAC9BC,KAA0B,IACP;EACnB,OAAOC,MAAM,CAACC,OAAO,CAACF,KAAK,EAAEG,OAAO,IAAI,CAAC,CAAC,CAAC,CAACC,MAAM,CAChD,CAACC,UAAU,EAAE,CAACC,GAAG,EAAEC,KAAK,CAAC,KAAK;IAC5B,IAAID,GAAG,IAAIC,KAAK,EAAE;MAChBF,UAAU,CAACG,IAAI,CAAC;QACdC,IAAI,EAAE,UAAU;QAChBH,GAAG,EAAE,GAAGT,wBAAwB,GAAGS,GAAG,EAAE;QACxCC,KAAK,EAAEA,KAAK,CAACG,QAAQ,CAAC;MACxB,CAAC,CAAC;IACJ;IAEA,OAAOL,UAAU;EACnB,CAAC,EACD,EACF,CAAC;AACH,CAAC;AAACP,OAAA,CAAAC,mBAAA,GAAAA,mBAAA;AAEK,MAAMY,qBAAqB,GAAGA,CACnCC,aAA+B,EAC/BC,aAA6B,KACR;EACrB,MAAMC,MAAM,GAAGF,aAAa,CAACG,MAAM,CAChCC,IAAI,IACH,EACEA,IAAI,CAACP,IAAI,KAAK,UAAU,IACxBO,IAAI,CAACV,GAAG,CAACW,UAAU,CAACpB,wBAAwB,CAAC,CAEnD,CAAC;EAEDiB,MAAM,CAACN,IAAI,CAAC,GAAGK,aAAa,CAAC;EAE7B,OAAOC,MAAM;AACf,CAAC;AAAChB,OAAA,CAAAa,qBAAA,GAAAA,qBAAA;AAEK,MAAMO,oBAAuD,GAAGA,CACrEC,MAAM,EACNnB,KAAK,KACF;EACH,MAAMoB,gBAAgB,GAAGrB,mBAAmB,CAACC,KAAK,CAAC;EAEnD,OAAO,IAAAqB,mCAAwB,EAACF,MAAM,EAAGG,CAAC,IAAK;IAC7CA,CAAC,CAACC,UAAU,GAAGZ,qBAAqB,CAACW,CAAC,CAACC,UAAU,EAAEH,gBAAgB,CAAC;IAEpE,OAAOE,CAAC;EACV,CAAC,CAAC;AACJ,CAAC;AAACxB,OAAA,CAAAoB,oBAAA,GAAAA,oBAAA;AAEK,MAAMf,OAAO,GAAAL,OAAA,CAAAK,OAAA,GAAG;EACrBe;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["_configPlugins","require","GRADLE_PROPERTIES_PREFIX","exports","getGradleProperties","props","Object","entries","android","reduce","properties","key","value","push","type","toString","mergeGradleProperties","oldProperties","newProperties","merged","filter","item","startsWith","withGradleProperties","config","gradleProperties","withGradlePropertiesExpo","c","modResults"],"sourceRoot":"../../../src","sources":["plugin/android.ts"],"mappings":";;;;;;AAAA,IAAAA,cAAA,GAAAC,OAAA;AAgBO,MAAMC,wBAAwB,GAAAC,OAAA,CAAAD,wBAAA,GAAG,2BAA2B;AAE5D,MAAME,mBAAmB,GAC9BC,KAA0B,IACP;EACnB,OAAOC,MAAM,CAACC,OAAO,CAACF,KAAK,EAAEG,OAAO,IAAI,CAAC,CAAC,CAAC,CAACC,MAAM,CAChD,CAACC,UAAU,EAAE,CAACC,GAAG,EAAEC,KAAK,CAAC,KAAK;IAC5B,IAAID,GAAG,IAAIC,KAAK,EAAE;MAChBF,UAAU,CAACG,IAAI,CAAC;QACdC,IAAI,EAAE,UAAU;QAChBH,GAAG,EAAE,GAAGT,wBAAwB,GAAGS,GAAG,EAAE;QACxCC,KAAK,EAAEA,KAAK,CAACG,QAAQ,CAAC;MACxB,CAAC,CAAC;IACJ;IAEA,OAAOL,UAAU;EACnB,CAAC,EACD,EACF,CAAC;AACH,CAAC;AAACP,OAAA,CAAAC,mBAAA,GAAAA,mBAAA;AAEK,MAAMY,qBAAqB,GAAGA,CACnCC,aAA+B,EAC/BC,aAA6B,KACR;EACrB,MAAMC,MAAM,GAAGF,aAAa,CAACG,MAAM,CAChCC,IAAI,IACH,EACEA,IAAI,CAACP,IAAI,KAAK,UAAU,IACxBO,IAAI,CAACV,GAAG,CAACW,UAAU,CAACpB,wBAAwB,CAAC,CAEnD,CAAC;EAEDiB,MAAM,CAACN,IAAI,CAAC,GAAGK,aAAa,CAAC;EAE7B,OAAOC,MAAM;AACf,CAAC;AAAChB,OAAA,CAAAa,qBAAA,GAAAA,qBAAA;AAEK,MAAMO,oBAAuD,GAAGA,CACrEC,MAAM,EACNnB,KAAK,KACF;EACH,MAAMoB,gBAAgB,GAAGrB,mBAAmB,CAACC,KAAK,CAAC;EAEnD,OAAO,IAAAqB,mCAAwB,EAACF,MAAM,EAAGG,CAAC,IAAK;IAC7CA,CAAC,CAACC,UAAU,GAAGZ,qBAAqB,CAACW,CAAC,CAACC,UAAU,EAAEH,gBAAgB,CAAC;IAEpE,OAAOE,CAAC;EACV,CAAC,CAAC;AACJ,CAAC;AAACxB,OAAA,CAAAoB,oBAAA,GAAAA,oBAAA;AAEK,MAAMf,OAAO,GAAAL,OAAA,CAAAK,OAAA,GAAG;EACrBe;AACF,CAAC","ignoreList":[]}

package/lib/commonjs/plugin/ios.js

@@ -6,8 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.applyPodfileGlobalVariables = void 0;
 exports.applyPodfilePostInstall = applyPodfilePostInstall;
 exports.withPodfileGlobalVariables = exports.ios = void 0;
-var _configPlugins = require("@expo/config-plugins");
-var _generateCode = require("@expo/config-plugins/build/utils/generateCode");
+var _configPlugins = require("expo/config-plugins");
+const {
+  mergeContents,
+  removeGeneratedContents
+} = _configPlugins.CodeGenerator;
 const TAG_PREFIX = `@maplibre/maplibre-react-native`;
 
 /**
@@ -15,7 +18,7 @@ const TAG_PREFIX = `@maplibre/maplibre-react-native`;
  * SPM (Swift Package Manager) which Expo doesn't currently support.
  */
 function applyPodfilePostInstall(contents) {
-  const result = (0, _generateCode.mergeContents)({
+  const result = mergeContents({
     tag: `${TAG_PREFIX}:post-install`,
     src: contents,
     newSrc: `    $MLRN.post_install(installer)`,
@@ -44,7 +47,7 @@ const applyPodfileGlobalVariables = (contents, props) => {
     globalVariables.push(`$MLRN_SPM_SPEC = ${props.ios.spmSpec}`);
   }
   if (globalVariables.length > 0) {
-    return (0, _generateCode.mergeContents)({
+    return mergeContents({
       tag,
       src: contents,
       newSrc: globalVariables.join("\n"),
@@ -53,7 +56,7 @@ const applyPodfileGlobalVariables = (contents, props) => {
       comment: "#"
     }).contents;
   }
-  const modified = (0, _generateCode.removeGeneratedContents)(contents, tag);
+  const modified = removeGeneratedContents(contents, tag);
   return modified ?? contents;
 };
 exports.applyPodfileGlobalVariables = applyPodfileGlobalVariables;

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

@@ -1 +1 @@
-{"version":3,"names":["_configPlugins","require","_generateCode","TAG_PREFIX","applyPodfilePostInstall","contents","result","mergeContents","tag","src","newSrc","anchor","offset","comment","didMerge","didClear","withPodfilePostInstall","config","withPodfile","c","modResults","applyPodfileGlobalVariables","props","globalVariables","ios","nativeVersion","push","spmSpec","length","join","modified","removeGeneratedContents","exports","withPodfileGlobalVariables","withDwarfDsym","withXcodeProject","debugInformationFormat"],"sourceRoot":"../../../src","sources":["plugin/ios.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_configPlugins","require","mergeContents","removeGeneratedContents","CodeGenerator","TAG_PREFIX","applyPodfilePostInstall","contents","result","tag","src","newSrc","anchor","offset","comment","didMerge","didClear","withPodfilePostInstall","config","withPodfile","c","modResults","applyPodfileGlobalVariables","props","globalVariables","ios","nativeVersion","push","spmSpec","length","join","modified","exports","withPodfileGlobalVariables","withDwarfDsym","withXcodeProject","debugInformationFormat"],"sourceRoot":"../../../src","sources":["plugin/ios.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/plugin/withMapLibre.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _configPlugins = require("@expo/config-plugins");
+var _configPlugins = require("expo/config-plugins");
 var _android = require("./android.js");
 var _ios = require("./ios.js");
 let pkg = {

package/lib/module/plugin/android.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { withGradleProperties as withGradlePropertiesExpo } from "@expo/config-plugins";
+import { withGradleProperties as withGradlePropertiesExpo } from "expo/config-plugins";
 export const GRADLE_PROPERTIES_PREFIX = "org.maplibre.reactnative.";
 export const getGradleProperties = props => {
   return Object.entries(props?.android || {}).reduce((properties, [key, value]) => {

package/lib/module/plugin/android.js.map

@@ -1 +1 @@
-{"version":3,"names":["withGradleProperties","withGradlePropertiesExpo","GRADLE_PROPERTIES_PREFIX","getGradleProperties","props","Object","entries","android","reduce","properties","key","value","push","type","toString","mergeGradleProperties","oldProperties","newProperties","merged","filter","item","startsWith","config","gradleProperties","c","modResults"],"sourceRoot":"../../../src","sources":["plugin/android.ts"],"mappings":";;AAAA,SAEEA,oBAAoB,IAAIC,wBAAwB,QAC3C,sBAAsB;AAW7B,OAAO,MAAMC,wBAAwB,GAAG,2BAA2B;AAEnE,OAAO,MAAMC,mBAAmB,GAC9BC,KAA0B,IACP;EACnB,OAAOC,MAAM,CAACC,OAAO,CAACF,KAAK,EAAEG,OAAO,IAAI,CAAC,CAAC,CAAC,CAACC,MAAM,CAChD,CAACC,UAAU,EAAE,CAACC,GAAG,EAAEC,KAAK,CAAC,KAAK;IAC5B,IAAID,GAAG,IAAIC,KAAK,EAAE;MAChBF,UAAU,CAACG,IAAI,CAAC;QACdC,IAAI,EAAE,UAAU;QAChBH,GAAG,EAAE,GAAGR,wBAAwB,GAAGQ,GAAG,EAAE;QACxCC,KAAK,EAAEA,KAAK,CAACG,QAAQ,CAAC;MACxB,CAAC,CAAC;IACJ;IAEA,OAAOL,UAAU;EACnB,CAAC,EACD,EACF,CAAC;AACH,CAAC;AAED,OAAO,MAAMM,qBAAqB,GAAGA,CACnCC,aAA+B,EAC/BC,aAA6B,KACR;EACrB,MAAMC,MAAM,GAAGF,aAAa,CAACG,MAAM,CAChCC,IAAI,IACH,EACEA,IAAI,CAACP,IAAI,KAAK,UAAU,IACxBO,IAAI,CAACV,GAAG,CAACW,UAAU,CAACnB,wBAAwB,CAAC,CAEnD,CAAC;EAEDgB,MAAM,CAACN,IAAI,CAAC,GAAGK,aAAa,CAAC;EAE7B,OAAOC,MAAM;AACf,CAAC;AAED,OAAO,MAAMlB,oBAAuD,GAAGA,CACrEsB,MAAM,EACNlB,KAAK,KACF;EACH,MAAMmB,gBAAgB,GAAGpB,mBAAmB,CAACC,KAAK,CAAC;EAEnD,OAAOH,wBAAwB,CAACqB,MAAM,EAAGE,CAAC,IAAK;IAC7CA,CAAC,CAACC,UAAU,GAAGV,qBAAqB,CAACS,CAAC,CAACC,UAAU,EAAEF,gBAAgB,CAAC;IAEpE,OAAOC,CAAC;EACV,CAAC,CAAC;AACJ,CAAC;AAED,OAAO,MAAMjB,OAAO,GAAG;EACrBP;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["withGradleProperties","withGradlePropertiesExpo","GRADLE_PROPERTIES_PREFIX","getGradleProperties","props","Object","entries","android","reduce","properties","key","value","push","type","toString","mergeGradleProperties","oldProperties","newProperties","merged","filter","item","startsWith","config","gradleProperties","c","modResults"],"sourceRoot":"../../../src","sources":["plugin/android.ts"],"mappings":";;AAAA,SAGEA,oBAAoB,IAAIC,wBAAwB,QAC3C,qBAAqB;AAY5B,OAAO,MAAMC,wBAAwB,GAAG,2BAA2B;AAEnE,OAAO,MAAMC,mBAAmB,GAC9BC,KAA0B,IACP;EACnB,OAAOC,MAAM,CAACC,OAAO,CAACF,KAAK,EAAEG,OAAO,IAAI,CAAC,CAAC,CAAC,CAACC,MAAM,CAChD,CAACC,UAAU,EAAE,CAACC,GAAG,EAAEC,KAAK,CAAC,KAAK;IAC5B,IAAID,GAAG,IAAIC,KAAK,EAAE;MAChBF,UAAU,CAACG,IAAI,CAAC;QACdC,IAAI,EAAE,UAAU;QAChBH,GAAG,EAAE,GAAGR,wBAAwB,GAAGQ,GAAG,EAAE;QACxCC,KAAK,EAAEA,KAAK,CAACG,QAAQ,CAAC;MACxB,CAAC,CAAC;IACJ;IAEA,OAAOL,UAAU;EACnB,CAAC,EACD,EACF,CAAC;AACH,CAAC;AAED,OAAO,MAAMM,qBAAqB,GAAGA,CACnCC,aAA+B,EAC/BC,aAA6B,KACR;EACrB,MAAMC,MAAM,GAAGF,aAAa,CAACG,MAAM,CAChCC,IAAI,IACH,EACEA,IAAI,CAACP,IAAI,KAAK,UAAU,IACxBO,IAAI,CAACV,GAAG,CAACW,UAAU,CAACnB,wBAAwB,CAAC,CAEnD,CAAC;EAEDgB,MAAM,CAACN,IAAI,CAAC,GAAGK,aAAa,CAAC;EAE7B,OAAOC,MAAM;AACf,CAAC;AAED,OAAO,MAAMlB,oBAAuD,GAAGA,CACrEsB,MAAM,EACNlB,KAAK,KACF;EACH,MAAMmB,gBAAgB,GAAGpB,mBAAmB,CAACC,KAAK,CAAC;EAEnD,OAAOH,wBAAwB,CAACqB,MAAM,EAAGE,CAAC,IAAK;IAC7CA,CAAC,CAACC,UAAU,GAAGV,qBAAqB,CAACS,CAAC,CAACC,UAAU,EAAEF,gBAAgB,CAAC;IAEpE,OAAOC,CAAC;EACV,CAAC,CAAC;AACJ,CAAC;AAED,OAAO,MAAMjB,OAAO,GAAG;EACrBP;AACF,CAAC","ignoreList":[]}

package/lib/module/plugin/ios.js

@@ -1,7 +1,10 @@
 "use strict";
 
-import { withPodfile, withXcodeProject } from "@expo/config-plugins";
-import { mergeContents, removeGeneratedContents } from "@expo/config-plugins/build/utils/generateCode";
+import { CodeGenerator, withPodfile, withXcodeProject } from "expo/config-plugins";
+const {
+  mergeContents,
+  removeGeneratedContents
+} = CodeGenerator;
 const TAG_PREFIX = `@maplibre/maplibre-react-native`;
 
 /**

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

@@ -1 +1 @@
-{"version":3,"names":["withPodfile","withXcodeProject","mergeContents","removeGeneratedContents","TAG_PREFIX","applyPodfilePostInstall","contents","result","tag","src","newSrc","anchor","offset","comment","didMerge","didClear","withPodfilePostInstall","config","c","modResults","applyPodfileGlobalVariables","props","globalVariables","ios","nativeVersion","push","spmSpec","length","join","modified","withPodfileGlobalVariables","withDwarfDsym","debugInformationFormat"],"sourceRoot":"../../../src","sources":["plugin/ios.ts"],"mappings":";;AAAA,SAEEA,WAAW,EACXC,gBAAgB,QACX,sBAAsB;AAC7B,SACEC,aAAa,EACbC,uBAAuB,QAClB,+CAA+C;AAItD,MAAMC,UAAU,GAAG,iCAAiC;;AAEpD;AACA;AACA;AACA;AACA,OAAO,SAASC,uBAAuBA,CAACC,QAAgB,EAAU;EAChE,MAAMC,MAAM,GAAGL,aAAa,CAAC;IAC3BM,GAAG,EAAE,GAAGJ,UAAU,eAAe;IACjCK,GAAG,EAAEH,QAAQ;IACbI,MAAM,EAAE,mCAAmC;IAC3CC,MAAM,EAAE,+BAA+B;IACvCC,MAAM,EAAE,CAAC;IACTC,OAAO,EAAE;EACX,CAAC,CAAC;EAEF,IAAIN,MAAM,CAACO,QAAQ,IAAIP,MAAM,CAACQ,QAAQ,EAAE;IACtC,OAAOR,MAAM,CAACD,QAAQ;EACxB;EAEA,OAAOA,QAAQ;AACjB;AAEA,MAAMU,sBAAoC,GAAIC,MAAM,IAAK;EACvD,OAAOjB,WAAW,CAACiB,MAAM,EAAGC,CAAC,IAAK;IAChCA,CAAC,CAACC,UAAU,CAACb,QAAQ,GAAGD,uBAAuB,CAACa,CAAC,CAACC,UAAU,CAACb,QAAQ,CAAC;IAEtE,OAAOY,CAAC;EACV,CAAC,CAAC;AACJ,CAAC;AAED,OAAO,MAAME,2BAA2B,GAAGA,CACzCd,QAAgB,EAChBe,KAA0B,KACf;EACX,MAAMb,GAAG,GAAG,GAAGJ,UAAU,mBAAmB;EAE5C,MAAMkB,eAAe,GAAG,EAAE;EAE1B,IAAID,KAAK,EAAEE,GAAG,EAAEC,aAAa,EAAE;IAC7BF,eAAe,CAACG,IAAI,CAAC,2BAA2BJ,KAAK,CAACE,GAAG,CAACC,aAAa,GAAG,CAAC;EAC7E;EAEA,IAAIH,KAAK,EAAEE,GAAG,EAAEG,OAAO,EAAE;IACvBJ,eAAe,CAACG,IAAI,CAAC,oBAAoBJ,KAAK,CAACE,GAAG,CAACG,OAAO,EAAE,CAAC;EAC/D;EAEA,IAAIJ,eAAe,CAACK,MAAM,GAAG,CAAC,EAAE;IAC9B,OAAOzB,aAAa,CAAC;MACnBM,GAAG;MACHC,GAAG,EAAEH,QAAQ;MACbI,MAAM,EAAEY,eAAe,CAACM,IAAI,CAAC,IAAI,CAAC;MAClCjB,MAAM,EAAE,cAAc;MACtBC,MAAM,EAAE,CAAC;MACTC,OAAO,EAAE;IACX,CAAC,CAAC,CAACP,QAAQ;EACb;EAEA,MAAMuB,QAAQ,GAAG1B,uBAAuB,CAACG,QAAQ,EAAEE,GAAG,CAAC;EAEvD,OAAOqB,QAAQ,IAAIvB,QAAQ;AAC7B,CAAC;AAED,OAAO,MAAMwB,0BAA6D,GAAGA,CAC3Eb,MAAM,EACNI,KAAK,KACF;EACH,OAAOrB,WAAW,CAACiB,MAAM,EAAGC,CAAC,IAAK;IAChCA,CAAC,CAACC,UAAU,CAACb,QAAQ,GAAGc,2BAA2B,CACjDF,CAAC,CAACC,UAAU,CAACb,QAAQ,EACrBe,KACF,CAAC;IAED,OAAOH,CAAC;EACV,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMa,aAA2B,GAAId,MAAM,IAAK;EAC9C,OAAOhB,gBAAgB,CAACgB,MAAM,EAAGC,CAAC,IAAK;IACrCA,CAAC,CAACC,UAAU,CAACa,sBAAsB,GAAG,iBAAiB;IAEvD,OAAOd,CAAC;EACV,CAAC,CAAC;AACJ,CAAC;AAED,OAAO,MAAMK,GAAG,GAAG;EACjBP,sBAAsB;EACtBc,0BAA0B;EAC1BC;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["CodeGenerator","withPodfile","withXcodeProject","mergeContents","removeGeneratedContents","TAG_PREFIX","applyPodfilePostInstall","contents","result","tag","src","newSrc","anchor","offset","comment","didMerge","didClear","withPodfilePostInstall","config","c","modResults","applyPodfileGlobalVariables","props","globalVariables","ios","nativeVersion","push","spmSpec","length","join","modified","withPodfileGlobalVariables","withDwarfDsym","debugInformationFormat"],"sourceRoot":"../../../src","sources":["plugin/ios.ts"],"mappings":";;AAAA,SACEA,aAAa,EAEbC,WAAW,EACXC,gBAAgB,QACX,qBAAqB;AAI5B,MAAM;EAAEC,aAAa;EAAEC;AAAwB,CAAC,GAAGJ,aAAa;AAEhE,MAAMK,UAAU,GAAG,iCAAiC;;AAEpD;AACA;AACA;AACA;AACA,OAAO,SAASC,uBAAuBA,CAACC,QAAgB,EAAU;EAChE,MAAMC,MAAM,GAAGL,aAAa,CAAC;IAC3BM,GAAG,EAAE,GAAGJ,UAAU,eAAe;IACjCK,GAAG,EAAEH,QAAQ;IACbI,MAAM,EAAE,mCAAmC;IAC3CC,MAAM,EAAE,+BAA+B;IACvCC,MAAM,EAAE,CAAC;IACTC,OAAO,EAAE;EACX,CAAC,CAAC;EAEF,IAAIN,MAAM,CAACO,QAAQ,IAAIP,MAAM,CAACQ,QAAQ,EAAE;IACtC,OAAOR,MAAM,CAACD,QAAQ;EACxB;EAEA,OAAOA,QAAQ;AACjB;AAEA,MAAMU,sBAAoC,GAAIC,MAAM,IAAK;EACvD,OAAOjB,WAAW,CAACiB,MAAM,EAAGC,CAAC,IAAK;IAChCA,CAAC,CAACC,UAAU,CAACb,QAAQ,GAAGD,uBAAuB,CAACa,CAAC,CAACC,UAAU,CAACb,QAAQ,CAAC;IAEtE,OAAOY,CAAC;EACV,CAAC,CAAC;AACJ,CAAC;AAED,OAAO,MAAME,2BAA2B,GAAGA,CACzCd,QAAgB,EAChBe,KAA0B,KACf;EACX,MAAMb,GAAG,GAAG,GAAGJ,UAAU,mBAAmB;EAE5C,MAAMkB,eAAe,GAAG,EAAE;EAE1B,IAAID,KAAK,EAAEE,GAAG,EAAEC,aAAa,EAAE;IAC7BF,eAAe,CAACG,IAAI,CAAC,2BAA2BJ,KAAK,CAACE,GAAG,CAACC,aAAa,GAAG,CAAC;EAC7E;EAEA,IAAIH,KAAK,EAAEE,GAAG,EAAEG,OAAO,EAAE;IACvBJ,eAAe,CAACG,IAAI,CAAC,oBAAoBJ,KAAK,CAACE,GAAG,CAACG,OAAO,EAAE,CAAC;EAC/D;EAEA,IAAIJ,eAAe,CAACK,MAAM,GAAG,CAAC,EAAE;IAC9B,OAAOzB,aAAa,CAAC;MACnBM,GAAG;MACHC,GAAG,EAAEH,QAAQ;MACbI,MAAM,EAAEY,eAAe,CAACM,IAAI,CAAC,IAAI,CAAC;MAClCjB,MAAM,EAAE,cAAc;MACtBC,MAAM,EAAE,CAAC;MACTC,OAAO,EAAE;IACX,CAAC,CAAC,CAACP,QAAQ;EACb;EAEA,MAAMuB,QAAQ,GAAG1B,uBAAuB,CAACG,QAAQ,EAAEE,GAAG,CAAC;EAEvD,OAAOqB,QAAQ,IAAIvB,QAAQ;AAC7B,CAAC;AAED,OAAO,MAAMwB,0BAA6D,GAAGA,CAC3Eb,MAAM,EACNI,KAAK,KACF;EACH,OAAOrB,WAAW,CAACiB,MAAM,EAAGC,CAAC,IAAK;IAChCA,CAAC,CAACC,UAAU,CAACb,QAAQ,GAAGc,2BAA2B,CACjDF,CAAC,CAACC,UAAU,CAACb,QAAQ,EACrBe,KACF,CAAC;IAED,OAAOH,CAAC;EACV,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMa,aAA2B,GAAId,MAAM,IAAK;EAC9C,OAAOhB,gBAAgB,CAACgB,MAAM,EAAGC,CAAC,IAAK;IACrCA,CAAC,CAACC,UAAU,CAACa,sBAAsB,GAAG,iBAAiB;IAEvD,OAAOd,CAAC;EACV,CAAC,CAAC;AACJ,CAAC;AAED,OAAO,MAAMK,GAAG,GAAG;EACjBP,sBAAsB;EACtBc,0BAA0B;EAC1BC;AACF,CAAC","ignoreList":[]}

package/lib/module/plugin/withMapLibre.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { createRunOncePlugin } from "@expo/config-plugins";
+import { createRunOncePlugin } from "expo/config-plugins";
 import { android } from "./android.js";
 import { ios } from "./ios.js";
 let pkg = {

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

@@ -1 +1 @@
-{"version":3,"names":["createRunOncePlugin","android","ios","pkg","name","require","withMapLibre","config","props","withGradleProperties","withDwarfDsym","withPodfileGlobalVariables","withPodfilePostInstall","version"],"sourceRoot":"../../../src","sources":["plugin/withMapLibre.ts"],"mappings":";;AAAA,SAA4BA,mBAAmB,QAAQ,sBAAsB;AAG7E,SAASC,OAAO,QAAQ,cAAW;AACnC,SAASC,GAAG,QAAQ,UAAO;AAE3B,IAAIC,GAAuC,GAAG;EAC5CC,IAAI,EAAE;AACR,CAAC;AACD,IAAI;EACFD,GAAG,GAAGE,OAAO,CAAC,8CAA8C,CAAC;AAC/D,CAAC,CAAC,MAAM;EACN;AAAA;AAGF,MAAMC,YAA+C,GAAGA,CAACC,MAAM,EAAEC,KAAK,KAAK;EACzE;EACAD,MAAM,GAAGN,OAAO,CAACQ,oBAAoB,CAACF,MAAM,EAAEC,KAAK,CAAC;;EAEpD;EACAD,MAAM,GAAGL,GAAG,CAACQ,aAAa,CAACH,MAAM,CAAC;EAClCA,MAAM,GAAGL,GAAG,CAACS,0BAA0B,CAACJ,MAAM,EAAEC,KAAK,CAAC;EACtDD,MAAM,GAAGL,GAAG,CAACU,sBAAsB,CAACL,MAAM,CAAC;EAE3C,OAAOA,MAAM;AACf,CAAC;AAED,eAAeP,mBAAmB,CAACM,YAAY,EAAEH,GAAG,CAACC,IAAI,EAAED,GAAG,CAACU,OAAO,CAAC","ignoreList":[]}
+{"version":3,"names":["createRunOncePlugin","android","ios","pkg","name","require","withMapLibre","config","props","withGradleProperties","withDwarfDsym","withPodfileGlobalVariables","withPodfilePostInstall","version"],"sourceRoot":"../../../src","sources":["plugin/withMapLibre.ts"],"mappings":";;AAAA,SAA4BA,mBAAmB,QAAQ,qBAAqB;AAG5E,SAASC,OAAO,QAAQ,cAAW;AACnC,SAASC,GAAG,QAAQ,UAAO;AAE3B,IAAIC,GAAuC,GAAG;EAC5CC,IAAI,EAAE;AACR,CAAC;AACD,IAAI;EACFD,GAAG,GAAGE,OAAO,CAAC,8CAA8C,CAAC;AAC/D,CAAC,CAAC,MAAM;EACN;AAAA;AAGF,MAAMC,YAA+C,GAAGA,CAACC,MAAM,EAAEC,KAAK,KAAK;EACzE;EACAD,MAAM,GAAGN,OAAO,CAACQ,oBAAoB,CAACF,MAAM,EAAEC,KAAK,CAAC;;EAEpD;EACAD,MAAM,GAAGL,GAAG,CAACQ,aAAa,CAACH,MAAM,CAAC;EAClCA,MAAM,GAAGL,GAAG,CAACS,0BAA0B,CAACJ,MAAM,EAAEC,KAAK,CAAC;EACtDD,MAAM,GAAGL,GAAG,CAACU,sBAAsB,CAACL,MAAM,CAAC;EAE3C,OAAOA,MAAM;AACf,CAAC;AAED,eAAeP,mBAAmB,CAACM,YAAY,EAAEH,GAAG,CAACC,IAAI,EAAED,GAAG,CAACU,OAAO,CAAC","ignoreList":[]}

package/lib/typescript/commonjs/plugin/android.d.ts

@@ -1,6 +1,6 @@
-import { type ConfigPlugin } from "@expo/config-plugins";
-import type { PropertiesItem } from "@expo/config-plugins/build/android/Properties";
+import { type AndroidConfig, type ConfigPlugin } from "expo/config-plugins";
 import type { MapLibrePluginProps } from "./MapLibrePluginProps";
+type PropertiesItem = AndroidConfig.Properties.PropertiesItem;
 type PropertyItem = {
     type: "property";
     key: string;

package/lib/typescript/commonjs/plugin/android.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"android.d.ts","sourceRoot":"","sources":["../../../../src/plugin/android.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EAElB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,UAAU,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,wBAAwB,8BAA8B,CAAC;AAEpE,eAAO,MAAM,mBAAmB,GAC9B,OAAO,mBAAmB,KACzB,YAAY,EAed,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAChC,eAAe,cAAc,EAAE,EAC/B,eAAe,YAAY,EAAE,KAC5B,cAAc,EAYhB,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,mBAAmB,CAWlE,CAAC;AAEF,eAAO,MAAM,OAAO;;CAEnB,CAAC"}
+{"version":3,"file":"android.d.ts","sourceRoot":"","sources":["../../../../src/plugin/android.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,YAAY,EAElB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,KAAK,cAAc,GAAG,aAAa,CAAC,UAAU,CAAC,cAAc,CAAC;AAE9D,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,UAAU,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,wBAAwB,8BAA8B,CAAC;AAEpE,eAAO,MAAM,mBAAmB,GAC9B,OAAO,mBAAmB,KACzB,YAAY,EAed,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAChC,eAAe,cAAc,EAAE,EAC/B,eAAe,YAAY,EAAE,KAC5B,cAAc,EAYhB,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,mBAAmB,CAWlE,CAAC;AAEF,eAAO,MAAM,OAAO;;CAEnB,CAAC"}

package/lib/typescript/commonjs/plugin/ios.d.ts

@@ -1,4 +1,4 @@
-import { type ConfigPlugin } from "@expo/config-plugins";
+import { type ConfigPlugin } from "expo/config-plugins";
 import type { MapLibrePluginProps } from "./MapLibrePluginProps";
 /**
  * Only the post-install block is required, the post installer block is used for

package/lib/typescript/commonjs/plugin/ios.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../../../src/plugin/ios.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EAGlB,MAAM,sBAAsB,CAAC;AAM9B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAIjE;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAehE;AAUD,eAAO,MAAM,2BAA2B,GACtC,UAAU,MAAM,EAChB,OAAO,mBAAmB,KACzB,MA2BF,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,YAAY,CAAC,mBAAmB,CAYxE,CAAC;AAsBF,eAAO,MAAM,GAAG;;;;CAIf,CAAC"}
+{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../../../src/plugin/ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,YAAY,EAGlB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAMjE;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAehE;AAUD,eAAO,MAAM,2BAA2B,GACtC,UAAU,MAAM,EAChB,OAAO,mBAAmB,KACzB,MA2BF,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,YAAY,CAAC,mBAAmB,CAYxE,CAAC;AAsBF,eAAO,MAAM,GAAG;;;;CAIf,CAAC"}

package/lib/typescript/commonjs/plugin/withMapLibre.d.ts

@@ -1,4 +1,4 @@
-import { type ConfigPlugin } from "@expo/config-plugins";
+import { type ConfigPlugin } from "expo/config-plugins";
 import type { MapLibrePluginProps } from "./MapLibrePluginProps";
 declare const _default: ConfigPlugin<MapLibrePluginProps>;
 export default _default;

package/lib/typescript/commonjs/plugin/withMapLibre.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withMapLibre.d.ts","sourceRoot":"","sources":["../../../../src/plugin/withMapLibre.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAuB,MAAM,sBAAsB,CAAC;AAE9E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;;AAyBjE,wBAAwE"}
+{"version":3,"file":"withMapLibre.d.ts","sourceRoot":"","sources":["../../../../src/plugin/withMapLibre.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAuB,MAAM,qBAAqB,CAAC;AAE7E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;;AAyBjE,wBAAwE"}

package/lib/typescript/module/plugin/android.d.ts

@@ -1,6 +1,6 @@
-import { type ConfigPlugin } from "@expo/config-plugins";
-import type { PropertiesItem } from "@expo/config-plugins/build/android/Properties";
+import { type AndroidConfig, type ConfigPlugin } from "expo/config-plugins";
 import type { MapLibrePluginProps } from "./MapLibrePluginProps";
+type PropertiesItem = AndroidConfig.Properties.PropertiesItem;
 type PropertyItem = {
     type: "property";
     key: string;

package/lib/typescript/module/plugin/android.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"android.d.ts","sourceRoot":"","sources":["../../../../src/plugin/android.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EAElB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,UAAU,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,wBAAwB,8BAA8B,CAAC;AAEpE,eAAO,MAAM,mBAAmB,GAC9B,OAAO,mBAAmB,KACzB,YAAY,EAed,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAChC,eAAe,cAAc,EAAE,EAC/B,eAAe,YAAY,EAAE,KAC5B,cAAc,EAYhB,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,mBAAmB,CAWlE,CAAC;AAEF,eAAO,MAAM,OAAO;;CAEnB,CAAC"}
+{"version":3,"file":"android.d.ts","sourceRoot":"","sources":["../../../../src/plugin/android.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,YAAY,EAElB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,KAAK,cAAc,GAAG,aAAa,CAAC,UAAU,CAAC,cAAc,CAAC;AAE9D,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,UAAU,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,wBAAwB,8BAA8B,CAAC;AAEpE,eAAO,MAAM,mBAAmB,GAC9B,OAAO,mBAAmB,KACzB,YAAY,EAed,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAChC,eAAe,cAAc,EAAE,EAC/B,eAAe,YAAY,EAAE,KAC5B,cAAc,EAYhB,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,mBAAmB,CAWlE,CAAC;AAEF,eAAO,MAAM,OAAO;;CAEnB,CAAC"}

package/lib/typescript/module/plugin/ios.d.ts

@@ -1,4 +1,4 @@
-import { type ConfigPlugin } from "@expo/config-plugins";
+import { type ConfigPlugin } from "expo/config-plugins";
 import type { MapLibrePluginProps } from "./MapLibrePluginProps";
 /**
  * Only the post-install block is required, the post installer block is used for

package/lib/typescript/module/plugin/ios.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../../../src/plugin/ios.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EAGlB,MAAM,sBAAsB,CAAC;AAM9B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAIjE;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAehE;AAUD,eAAO,MAAM,2BAA2B,GACtC,UAAU,MAAM,EAChB,OAAO,mBAAmB,KACzB,MA2BF,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,YAAY,CAAC,mBAAmB,CAYxE,CAAC;AAsBF,eAAO,MAAM,GAAG;;;;CAIf,CAAC"}
+{"version":3,"file":"ios.d.ts","sourceRoot":"","sources":["../../../../src/plugin/ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,YAAY,EAGlB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAMjE;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAehE;AAUD,eAAO,MAAM,2BAA2B,GACtC,UAAU,MAAM,EAChB,OAAO,mBAAmB,KACzB,MA2BF,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,YAAY,CAAC,mBAAmB,CAYxE,CAAC;AAsBF,eAAO,MAAM,GAAG;;;;CAIf,CAAC"}

package/lib/typescript/module/plugin/withMapLibre.d.ts

@@ -1,4 +1,4 @@
-import { type ConfigPlugin } from "@expo/config-plugins";
+import { type ConfigPlugin } from "expo/config-plugins";
 import type { MapLibrePluginProps } from "./MapLibrePluginProps";
 declare const _default: ConfigPlugin<MapLibrePluginProps>;
 export default _default;

package/lib/typescript/module/plugin/withMapLibre.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withMapLibre.d.ts","sourceRoot":"","sources":["../../../../src/plugin/withMapLibre.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAuB,MAAM,sBAAsB,CAAC;AAE9E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;;AAyBjE,wBAAwE"}
+{"version":3,"file":"withMapLibre.d.ts","sourceRoot":"","sources":["../../../../src/plugin/withMapLibre.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAuB,MAAM,qBAAqB,CAAC;AAE7E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;;AAyBjE,wBAAwE"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@maplibre/maplibre-react-native",
   "description": "React Native library for creating maps with MapLibre Native for Android & iOS",
-  "version": "11.3.1",
+  "version": "11.3.3",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -138,21 +138,21 @@
     }
   },
   "peerDependencies": {
-    "@expo/config-plugins": ">=54.0.0",
     "@types/geojson": "^7946.0.0",
     "@types/react": ">=19.1.0",
+    "expo": ">=54.0.0",
     "react": ">=19.1.0",
     "react-native": ">=0.80.0"
   },
   "peerDependenciesMeta": {
-    "@expo/config-plugins": {
-      "optional": true
-    },
     "@types/geojson": {
       "optional": true
     },
     "@types/react": {
       "optional": true
+    },
+    "expo": {
+      "optional": true
     }
   },
   "dependencies": {
@@ -163,7 +163,6 @@
     "@turf/nearest-point-on-line": "^7.3.5"
   },
   "devDependencies": {
-    "@expo/config-plugins": "56.0.8",
     "@react-native-community/cli": "20.1.3",
     "@react-native/babel-preset": "0.85.3",
     "@react-native/jest-preset": "0.85.3",
@@ -177,6 +176,7 @@
     "@types/react": "19.2.14",
     "eslint": "9.39.4",
     "eslint-config-universe": "15.0.4",
+    "expo": "56.0.8",
     "jest": "29.7.0",
     "prettier": "3.8.3",
     "react": "19.2.3",

package/src/plugin/android.ts

@@ -1,11 +1,13 @@
 import {
+  type AndroidConfig,
   type ConfigPlugin,
   withGradleProperties as withGradlePropertiesExpo,
-} from "@expo/config-plugins";
-import type { PropertiesItem } from "@expo/config-plugins/build/android/Properties";
+} from "expo/config-plugins";
 
 import type { MapLibrePluginProps } from "./MapLibrePluginProps";
 
+type PropertiesItem = AndroidConfig.Properties.PropertiesItem;
+
 type PropertyItem = {
   type: "property";
   key: string;

package/src/plugin/ios.ts

@@ -1,15 +1,14 @@
 import {
+  CodeGenerator,
   type ConfigPlugin,
   withPodfile,
   withXcodeProject,
-} from "@expo/config-plugins";
-import {
-  mergeContents,
-  removeGeneratedContents,
-} from "@expo/config-plugins/build/utils/generateCode";
+} from "expo/config-plugins";
 
 import type { MapLibrePluginProps } from "./MapLibrePluginProps";
 
+const { mergeContents, removeGeneratedContents } = CodeGenerator;
+
 const TAG_PREFIX = `@maplibre/maplibre-react-native`;
 
 /**

package/src/plugin/withMapLibre.ts

@@ -1,4 +1,4 @@
-import { type ConfigPlugin, createRunOncePlugin } from "@expo/config-plugins";
+import { type ConfigPlugin, createRunOncePlugin } from "expo/config-plugins";
 
 import type { MapLibrePluginProps } from "./MapLibrePluginProps";
 import { android } from "./android";