@maplibre/maplibre-react-native 10.0.1 → 10.1.0-beta.1

package/android/build.gradle

@@ -36,7 +36,7 @@ def getExtOrDefault(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]
+  return rootProject.ext.has("org.maplibre.reactnative." + name) ? rootProject.ext.get("org.maplibre.reactnative." + name) : project.properties["org.maplibre.reactnative." + name]
 }
 
 def getExtOrIntegerDefault(name) {
@@ -117,12 +117,18 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
   // MapLibre Native
-  implementation "org.maplibre.gl:android-sdk:${getConfigurableExtOrDefault('nativeVersion')}"
+  implementation "org.maplibre.gl:android-sdk-${getConfigurableExtOrDefault('nativeVariant')}:${getConfigurableExtOrDefault('nativeVersion')}"
 
   // MapLibre Plugins
-  implementation "org.maplibre.gl:android-plugin-localization-v9:${getConfigurableExtOrDefault('pluginVersion')}"
-  implementation "org.maplibre.gl:android-plugin-annotation-v9:${getConfigurableExtOrDefault('pluginVersion')}"
-  implementation "org.maplibre.gl:android-plugin-markerview-v9:${getConfigurableExtOrDefault('pluginVersion')}"
+  implementation("org.maplibre.gl:android-plugin-localization-v9:${getConfigurableExtOrDefault('pluginVersion')}") {
+    exclude(group: "org.maplibre.gl", module: "android-sdk")
+  }
+  implementation("org.maplibre.gl:android-plugin-annotation-v9:${getConfigurableExtOrDefault('pluginVersion')}") {
+    exclude(group: "org.maplibre.gl", module: "android-sdk")
+  }
+  implementation("org.maplibre.gl:android-plugin-markerview-v9:${getConfigurableExtOrDefault('pluginVersion')}") {
+    exclude(group: "org.maplibre.gl", module: "android-sdk")
+  }
 
   // Dependencies
   implementation "org.maplibre.gl:android-sdk-turf:${getConfigurableExtOrDefault('turfVersion')}"

package/android/gradle.properties

@@ -6,6 +6,7 @@ org.maplibre.reactnative.ndkVersion=21.4.7075529
 
 # MapLibre React Native
 org.maplibre.reactnative.nativeVersion=11.8.0
+org.maplibre.reactnative.nativeVariant=opengl
 org.maplibre.reactnative.pluginVersion=3.0.2
 org.maplibre.reactnative.turfVersion=6.0.1
 org.maplibre.reactnative.okhttpVersion=4.9.0

package/lib/commonjs/plugin/android.js

@@ -3,15 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.withGradleProperties = exports.mergeGradleProperties = exports.getGradleProperties = exports.android = exports.GRADLE_PROPERTIES_PREFIX = void 0;
+exports.withGradleProperties = exports.mergeGradleProperties = exports.getGradleProperties = exports.android = void 0;
 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]) => {
     if (key && value) {
       properties.push({
         type: "property",
-        key: `${GRADLE_PROPERTIES_PREFIX}${key}`,
+        key: `org.maplibre.reactnative.${key}`,
         value: value.toString()
       });
     }
@@ -20,7 +19,10 @@ const getGradleProperties = props => {
 };
 exports.getGradleProperties = getGradleProperties;
 const mergeGradleProperties = (oldProperties, newProperties) => {
-  const merged = oldProperties.filter(item => !(item.type === "property" && item.key.startsWith(GRADLE_PROPERTIES_PREFIX)));
+  const newPropertiesKeys = newProperties.map(({
+    key
+  }) => key);
+  const merged = oldProperties.filter(item => !(item.type === "property" && newPropertiesKeys.includes(item.key)));
   merged.push(...newProperties);
   return merged;
 };

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","getGradleProperties","props","Object","entries","android","reduce","properties","key","value","push","type","toString","exports","mergeGradleProperties","oldProperties","newProperties","newPropertiesKeys","map","merged","filter","item","includes","withGradleProperties","config","gradleProperties","withGradlePropertiesExpo","c","modResults"],"sourceRoot":"../../../src","sources":["plugin/android.ts"],"mappings":";;;;;;AAAA,IAAAA,cAAA,GAAAC,OAAA;AAcO,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,4BAA4BA,GAAG,EAAE;QACtCC,KAAK,EAAEA,KAAK,CAACG,QAAQ,CAAC;MACxB,CAAC,CAAC;IACJ;IAEA,OAAOL,UAAU;EACnB,CAAC,EACD,EACF,CAAC;AACH,CAAC;AAACM,OAAA,CAAAZ,mBAAA,GAAAA,mBAAA;AAEK,MAAMa,qBAAqB,GAAGA,CACnCC,aAA+B,EAC/BC,aAA6B,KACR;EACrB,MAAMC,iBAAiB,GAAGD,aAAa,CAACE,GAAG,CAAC,CAAC;IAAEV;EAAI,CAAC,KAAKA,GAAG,CAAC;EAC7D,MAAMW,MAAM,GAAGJ,aAAa,CAACK,MAAM,CAChCC,IAAI,IACH,EAAEA,IAAI,CAACV,IAAI,KAAK,UAAU,IAAIM,iBAAiB,CAACK,QAAQ,CAACD,IAAI,CAACb,GAAG,CAAC,CACtE,CAAC;EAEDW,MAAM,CAACT,IAAI,CAAC,GAAGM,aAAa,CAAC;EAE7B,OAAOG,MAAM;AACf,CAAC;AAACN,OAAA,CAAAC,qBAAA,GAAAA,qBAAA;AAEK,MAAMS,oBAAuD,GAAGA,CACrEC,MAAM,EACNtB,KAAK,KACF;EACH,MAAMuB,gBAAgB,GAAGxB,mBAAmB,CAACC,KAAK,CAAC;EAEnD,OAAO,IAAAwB,mCAAwB,EAACF,MAAM,EAAGG,CAAC,IAAK;IAC7CA,CAAC,CAACC,UAAU,GAAGd,qBAAqB,CAACa,CAAC,CAACC,UAAU,EAAEH,gBAAgB,CAAC;IAEpE,OAAOE,CAAC;EACV,CAAC,CAAC;AACJ,CAAC;AAACd,OAAA,CAAAU,oBAAA,GAAAA,oBAAA;AAEK,MAAMlB,OAAO,GAAAQ,OAAA,CAAAR,OAAA,GAAG;EACrBkB;AACF,CAAC","ignoreList":[]}

package/lib/module/plugin/android.js

@@ -1,13 +1,12 @@
 "use strict";
 
 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]) => {
     if (key && value) {
       properties.push({
         type: "property",
-        key: `${GRADLE_PROPERTIES_PREFIX}${key}`,
+        key: `org.maplibre.reactnative.${key}`,
         value: value.toString()
       });
     }
@@ -15,7 +14,10 @@ export const getGradleProperties = props => {
   }, []);
 };
 export const mergeGradleProperties = (oldProperties, newProperties) => {
-  const merged = oldProperties.filter(item => !(item.type === "property" && item.key.startsWith(GRADLE_PROPERTIES_PREFIX)));
+  const newPropertiesKeys = newProperties.map(({
+    key
+  }) => key);
+  const merged = oldProperties.filter(item => !(item.type === "property" && newPropertiesKeys.includes(item.key)));
   merged.push(...newProperties);
   return merged;
 };

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","getGradleProperties","props","Object","entries","android","reduce","properties","key","value","push","type","toString","mergeGradleProperties","oldProperties","newProperties","newPropertiesKeys","map","merged","filter","item","includes","config","gradleProperties","c","modResults"],"sourceRoot":"../../../src","sources":["plugin/android.ts"],"mappings":";;AAAA,SAEEA,oBAAoB,IAAIC,wBAAwB,QAC3C,sBAAsB;AAW7B,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,4BAA4BA,GAAG,EAAE;QACtCC,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,iBAAiB,GAAGD,aAAa,CAACE,GAAG,CAAC,CAAC;IAAET;EAAI,CAAC,KAAKA,GAAG,CAAC;EAC7D,MAAMU,MAAM,GAAGJ,aAAa,CAACK,MAAM,CAChCC,IAAI,IACH,EAAEA,IAAI,CAACT,IAAI,KAAK,UAAU,IAAIK,iBAAiB,CAACK,QAAQ,CAACD,IAAI,CAACZ,GAAG,CAAC,CACtE,CAAC;EAEDU,MAAM,CAACR,IAAI,CAAC,GAAGK,aAAa,CAAC;EAE7B,OAAOG,MAAM;AACf,CAAC;AAED,OAAO,MAAMnB,oBAAuD,GAAGA,CACrEuB,MAAM,EACNpB,KAAK,KACF;EACH,MAAMqB,gBAAgB,GAAGtB,mBAAmB,CAACC,KAAK,CAAC;EAEnD,OAAOF,wBAAwB,CAACsB,MAAM,EAAGE,CAAC,IAAK;IAC7CA,CAAC,CAACC,UAAU,GAAGZ,qBAAqB,CAACW,CAAC,CAACC,UAAU,EAAEF,gBAAgB,CAAC;IAEpE,OAAOC,CAAC;EACV,CAAC,CAAC;AACJ,CAAC;AAED,OAAO,MAAMnB,OAAO,GAAG;EACrBN;AACF,CAAC","ignoreList":[]}

