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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (16) hide show
  1. package/android/gradle.properties +1 -1
  2. package/ios/MLRN/MLRNVectorSource.m +1 -1
  3. package/lib/commonjs/plugin/android.js +4 -6
  4. package/lib/commonjs/plugin/android.js.map +1 -1
  5. package/lib/module/plugin/android.js +3 -5
  6. package/lib/module/plugin/android.js.map +1 -1
  7. package/lib/typescript/commonjs/src/plugin/MapLibrePluginProps.d.ts +1 -1
  8. package/lib/typescript/commonjs/src/plugin/android.d.ts +1 -0
  9. package/lib/typescript/commonjs/src/plugin/android.d.ts.map +1 -1
  10. package/lib/typescript/module/src/plugin/MapLibrePluginProps.d.ts +1 -1
  11. package/lib/typescript/module/src/plugin/android.d.ts +1 -0
  12. package/lib/typescript/module/src/plugin/android.d.ts.map +1 -1
  13. package/maplibre-react-native.podspec +1 -1
  14. package/package.json +1 -1
  15. package/src/plugin/MapLibrePluginProps.ts +1 -1
  16. package/src/plugin/android.ts +7 -3
package/android/gradle.properties CHANGED
@@ -5,7 +5,7 @@ org.maplibre.reactnative.compileSdkVersion=31
5
5
  org.maplibre.reactnative.ndkVersion=21.4.7075529
6
6
 
7
7
  # MapLibre React Native
8
- org.maplibre.reactnative.nativeVersion=11.8.0
8
+ org.maplibre.reactnative.nativeVersion=11.8.1
9
9
  org.maplibre.reactnative.nativeVariant=opengl
10
10
  org.maplibre.reactnative.pluginVersion=3.0.2
11
11
  org.maplibre.reactnative.turfVersion=6.0.1
package/ios/MLRN/MLRNVectorSource.m CHANGED
@@ -5,7 +5,7 @@
5
5
  - (nullable MLNSource*)makeSource
6
6
  {
7
7
  if (self.url != nil) {
8
- return [[MLNVectorTileSource alloc] initWithIdentifier:self.id configurationURL:[NSURL URLWithString:self.url]];
8
+ return [[MLNVectorTileSource alloc] initWithIdentifier:self.id configurationURLString:self.url];
9
9
  }
10
10
  return [[MLNVectorTileSource alloc] initWithIdentifier:self.id tileURLTemplates:self.tileUrlTemplates options:[self getOptions]];
11
11
  }
package/lib/commonjs/plugin/android.js CHANGED
@@ -3,14 +3,15 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.withGradleProperties = exports.mergeGradleProperties = exports.getGradleProperties = exports.android = void 0;
6
+ exports.withGradleProperties = exports.mergeGradleProperties = exports.getGradleProperties = exports.android = exports.GRADLE_PROPERTIES_PREFIX = void 0;
7
7
  var _configPlugins = require("@expo/config-plugins");
