feat: upgrade MapLibre Native (#563)

maplibre · Dec 23, 2024 · d2b7f5d · d2b7f5d
1 parent e1b2005
commit d2b7f5d
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 16 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -99,7 +99,7 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
   // MapLibre SDK
-  implementation "org.maplibre.gl:android-sdk:11.5.0"
+  implementation "org.maplibre.gl:android-sdk:11.7.1"
   implementation "org.maplibre.gl:android-sdk-turf:6.0.1"
 
   // Dependencies

diff --git a/docs/guides/setup/iOS.md b/docs/guides/setup/iOS.md
@@ -12,7 +12,7 @@ Add the following to your `ios/Podfile`:
   end
 ```
 
-Running `pod install` will add version `6.5.4` of the MapLibre SDK.
+Running `pod install` will add version `6.9.0` of the MapLibre SDK.
 
 ```sh
 # Go to the ios directory
@@ -33,7 +33,7 @@ until this is fixed upstream. iOS devs can open the workspace in Xcode and run f
 
 ## Installing a specific version
 
-The current default MapLibre version is `6.5.4`.
+The current default MapLibre version is `6.9.0`.
 If you want to install a different version, you can override as follows in
 your `Podfile`:
 
@@ -42,7 +42,7 @@ $MLRN_SPM_Spec = {
   url: "https://github.com/maplibre/maplibre-gl-native-distribution",
   requirement: {
     kind: "upToNextMajorVersion",
-    minimumVersion: "6.5.4"
+    minimumVersion: "6.9.0"
   },
   product_name: "MapLibre"
 }

diff --git a/maplibre-react-native.podspec b/maplibre-react-native.podspec
@@ -28,7 +28,7 @@ def $MLRN.post_install(installer)
     url: "https://github.com/maplibre/maplibre-gl-native-distribution",
     requirement: {
       kind: "exactVersion",
-      version: "6.5.4"
+      version: "6.9.0"
     },
     product_name: "MapLibre"
   }

diff --git a/packages/react-native-app/e2e/show-map.yml b/packages/react-native-app/e2e/show-map.yml
@@ -10,7 +10,7 @@ appId: org.maplibre.reactnative.example
       platform: Android
     commands:
       - tapOn: "Attribution icon. Activate to show attribution dialog."
-      - assertVisible: "MapLibre Maps SDK for Android"
+      - assertVisible: "MapLibre Android"
 
 - runFlow:
     when:

diff --git a/packages/react-native-app/ios/MapLibreReactNativeExample.xcodeproj/project.pbxproj b/packages/react-native-app/ios/MapLibreReactNativeExample.xcodeproj/project.pbxproj
@@ -140,10 +140,6 @@
 			attributes = {
 				LastUpgradeCheck = 1210;
 				TargetAttributes = {
-					00E356ED1AD99517003FC87E = {
-						CreatedOnToolsVersion = 6.2;
-						TestTargetID = 13B07F861A680F5B00A75B9A;
-					};
 					13B07F861A680F5B00A75B9A = {
 						LastSwiftMigration = 1120;
 					};
@@ -506,7 +502,7 @@
 			repositoryURL = "https://github.com/maplibre/maplibre-gl-native-distribution";
 			requirement = {
 				kind = exactVersion;
-				version = 6.5.4;
+				version = 6.9.0;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

diff --git a/...tive-app/ios/MapLibreReactNativeExample.xcworkspace/xcshareddata/swiftpm/Package.resolved b/...tive-app/ios/MapLibreReactNativeExample.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -6,8 +6,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/maplibre/maplibre-gl-native-distribution",
       "state" : {
-        "revision" : "abe762f1e19e03a4c6943d2aad92c219da384b29",
-        "version" : "6.5.4"
+        "revision" : "93cb32c95b48f62edb27c75792038849cdfdaa35",
+        "version" : "6.9.0"
       }
     }
   ],

diff --git a/scripts/codegen.ts b/scripts/codegen.ts
@@ -118,7 +118,13 @@ async function generate() {
       },
     );
 
-    return layoutProps.concat(paintProps);
+    const props = [...layoutProps, ...paintProps];
+
+    return props.filter((prop) => {
+      // TODO: Codegen adoptions for native style code
+      // https://github.com/maplibre/maplibre-react-native/issues/562
+      return !["textVariableAnchorOffset"].includes(prop.name);
+    });
   }
 
   function getSupportedLayers() {

diff --git a/scripts/templates/MapLibreRNStyles.ts.ejs b/scripts/templates/MapLibreRNStyles.ts.ejs
@@ -14,7 +14,8 @@ export interface Transition {
   delay: number;
 }
 
-export type FormattedString = string; /* TODO */
+<% /* TODO */ %>
+export type FormattedString = string;
 
 export type ExpressionName =
   // Types

diff --git a/src/types/MapLibreRNStyles.ts b/src/types/MapLibreRNStyles.ts
@@ -10,7 +10,7 @@ export interface Transition {
   delay: number;
 }
 
-export type FormattedString = string; /* TODO */
+export type FormattedString = string;
 
 export type ExpressionName =
   // Types