package/lib/typescript/commonjs/src/plugin/MapLibrePluginProps.d.ts

@@ -7,9 +7,15 @@ export type MapLibrePluginProps = {
      */
     android?: {
         /**
-         * Version for `org.maplibre.gl:android-sdk`
+         * Version for `org.maplibre.gl:android-sdk-*`
          */
         nativeVersion?: VersionString;
+        /**
+         * Variant of `org.maplibre.gl:android-sdk-*`
+         *
+         * @default "vulkan"
+         */
+        nativeVariant?: "opengl" | "vulkan";
         /**
          * Version for `org.maplibre.gl:android-plugin-*-v9`
          */

package/lib/typescript/commonjs/src/plugin/MapLibrePluginProps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MapLibrePluginProps.d.ts","sourceRoot":"","sources":["../../../../../src/plugin/MapLibrePluginProps.ts"],"names":[],"mappings":"AAAA,KAAK,aAAa,GACd,GAAG,MAAM,IAAI,MAAM,IAAI,MAAM,EAAE,GAC/B,GAAG,MAAM,IAAI,MAAM,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;AAE9C,MAAM,MAAM,mBAAmB,GAC3B;IACE;;;;OAIG;IACH,OAAO,CAAC,EAAE;QACR;;WAEG;QACH,aAAa,CAAC,EAAE,aAAa,CAAC;QAC9B;;WAEG;QACH,aAAa,CAAC,EAAE,aAAa,CAAC;QAC9B;;WAEG;QACH,WAAW,CAAC,EAAE,aAAa,CAAC;QAC5B;;WAEG;QACH,aAAa,CAAC,EAAE,aAAa,CAAC;QAE9B;;;;;;;WAOG;QACH,cAAc,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAC;QACtC;;WAEG;QACH,iCAAiC,CAAC,EAAE,aAAa,CAAC;KACnD,CAAC;IAEF;;;;OAIG;IACH,GAAG,CAAC,EAAE;QACJ;;WAEG;QACH,aAAa,CAAC,EAAE,aAAa,CAAC;QAE9B;;;;;;;;;;;;;;;;;;;;;;;WAuBG;QACH,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;CACH,GACD,SAAS,CAAC"}
+{"version":3,"file":"MapLibrePluginProps.d.ts","sourceRoot":"","sources":["../../../../../src/plugin/MapLibrePluginProps.ts"],"names":[],"mappings":"AAAA,KAAK,aAAa,GACd,GAAG,MAAM,IAAI,MAAM,IAAI,MAAM,EAAE,GAC/B,GAAG,MAAM,IAAI,MAAM,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;AAE9C,MAAM,MAAM,mBAAmB,GAC3B;IACE;;;;OAIG;IACH,OAAO,CAAC,EAAE;QACR;;WAEG;QACH,aAAa,CAAC,EAAE,aAAa,CAAC;QAC9B;;;;WAIG;QACH,aAAa,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;QACpC;;WAEG;QACH,aAAa,CAAC,EAAE,aAAa,CAAC;QAC9B;;WAEG;QACH,WAAW,CAAC,EAAE,aAAa,CAAC;QAC5B;;WAEG;QACH,aAAa,CAAC,EAAE,aAAa,CAAC;QAE9B;;;;;;;WAOG;QACH,cAAc,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAC;QACtC;;WAEG;QACH,iCAAiC,CAAC,EAAE,aAAa,CAAC;KACnD,CAAC;IAEF;;;;OAIG;IACH,GAAG,CAAC,EAAE;QACJ;;WAEG;QACH,aAAa,CAAC,EAAE,aAAa,CAAC;QAE9B;;;;;;;;;;;;;;;;;;;;;;;WAuBG;QACH,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;CACH,GACD,SAAS,CAAC"}

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

@@ -6,7 +6,6 @@ type PropertyItem = {
     key: string;
     value: string;
 };
-export declare const GRADLE_PROPERTIES_PREFIX = "org.maplibre.reactnative.";
 export declare const getGradleProperties: (props: MapLibrePluginProps) => PropertyItem[];
 export declare const mergeGradleProperties: (oldProperties: PropertiesItem[], newProperties: PropertyItem[]) => PropertiesItem[];
 export declare const withGradleProperties: ConfigPlugin<MapLibrePluginProps>;

package/lib/typescript/commonjs/src/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,UACvB,mBAAmB,KACzB,YAAY,EAed,CAAC;AAEF,eAAO,MAAM,qBAAqB,kBACjB,cAAc,EAAE,iBAChB,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,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,mBAAmB,UACvB,mBAAmB,KACzB,YAAY,EAed,CAAC;AAEF,eAAO,MAAM,qBAAqB,kBACjB,cAAc,EAAE,iBAChB,YAAY,EAAE,KAC5B,cAAc,EAUhB,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,mBAAmB,CAWlE,CAAC;AAEF,eAAO,MAAM,OAAO;;CAEnB,CAAC"}

package/lib/typescript/module/src/plugin/MapLibrePluginProps.d.ts

@@ -7,9 +7,15 @@ export type MapLibrePluginProps = {
      */
     android?: {
         /**
-         * Version for `org.maplibre.gl:android-sdk`
+         * Version for `org.maplibre.gl:android-sdk-*`
          */
         nativeVersion?: VersionString;
+        /**
+         * Variant of `org.maplibre.gl:android-sdk-*`
+         *
+         * @default "vulkan"
+         */
+        nativeVariant?: "opengl" | "vulkan";
         /**
          * Version for `org.maplibre.gl:android-plugin-*-v9`
          */

package/lib/typescript/module/src/plugin/MapLibrePluginProps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MapLibrePluginProps.d.ts","sourceRoot":"","sources":["../../../../../src/plugin/MapLibrePluginProps.ts"],"names":[],"mappings":"AAAA,KAAK,aAAa,GACd,GAAG,MAAM,IAAI,MAAM,IAAI,MAAM,EAAE,GAC/B,GAAG,MAAM,IAAI,MAAM,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;AAE9C,MAAM,MAAM,mBAAmB,GAC3B;IACE;;;;OAIG;IACH,OAAO,CAAC,EAAE;QACR;;WAEG;QACH,aAAa,CAAC,EAAE,aAAa,CAAC;QAC9B;;WAEG;QACH,aAAa,CAAC,EAAE,aAAa,CAAC;QAC9B;;WAEG;QACH,WAAW,CAAC,EAAE,aAAa,CAAC;QAC5B;;WAEG;QACH,aAAa,CAAC,EAAE,aAAa,CAAC;QAE9B;;;;;;;WAOG;QACH,cAAc,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAC;QACtC;;WAEG;QACH,iCAAiC,CAAC,EAAE,aAAa,CAAC;KACnD,CAAC;IAEF;;;;OAIG;IACH,GAAG,CAAC,EAAE;QACJ;;WAEG;QACH,aAAa,CAAC,EAAE,aAAa,CAAC;QAE9B;;;;;;;;;;;;;;;;;;;;;;;WAuBG;QACH,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;CACH,GACD,SAAS,CAAC"}
+{"version":3,"file":"MapLibrePluginProps.d.ts","sourceRoot":"","sources":["../../../../../src/plugin/MapLibrePluginProps.ts"],"names":[],"mappings":"AAAA,KAAK,aAAa,GACd,GAAG,MAAM,IAAI,MAAM,IAAI,MAAM,EAAE,GAC/B,GAAG,MAAM,IAAI,MAAM,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;AAE9C,MAAM,MAAM,mBAAmB,GAC3B;IACE;;;;OAIG;IACH,OAAO,CAAC,EAAE;QACR;;WAEG;QACH,aAAa,CAAC,EAAE,aAAa,CAAC;QAC9B;;;;WAIG;QACH,aAAa,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;QACpC;;WAEG;QACH,aAAa,CAAC,EAAE,aAAa,CAAC;QAC9B;;WAEG;QACH,WAAW,CAAC,EAAE,aAAa,CAAC;QAC5B;;WAEG;QACH,aAAa,CAAC,EAAE,aAAa,CAAC;QAE9B;;;;;;;WAOG;QACH,cAAc,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAC;QACtC;;WAEG;QACH,iCAAiC,CAAC,EAAE,aAAa,CAAC;KACnD,CAAC;IAEF;;;;OAIG;IACH,GAAG,CAAC,EAAE;QACJ;;WAEG;QACH,aAAa,CAAC,EAAE,aAAa,CAAC;QAE9B;;;;;;;;;;;;;;;;;;;;;;;WAuBG;QACH,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;CACH,GACD,SAAS,CAAC"}

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

@@ -6,7 +6,6 @@ type PropertyItem = {
     key: string;
     value: string;
 };
-export declare const GRADLE_PROPERTIES_PREFIX = "org.maplibre.reactnative.";
 export declare const getGradleProperties: (props: MapLibrePluginProps) => PropertyItem[];
 export declare const mergeGradleProperties: (oldProperties: PropertiesItem[], newProperties: PropertyItem[]) => PropertiesItem[];
 export declare const withGradleProperties: ConfigPlugin<MapLibrePluginProps>;

package/lib/typescript/module/src/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,UACvB,mBAAmB,KACzB,YAAY,EAed,CAAC;AAEF,eAAO,MAAM,qBAAqB,kBACjB,cAAc,EAAE,iBAChB,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,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,mBAAmB,UACvB,mBAAmB,KACzB,YAAY,EAed,CAAC;AAEF,eAAO,MAAM,qBAAqB,kBACjB,cAAc,EAAE,iBAChB,YAAY,EAAE,KAC5B,cAAc,EAUhB,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,mBAAmB,CAWlE,CAAC;AAEF,eAAO,MAAM,OAAO;;CAEnB,CAAC"}

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": "10.0.1",
+  "version": "10.1.0-beta.1",
   "publishConfig": {
     "access": "public",
     "provenance": true

package/src/plugin/MapLibrePluginProps.ts

@@ -11,9 +11,15 @@ export type MapLibrePluginProps =
        */
       android?: {
         /**
-         * Version for `org.maplibre.gl:android-sdk`
+         * Version for `org.maplibre.gl:android-sdk-*`
          */
         nativeVersion?: VersionString;
+        /**
+         * Variant of `org.maplibre.gl:android-sdk-*`
+         *
+         * @default "vulkan"
+         */
+        nativeVariant?: "opengl" | "vulkan";
         /**
          * Version for `org.maplibre.gl:android-plugin-*-v9`
          */

package/src/plugin/android.ts

@@ -12,8 +12,6 @@ type PropertyItem = {
   value: string;
 };
 
-export const GRADLE_PROPERTIES_PREFIX = "org.maplibre.reactnative.";
-
 export const getGradleProperties = (
   props: MapLibrePluginProps,
 ): PropertyItem[] => {
@@ -22,7 +20,7 @@ export const getGradleProperties = (
       if (key && value) {
         properties.push({
           type: "property",
-          key: `${GRADLE_PROPERTIES_PREFIX}${key}`,
+          key: `org.maplibre.reactnative.${key}`,
           value: value.toString(),
         });
       }
@@ -37,12 +35,10 @@ export const mergeGradleProperties = (
   oldProperties: PropertiesItem[],
   newProperties: PropertyItem[],
 ): PropertiesItem[] => {
+  const newPropertiesKeys = newProperties.map(({ key }) => key);
   const merged = oldProperties.filter(
     (item) =>
-      !(
-        item.type === "property" &&
-        item.key.startsWith(GRADLE_PROPERTIES_PREFIX)
-      ),
+      !(item.type === "property" && newPropertiesKeys.includes(item.key)),
   );
 
   merged.push(...newProperties);