8
+ const GRADLE_PROPERTIES_PREFIX = exports.GRADLE_PROPERTIES_PREFIX = "org.maplibre.reactnative.";
8
9
  const getGradleProperties = props => {
9
10
  return Object.entries(props?.android || {}).reduce((properties, [key, value]) => {
10
11
  if (key && value) {
11
12
  properties.push({
12
13
  type: "property",
13
- key: `org.maplibre.reactnative.${key}`,
14
+ key: `${GRADLE_PROPERTIES_PREFIX}${key}`,
14
15
  value: value.toString()
15
16
  });
16
17
  }
@@ -19,10 +20,7 @@ const getGradleProperties = props => {
19
20
  };
20
21
  exports.getGradleProperties = getGradleProperties;
21
22
  const mergeGradleProperties = (oldProperties, newProperties) => {
22
- const newPropertiesKeys = newProperties.map(({
23
- key
24
- }) => key);
25
- const merged = oldProperties.filter(item => !(item.type === "property" && newPropertiesKeys.includes(item.key)));
23
+ const merged = oldProperties.filter(item => !(item.type === "property" && item.key.startsWith(GRADLE_PROPERTIES_PREFIX)));
26
24
  merged.push(...newProperties);
27
25
  return merged;
28
26
  };
package/lib/commonjs/plugin/android.js.map CHANGED
@@ -1 +1 @@
1
- {"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":[]}
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":[]}
package/lib/module/plugin/android.js CHANGED
@@ -1,12 +1,13 @@
1
1
  "use strict";
2
2
 
3
3
  import { withGradleProperties as withGradlePropertiesExpo } from "@expo/config-plugins";
4
+ export const GRADLE_PROPERTIES_PREFIX = "org.maplibre.reactnative.";
4
5
  export const getGradleProperties = props => {
5
6
  return Object.entries(props?.android || {}).reduce((properties, [key, value]) => {
6
7
  if (key && value) {
7
8
  properties.push({
8
9
  type: "property",
9
- key: `org.maplibre.reactnative.${key}`,
10
+ key: `${GRADLE_PROPERTIES_PREFIX}${key}`,
10
11
  value: value.toString()
11
12
  });
12
13
  }
@@ -14,10 +15,7 @@ export const getGradleProperties = props => {
14
15
  }, []);
15
16
  };
16
17
  export const mergeGradleProperties = (oldProperties, newProperties) => {
17
- const newPropertiesKeys = newProperties.map(({
18
- key
19
- }) => key);
20
- const merged = oldProperties.filter(item => !(item.type === "property" && newPropertiesKeys.includes(item.key)));
18
+ const merged = oldProperties.filter(item => !(item.type === "property" && item.key.startsWith(GRADLE_PROPERTIES_PREFIX)));
21
19
  merged.push(...newProperties);
22
20
  return merged;
23
21
  };
package/lib/module/plugin/android.js.map CHANGED
@@ -1 +1 @@
1
- {"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":[]}
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":[]}
package/lib/typescript/commonjs/src/plugin/MapLibrePluginProps.d.ts CHANGED
@@ -13,7 +13,7 @@ export type MapLibrePluginProps = {
13
13
  /**
14
14
  * Variant of `org.maplibre.gl:android-sdk-*`
15
15
  *
16
- * @default "vulkan"
16
+ * @default "opengl"
17
17
  */
18
18
  nativeVariant?: "opengl" | "vulkan";
19
19
  /**
package/lib/typescript/commonjs/src/plugin/android.d.ts CHANGED
@@ -6,6 +6,7 @@ type PropertyItem = {
6
6
  key: string;
7
7
  value: string;
8
8
  };
9
+ export declare const GRADLE_PROPERTIES_PREFIX = "org.maplibre.reactnative.";
9
10
  export declare const getGradleProperties: (props: MapLibrePluginProps) => PropertyItem[];
10
11
  export declare const mergeGradleProperties: (oldProperties: PropertiesItem[], newProperties: PropertyItem[]) => PropertiesItem[];
11
12
  export declare const withGradleProperties: ConfigPlugin<MapLibrePluginProps>;
package/lib/typescript/commonjs/src/plugin/android.d.ts.map CHANGED
@@ -1 +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,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"}
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"}
package/lib/typescript/module/src/plugin/MapLibrePluginProps.d.ts CHANGED
@@ -13,7 +13,7 @@ export type MapLibrePluginProps = {
13
13
  /**
14
14
  * Variant of `org.maplibre.gl:android-sdk-*`
15
15
  *
16
- * @default "vulkan"
16
+ * @default "opengl"
17
17
  */
18
18
  nativeVariant?: "opengl" | "vulkan";
19
19
  /**
package/lib/typescript/module/src/plugin/android.d.ts CHANGED
@@ -6,6 +6,7 @@ type PropertyItem = {
6
6
  key: string;
7
7
  value: string;
8
8
  };
9
+ export declare const GRADLE_PROPERTIES_PREFIX = "org.maplibre.reactnative.";
9
10
  export declare const getGradleProperties: (props: MapLibrePluginProps) => PropertyItem[];
10
11
  export declare const mergeGradleProperties: (oldProperties: PropertiesItem[], newProperties: PropertyItem[]) => PropertiesItem[];
11
12
  export declare const withGradleProperties: ConfigPlugin<MapLibrePluginProps>;
package/lib/typescript/module/src/plugin/android.d.ts.map CHANGED
@@ -1 +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,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"}
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"}
package/maplibre-react-native.podspec CHANGED
@@ -3,7 +3,7 @@ require 'json'
3
3
  package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
4
4
 
5
5
  # Global Variable Defaults
6
- $MLRN_NATIVE_VERSION ||= "6.10.0"
6
+ $MLRN_NATIVE_VERSION ||= "6.11.0"
7
7
  $MLRN_SPM_SPEC ||= {
8
8
  url: "https://github.com/maplibre/maplibre-gl-native-distribution",
9
9
  requirement: {
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@maplibre/maplibre-react-native",
3
3
  "description": "React Native library for creating maps with MapLibre Native for Android & iOS",
4
- "version": "10.1.0-beta.1",
4
+ "version": "10.1.0",
5
5
  "publishConfig": {
6
6
  "access": "public",
7
7
  "provenance": true
package/src/plugin/MapLibrePluginProps.ts CHANGED
@@ -17,7 +17,7 @@ export type MapLibrePluginProps =
17
17
  /**
18
18
  * Variant of `org.maplibre.gl:android-sdk-*`
19
19
  *
20
- * @default "vulkan"
20
+ * @default "opengl"
21
21
  */
22
22
  nativeVariant?: "opengl" | "vulkan";
23
23
  /**
package/src/plugin/android.ts CHANGED
@@ -12,6 +12,8 @@ type PropertyItem = {
12
12
  value: string;
13
13
  };
14
14
 
15
+ export const GRADLE_PROPERTIES_PREFIX = "org.maplibre.reactnative.";
16
+
15
17
  export const getGradleProperties = (
16
18
  props: MapLibrePluginProps,
17
19
  ): PropertyItem[] => {
@@ -20,7 +22,7 @@ export const getGradleProperties = (
20
22
  if (key && value) {
21
23
  properties.push({
22
24
  type: "property",
23
- key: `org.maplibre.reactnative.${key}`,
25
+ key: `${GRADLE_PROPERTIES_PREFIX}${key}`,
24
26
  value: value.toString(),
25
27
  });
26
28
  }
@@ -35,10 +37,12 @@ export const mergeGradleProperties = (
35
37
  oldProperties: PropertiesItem[],
36
38
  newProperties: PropertyItem[],
37
39
  ): PropertiesItem[] => {
38
- const newPropertiesKeys = newProperties.map(({ key }) => key);
39
40
  const merged = oldProperties.filter(
40
41
  (item) =>
41
- !(item.type === "property" && newPropertiesKeys.includes(item.key)),
42
+ !(
43
+ item.type === "property" &&
44
+ item.key.startsWith(GRADLE_PROPERTIES_PREFIX)
45
+ ),
42
46
  );
43
47
 
44
48
  merged.push(...newProperties);